Gentoo Archives: gentoo-commits

From: "Tim Harder (radhermit)" <radhermit@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in net-libs/canlock: canlock-2b.ebuild ChangeLog
Date: Wed, 06 Mar 2013 07:13:33
Message-Id: 20130306071329.001A32171D@flycatcher.gentoo.org
1 radhermit 13/03/06 07:13:28
2
3 Modified: canlock-2b.ebuild ChangeLog
4 Log:
5 Fix linking issue (bug #446746).
6
7 (Portage version: 2.2.0_alpha165/cvs/Linux x86_64, signed Manifest commit with key 4AB3E85B4F064CA3)
8
9 Revision Changes Path
10 1.4 net-libs/canlock/canlock-2b.ebuild
11
12 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/canlock/canlock-2b.ebuild?rev=1.4&view=markup
13 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/canlock/canlock-2b.ebuild?rev=1.4&content-type=text/plain
14 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/canlock/canlock-2b.ebuild?r1=1.3&r2=1.4
15
16 Index: canlock-2b.ebuild
17 ===================================================================
18 RCS file: /var/cvsroot/gentoo-x86/net-libs/canlock/canlock-2b.ebuild,v
19 retrieving revision 1.3
20 retrieving revision 1.4
21 diff -u -r1.3 -r1.4
22 --- canlock-2b.ebuild 10 Oct 2011 18:35:03 -0000 1.3
23 +++ canlock-2b.ebuild 6 Mar 2013 07:13:28 -0000 1.4
24 @@ -1,6 +1,6 @@
25 -# Copyright 1999-2011 Gentoo Foundation
26 +# Copyright 1999-2013 Gentoo Foundation
27 # Distributed under the terms of the GNU General Public License v2
28 -# $Header: /var/cvsroot/gentoo-x86/net-libs/canlock/canlock-2b.ebuild,v 1.3 2011/10/10 18:35:03 grobian Exp $
29 +# $Header: /var/cvsroot/gentoo-x86/net-libs/canlock/canlock-2b.ebuild,v 1.4 2013/03/06 07:13:28 radhermit Exp $
30
31 EAPI=4
32
33 @@ -25,7 +25,12 @@
34 }
35
36 src_compile() {
37 - emake CC="$(tc-getCC)" AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)"
38 + local targets="shared"
39 + if use static-libs || use test ; then
40 + targets+=" static"
41 + fi
42 +
43 + emake CC="$(tc-getCC)" AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)" ${targets}
44 }
45
46 src_install() {
47
48
49
50 1.5 net-libs/canlock/ChangeLog
51
52 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/canlock/ChangeLog?rev=1.5&view=markup
53 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/canlock/ChangeLog?rev=1.5&content-type=text/plain
54 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/canlock/ChangeLog?r1=1.4&r2=1.5
55
56 Index: ChangeLog
57 ===================================================================
58 RCS file: /var/cvsroot/gentoo-x86/net-libs/canlock/ChangeLog,v
59 retrieving revision 1.4
60 retrieving revision 1.5
61 diff -u -r1.4 -r1.5
62 --- ChangeLog 24 Aug 2012 21:59:07 -0000 1.4
63 +++ ChangeLog 6 Mar 2013 07:13:28 -0000 1.5
64 @@ -1,6 +1,10 @@
65 # ChangeLog for net-libs/canlock
66 -# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
67 -# $Header: /var/cvsroot/gentoo-x86/net-libs/canlock/ChangeLog,v 1.4 2012/08/24 21:59:07 radhermit Exp $
68 +# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
69 +# $Header: /var/cvsroot/gentoo-x86/net-libs/canlock/ChangeLog,v 1.5 2013/03/06 07:13:28 radhermit Exp $
70 +
71 + 06 Mar 2013; Tim Harder <radhermit@g.o> canlock-2b.ebuild,
72 + files/canlock-2b-make.patch:
73 + Fix linking issue (bug #446746).
74
75 24 Aug 2012; Tim Harder <radhermit@g.o> files/canlock-2b-make.patch:
76 Respect cflags and ldflags (bug #432622).