1 |
jer 12/01/31 22:06:08 |
2 |
|
3 |
Modified: metadata.xml ChangeLog libowfat-0.28-r1.ebuild |
4 |
Log: |
5 |
Make dietlibc optional by Rolf Eike Beer (bug #97185). Respect CC. |
6 |
|
7 |
(Portage version: 2.2.0_alpha84/cvs/Linux x86_64) |
8 |
|
9 |
Revision Changes Path |
10 |
1.4 dev-libs/libowfat/metadata.xml |
11 |
|
12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/libowfat/metadata.xml?rev=1.4&view=markup |
13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/libowfat/metadata.xml?rev=1.4&content-type=text/plain |
14 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/libowfat/metadata.xml?r1=1.3&r2=1.4 |
15 |
|
16 |
Index: metadata.xml |
17 |
=================================================================== |
18 |
RCS file: /var/cvsroot/gentoo-x86/dev-libs/libowfat/metadata.xml,v |
19 |
retrieving revision 1.3 |
20 |
retrieving revision 1.4 |
21 |
diff -u -r1.3 -r1.4 |
22 |
--- metadata.xml 23 Sep 2011 22:41:18 -0000 1.3 |
23 |
+++ metadata.xml 31 Jan 2012 22:06:08 -0000 1.4 |
24 |
@@ -6,4 +6,5 @@ |
25 |
<name>Patrick Lauer</name> |
26 |
</maintainer> |
27 |
<longdescription>reimplement libdjb - excellent libraries from Dan Bernstein</longdescription> |
28 |
+<use><flag name="diet">Compile against <pkg>dev-libs/dietlibc</pkg></flag></use> |
29 |
</pkgmetadata> |
30 |
|
31 |
|
32 |
|
33 |
1.31 dev-libs/libowfat/ChangeLog |
34 |
|
35 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/libowfat/ChangeLog?rev=1.31&view=markup |
36 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/libowfat/ChangeLog?rev=1.31&content-type=text/plain |
37 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/libowfat/ChangeLog?r1=1.30&r2=1.31 |
38 |
|
39 |
Index: ChangeLog |
40 |
=================================================================== |
41 |
RCS file: /var/cvsroot/gentoo-x86/dev-libs/libowfat/ChangeLog,v |
42 |
retrieving revision 1.30 |
43 |
retrieving revision 1.31 |
44 |
diff -u -r1.30 -r1.31 |
45 |
--- ChangeLog 31 Jan 2012 17:10:33 -0000 1.30 |
46 |
+++ ChangeLog 31 Jan 2012 22:06:08 -0000 1.31 |
47 |
@@ -1,6 +1,10 @@ |
48 |
# ChangeLog for dev-libs/libowfat |
49 |
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 |
50 |
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libowfat/ChangeLog,v 1.30 2012/01/31 17:10:33 jer Exp $ |
51 |
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libowfat/ChangeLog,v 1.31 2012/01/31 22:06:08 jer Exp $ |
52 |
+ |
53 |
+ 31 Jan 2012; Jeroen Roovers <jer@g.o> libowfat-0.28-r1.ebuild, |
54 |
+ metadata.xml: |
55 |
+ Make dietlibc optional by Rolf Eike Beer (bug #97185). Respect CC. |
56 |
|
57 |
31 Jan 2012; Jeroen Roovers <jer@g.o> libowfat-0.28-r1.ebuild: |
58 |
Drop HPPA keywording now that this requires an unsupported version of |
59 |
|
60 |
|
61 |
|
62 |
1.6 dev-libs/libowfat/libowfat-0.28-r1.ebuild |
63 |
|
64 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/libowfat/libowfat-0.28-r1.ebuild?rev=1.6&view=markup |
65 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/libowfat/libowfat-0.28-r1.ebuild?rev=1.6&content-type=text/plain |
66 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/libowfat/libowfat-0.28-r1.ebuild?r1=1.5&r2=1.6 |
67 |
|
68 |
Index: libowfat-0.28-r1.ebuild |
69 |
=================================================================== |
70 |
RCS file: /var/cvsroot/gentoo-x86/dev-libs/libowfat/libowfat-0.28-r1.ebuild,v |
71 |
retrieving revision 1.5 |
72 |
retrieving revision 1.6 |
73 |
diff -u -r1.5 -r1.6 |
74 |
--- libowfat-0.28-r1.ebuild 31 Jan 2012 17:10:33 -0000 1.5 |
75 |
+++ libowfat-0.28-r1.ebuild 31 Jan 2012 22:06:08 -0000 1.6 |
76 |
@@ -1,9 +1,9 @@ |
77 |
# Copyright 1999-2012 Gentoo Foundation |
78 |
# Distributed under the terms of the GNU General Public License v2 |
79 |
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libowfat/libowfat-0.28-r1.ebuild,v 1.5 2012/01/31 17:10:33 jer Exp $ |
80 |
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libowfat/libowfat-0.28-r1.ebuild,v 1.6 2012/01/31 22:06:08 jer Exp $ |
81 |
|
82 |
EAPI=2 |
83 |
-inherit flag-o-matic |
84 |
+inherit flag-o-matic toolchain-funcs |
85 |
|
86 |
DESCRIPTION="reimplement libdjb - excellent libraries from Dan Bernstein." |
87 |
SRC_URI="http://dl.fefe.de/${P}.tar.bz2" |
88 |
@@ -12,9 +12,9 @@ |
89 |
LICENSE="GPL-2" |
90 |
SLOT="0" |
91 |
KEYWORDS="~amd64 ~sparc ~x86" |
92 |
-IUSE="" |
93 |
+IUSE="diet" |
94 |
|
95 |
-RDEPEND=">=dev-libs/dietlibc-0.33_pre20090721" |
96 |
+RDEPEND="diet? ( >=dev-libs/dietlibc-0.33_pre20090721 )" |
97 |
DEPEND="${RDEPEND} |
98 |
>=sys-apps/sed-4" |
99 |
|
100 |
@@ -25,12 +25,18 @@ |
101 |
|
102 |
src_prepare() { |
103 |
sed -e "s:^CFLAGS.*:CFLAGS=-I. ${CFLAGS}:" \ |
104 |
- -e "s:^DIET.*:DIET=/usr/bin/diet -Os:" \ |
105 |
+ -e "s:^DIET.*:DIET?=/usr/bin/diet -Os:" \ |
106 |
-e "s:^prefix.*:prefix=/usr:" \ |
107 |
-e "s:^INCLUDEDIR.*:INCLUDEDIR=\${prefix}/include/libowfat:" \ |
108 |
-i GNUmakefile || die "sed failed" |
109 |
} |
110 |
|
111 |
+src_compile() { |
112 |
+ emake \ |
113 |
+ CC=$(tc-getCC) \ |
114 |
+ $( use diet || echo 'DIET=' ) |
115 |
+} |
116 |
+ |
117 |
src_install () { |
118 |
emake \ |
119 |
LIBDIR="${D}/usr/lib" \ |