diff options
| author |   Jeremy Huddleston <eradicator@gentoo.org> | 2005-03-05 23:45:05 +0000 |
|---|---|---|
| committer | Jeremy Huddleston <eradicator@gentoo.org> | 2005-03-05 23:45:05 +0000 |
| commit | 03b802f6d0167c77ad45dd69348e04cfbd9843e7 (patch) | |
| tree | 3913ca02892c9c2013ac0182fa1287703001acaf /sys-libs/glibc | |
| parent | Marked ~ppc. (diff) | |
| download | historical-03b802f6d0167c77ad45dd69348e04cfbd9843e7.tar.gz historical-03b802f6d0167c77ad45dd69348e04cfbd9843e7.tar.bz2 historical-03b802f6d0167c77ad45dd69348e04cfbd9843e7.zip | |
Fixed crosscompile want_nptl. Fixed broken src_install logic which resulted in only nptl version being installed.
Package-Manager: portage-2.0.51.19
Diffstat (limited to 'sys-libs/glibc')
| -rw-r--r-- | sys-libs/glibc/ChangeLog | 7 | ||||
| -rw-r--r-- | sys-libs/glibc/Manifest | 10 | ||||
| -rw-r--r-- | sys-libs/glibc/glibc-2.3.4.20050125-r1.ebuild | 11 |
3 files changed, 16 insertions, 12 deletions
diff --git a/sys-libs/glibc/ChangeLog b/sys-libs/glibc/ChangeLog index 0c51e4b6c6b9..dba58addba65 100644 --- a/sys-libs/glibc/ChangeLog +++ b/sys-libs/glibc/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for sys-libs/glibc # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/ChangeLog,v 1.322 2005/03/05 22:13:31 eradicator Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/ChangeLog,v 1.323 2005/03/05 23:45:05 eradicator Exp $ + + 05 Mar 2005; Jeremy Huddleston <eradicator@gentoo.org> + glibc-2.3.4.20050125-r1.ebuild: + Fixed crosscompile want_nptl. Fixed broken src_install logic which resulted + in only nptl version being installed. 05 Mar 2005; Jeremy Huddleston <eradicator@gentoo.org> glibc-2.3.4.20050125-r1.ebuild: diff --git a/sys-libs/glibc/Manifest b/sys-libs/glibc/Manifest index 980896934804..75281be6b0c1 100644 --- a/sys-libs/glibc/Manifest +++ b/sys-libs/glibc/Manifest @@ -1,7 +1,7 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 -MD5 d18d7f66ea395cae29152dff16b70cbf ChangeLog 68898 +MD5 18ecded3e45a90d8a686d685103feef0 ChangeLog 69108 MD5 5529417ce5503c488b1ccaaa2e781799 glibc-2.2.5-r9.ebuild 10915 MD5 19b845756fd8e974c113e904396b9627 glibc-2.3.2-r12.ebuild 22153 MD5 1dee5d2dea67ffe479a0005cc7da35ce glibc-2.3.3.20040420-r2.ebuild 21626 @@ -11,7 +11,7 @@ MD5 ab06008394eb7c6aa17a674cae788eef glibc-2.3.4.20041102.ebuild 32888 MD5 567094e03359ffc1c95af7356395228d metadata.xml 162 MD5 b85c16a0e65a32784335e40fb0edac0e glibc-2.2.5-r10.ebuild 4418 MD5 695f1e83d1cb212d83d97f0d2989cb94 glibc-2.3.4.20050125.ebuild 35240 -MD5 3762e4a4d1e8479572b830b9b5f62a5d glibc-2.3.4.20050125-r1.ebuild 37019 +MD5 42b93732437c59a4aedf33797e6d387c glibc-2.3.4.20050125-r1.ebuild 37024 MD5 9cc1e6b6f749dba7c8759bd07266f7d9 files/digest-glibc-2.2.5-r9 143 MD5 2d5306ef875573750af642a9f93b634a files/digest-glibc-2.3.2-r12 312 MD5 42af7e35fe2404a49954f91fd1aee891 files/digest-glibc-2.3.3.20040420-r2 312 @@ -145,7 +145,7 @@ MD5 b72e5aca6d834026a6f5fb87623e6fd3 files/2.3.4/host.conf 1302 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) -iD8DBQFCKkHTArHZZzCEUG0RAg+AAJ9C0c8yBK6PtkZyLRy5D86We8eCiQCfQerV -hp9JXuBCSP4vASAA+yuvAOA= -=cwl/ +iD8DBQFCKkSMArHZZzCEUG0RAmm8AJ0T6spM8cAhiRL+c9jNhmG9XajtTgCfZB9J +/FfbOioTOZDEIqlk+Ca8Eyw= +=yBYE -----END PGP SIGNATURE----- diff --git a/sys-libs/glibc/glibc-2.3.4.20050125-r1.ebuild b/sys-libs/glibc/glibc-2.3.4.20050125-r1.ebuild index b5ef850f8910..6a6813942266 100644 --- a/sys-libs/glibc/glibc-2.3.4.20050125-r1.ebuild +++ b/sys-libs/glibc/glibc-2.3.4.20050125-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.3.4.20050125-r1.ebuild,v 1.13 2005/03/05 23:33:28 eradicator Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.3.4.20050125-r1.ebuild,v 1.14 2005/03/05 23:45:05 eradicator Exp $ # Here's how the cross-compile logic breaks down ... # CTARGET - machine that will target the binaries @@ -301,8 +301,7 @@ toolchain-glibc_src_install() { make PARALLELMFLAGS="${MAKEOPTS} -j1" \ install_root=${D} \ install || die - fi - if want_nptl ; then + elif use nptlonly ; then cd ${WORKDIR}/build-${ABI}-${CTARGET}-nptl einfo "Installing GLIBC with NPTL..." make PARALLELMFLAGS="${MAKEOPTS} -j1" \ @@ -625,7 +624,7 @@ setup_flags() { else if is-flag "-mcpu=ultrasparc3"; then CTARGET_OPT="sparcv9b-unknown-linux-gnu" - elif { is_crosscompile && use nptl; } || is-flag "-mcpu=ultrasparc2" || is-flag "-mcpu=ultrasparc"; then + elif { is_crosscompile && want_nptl; } || is-flag "-mcpu=ultrasparc2" || is-flag "-mcpu=ultrasparc"; then CTARGET_OPT="sparcv9-unknown-linux-gnu" fi fi @@ -722,7 +721,7 @@ want_nptl() { return 0; ;; x86) - case ${CHOST/-*} in + case ${CTARGET/-*} in i486|i586|i686) return 0 ;; esac ;; @@ -1232,7 +1231,7 @@ src_install() { dosed "s:/lib/:/$(get_libdir)/:g" /usr/$(get_libdir)/lib{c,pthread}.so - if use nptl && want_linuxthreads ; then + if want_nptl && want_linuxthreads ; then dosed "s:/lib/:/$(get_libdir)/:g" /usr/$(get_libdir)/nptl/lib{c,pthread}.so fi fi |