| 1 |
grobian 14/02/01 16:18:05 |
| 2 |
|
| 3 |
Modified: pkgconfig-9999.ebuild pkgconfig-0.28.ebuild |
| 4 |
ChangeLog |
| 5 |
Log: |
| 6 |
Fix glib build on some Prefix platforms with USE=internal-glib during bootstrap |
| 7 |
|
| 8 |
(Portage version: 2.2.8-prefix/cvs/SunOS i386, signed Manifest commit with key 0x5F75F607C5C74E89) |
| 9 |
|
| 10 |
Revision Changes Path |
| 11 |
1.10 dev-util/pkgconfig/pkgconfig-9999.ebuild |
| 12 |
|
| 13 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/pkgconfig/pkgconfig-9999.ebuild?rev=1.10&view=markup |
| 14 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/pkgconfig/pkgconfig-9999.ebuild?rev=1.10&content-type=text/plain |
| 15 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/pkgconfig/pkgconfig-9999.ebuild?r1=1.9&r2=1.10 |
| 16 |
|
| 17 |
Index: pkgconfig-9999.ebuild |
| 18 |
=================================================================== |
| 19 |
RCS file: /var/cvsroot/gentoo-x86/dev-util/pkgconfig/pkgconfig-9999.ebuild,v |
| 20 |
retrieving revision 1.9 |
| 21 |
retrieving revision 1.10 |
| 22 |
diff -u -r1.9 -r1.10 |
| 23 |
--- pkgconfig-9999.ebuild 18 Jan 2014 04:44:25 -0000 1.9 |
| 24 |
+++ pkgconfig-9999.ebuild 1 Feb 2014 16:18:05 -0000 1.10 |
| 25 |
@@ -1,6 +1,6 @@ |
| 26 |
# Copyright 1999-2014 Gentoo Foundation |
| 27 |
# Distributed under the terms of the GNU General Public License v2 |
| 28 |
-# $Header: /var/cvsroot/gentoo-x86/dev-util/pkgconfig/pkgconfig-9999.ebuild,v 1.9 2014/01/18 04:44:25 vapier Exp $ |
| 29 |
+# $Header: /var/cvsroot/gentoo-x86/dev-util/pkgconfig/pkgconfig-9999.ebuild,v 1.10 2014/02/01 16:18:05 grobian Exp $ |
| 30 |
|
| 31 |
EAPI=5 |
| 32 |
|
| 33 |
@@ -21,7 +21,7 @@ |
| 34 |
|
| 35 |
LICENSE="GPL-2" |
| 36 |
SLOT="0" |
| 37 |
-IUSE="elibc_FreeBSD hardened internal-glib" |
| 38 |
+IUSE="elibc_FreeBSD elibc_glibc hardened internal-glib" |
| 39 |
|
| 40 |
RDEPEND="!internal-glib? ( >=dev-libs/glib-2.30 ) |
| 41 |
!dev-util/pkgconf[pkg-config] |
| 42 |
@@ -48,6 +48,15 @@ |
| 43 |
|
| 44 |
if use internal-glib; then |
| 45 |
myconf+=' --with-internal-glib' |
| 46 |
+ # non-glibc platforms use GNU libiconv, but configure needs to |
| 47 |
+ # know about that not to get confused when it finds something |
| 48 |
+ # outside the prefix too |
| 49 |
+ if use prefix && use !elibc_glibc ; then |
| 50 |
+ myconf+=" --with-libiconv=gnu" |
| 51 |
+ # add the libdir for libtool, otherwise it'll make love with system |
| 52 |
+ # installed libiconv |
| 53 |
+ append-ldflags "-L${EPREFIX}/usr/$(get_libdir)" |
| 54 |
+ fi |
| 55 |
else |
| 56 |
if ! has_version dev-util/pkgconfig; then |
| 57 |
export GLIB_CFLAGS="-I${EPREFIX}/usr/include/glib-2.0 -I${EPREFIX}/usr/$(get_libdir)/glib-2.0/include" |
| 58 |
|
| 59 |
|
| 60 |
|
| 61 |
1.15 dev-util/pkgconfig/pkgconfig-0.28.ebuild |
| 62 |
|
| 63 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/pkgconfig/pkgconfig-0.28.ebuild?rev=1.15&view=markup |
| 64 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/pkgconfig/pkgconfig-0.28.ebuild?rev=1.15&content-type=text/plain |
| 65 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/pkgconfig/pkgconfig-0.28.ebuild?r1=1.14&r2=1.15 |
| 66 |
|
| 67 |
Index: pkgconfig-0.28.ebuild |
| 68 |
=================================================================== |
| 69 |
RCS file: /var/cvsroot/gentoo-x86/dev-util/pkgconfig/pkgconfig-0.28.ebuild,v |
| 70 |
retrieving revision 1.14 |
| 71 |
retrieving revision 1.15 |
| 72 |
diff -u -r1.14 -r1.15 |
| 73 |
--- pkgconfig-0.28.ebuild 18 Jan 2014 04:44:25 -0000 1.14 |
| 74 |
+++ pkgconfig-0.28.ebuild 1 Feb 2014 16:18:05 -0000 1.15 |
| 75 |
@@ -1,6 +1,6 @@ |
| 76 |
# Copyright 1999-2014 Gentoo Foundation |
| 77 |
# Distributed under the terms of the GNU General Public License v2 |
| 78 |
-# $Header: /var/cvsroot/gentoo-x86/dev-util/pkgconfig/pkgconfig-0.28.ebuild,v 1.14 2014/01/18 04:44:25 vapier Exp $ |
| 79 |
+# $Header: /var/cvsroot/gentoo-x86/dev-util/pkgconfig/pkgconfig-0.28.ebuild,v 1.15 2014/02/01 16:18:05 grobian Exp $ |
| 80 |
|
| 81 |
EAPI=5 |
| 82 |
|
| 83 |
@@ -21,7 +21,7 @@ |
| 84 |
|
| 85 |
LICENSE="GPL-2" |
| 86 |
SLOT="0" |
| 87 |
-IUSE="elibc_FreeBSD hardened internal-glib" |
| 88 |
+IUSE="elibc_FreeBSD elibc_glibc hardened internal-glib" |
| 89 |
|
| 90 |
RDEPEND="!internal-glib? ( >=dev-libs/glib-2.30 ) |
| 91 |
!dev-util/pkgconf[pkg-config] |
| 92 |
@@ -48,6 +48,15 @@ |
| 93 |
|
| 94 |
if use internal-glib; then |
| 95 |
myconf+=' --with-internal-glib' |
| 96 |
+ # non-glibc platforms use GNU libiconv, but configure needs to |
| 97 |
+ # know about that not to get confused when it finds something |
| 98 |
+ # outside the prefix too |
| 99 |
+ if use prefix && use !elibc_glibc ; then |
| 100 |
+ myconf+=" --with-libiconv=gnu" |
| 101 |
+ # add the libdir for libtool, otherwise it'll make love with system |
| 102 |
+ # installed libiconv |
| 103 |
+ append-ldflags "-L${EPREFIX}/usr/$(get_libdir)" |
| 104 |
+ fi |
| 105 |
else |
| 106 |
if ! has_version dev-util/pkgconfig; then |
| 107 |
export GLIB_CFLAGS="-I${EPREFIX}/usr/include/glib-2.0 -I${EPREFIX}/usr/$(get_libdir)/glib-2.0/include" |
| 108 |
|
| 109 |
|
| 110 |
|
| 111 |
1.142 dev-util/pkgconfig/ChangeLog |
| 112 |
|
| 113 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/pkgconfig/ChangeLog?rev=1.142&view=markup |
| 114 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/pkgconfig/ChangeLog?rev=1.142&content-type=text/plain |
| 115 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/pkgconfig/ChangeLog?r1=1.141&r2=1.142 |
| 116 |
|
| 117 |
Index: ChangeLog |
| 118 |
=================================================================== |
| 119 |
RCS file: /var/cvsroot/gentoo-x86/dev-util/pkgconfig/ChangeLog,v |
| 120 |
retrieving revision 1.141 |
| 121 |
retrieving revision 1.142 |
| 122 |
diff -u -r1.141 -r1.142 |
| 123 |
--- ChangeLog 18 Jan 2014 04:44:25 -0000 1.141 |
| 124 |
+++ ChangeLog 1 Feb 2014 16:18:05 -0000 1.142 |
| 125 |
@@ -1,6 +1,11 @@ |
| 126 |
# ChangeLog for dev-util/pkgconfig |
| 127 |
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 |
| 128 |
-# $Header: /var/cvsroot/gentoo-x86/dev-util/pkgconfig/ChangeLog,v 1.141 2014/01/18 04:44:25 vapier Exp $ |
| 129 |
+# $Header: /var/cvsroot/gentoo-x86/dev-util/pkgconfig/ChangeLog,v 1.142 2014/02/01 16:18:05 grobian Exp $ |
| 130 |
+ |
| 131 |
+ 01 Feb 2014; Fabian Groffen <grobian@g.o> pkgconfig-0.28.ebuild, |
| 132 |
+ pkgconfig-9999.ebuild: |
| 133 |
+ Fix glib build on some Prefix platforms with USE=internal-glib during |
| 134 |
+ bootstrap |
| 135 |
|
| 136 |
18 Jan 2014; Mike Frysinger <vapier@g.o> pkgconfig-0.28.ebuild, |
| 137 |
pkgconfig-9999.ebuild: |
Archives