diff options
Diffstat (limited to 'sys-libs')
| -rw-r--r-- | sys-libs/glibc/Manifest | 8 | ||||
| -rw-r--r-- | sys-libs/glibc/glibc-2.3.4.20050125.ebuild | 39 |
2 files changed, 21 insertions, 26 deletions
diff --git a/sys-libs/glibc/Manifest b/sys-libs/glibc/Manifest index 91eeb9175061..e83521333010 100644 --- a/sys-libs/glibc/Manifest +++ b/sys-libs/glibc/Manifest @@ -10,7 +10,7 @@ MD5 63f67cbcb98920a75ba0b1a4b781519c glibc-2.3.4.20040808-r1.ebuild 27601 MD5 96dc89a3ebadd5f1260ce517ffe6fef3 glibc-2.3.4.20041102.ebuild 32955 MD5 567094e03359ffc1c95af7356395228d metadata.xml 162 MD5 b85c16a0e65a32784335e40fb0edac0e glibc-2.2.5-r10.ebuild 4418 -MD5 d5ce5570ddef5c0d9a307ab428252798 glibc-2.3.4.20050125.ebuild 34120 +MD5 089df0457c0b86103114df79b25240a1 glibc-2.3.4.20050125.ebuild 34193 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 @@ -143,7 +143,7 @@ MD5 b72e5aca6d834026a6f5fb87623e6fd3 files/2.3.4/host.conf 1302 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) -iD8DBQFCDwDmArHZZzCEUG0RAr4XAJ4nmD+7uUOBK0UkOEOLa+jBM4+cVgCfX6pb -d7RukYSvC2N44UXPGahTpcQ= -=BxBS +iD8DBQFCDy3cArHZZzCEUG0RArf5AJwPgPJBRWi+BDz2uOmj5WR3gy/y1ACfbBZf +aHd5Vf98cMfcaLTnjhJFztk= +=slWR -----END PGP SIGNATURE----- diff --git a/sys-libs/glibc/glibc-2.3.4.20050125.ebuild b/sys-libs/glibc/glibc-2.3.4.20050125.ebuild index bf232fe03e98..cfdee19f9ed9 100644 --- a/sys-libs/glibc/glibc-2.3.4.20050125.ebuild +++ b/sys-libs/glibc/glibc-2.3.4.20050125.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.ebuild,v 1.15 2005/02/13 07:25:15 eradicator Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.3.4.20050125.ebuild,v 1.16 2005/02/13 10:35:34 eradicator Exp $ KEYWORDS="~amd64 ~mips ~sparc ~x86" @@ -540,17 +540,7 @@ setup_flags() { strip-unsupported-flags filter-flags -m32 -m64 -mabi=* - if has_multilib_profile; then - # We change our CHOST, so set this right here - export CC="$(tc-getCC)" - - if tc-is-cross-compiler; then - CHOST_OPT="$(get_abi_CHOST)" - else - CHOST="$(get_abi_CHOST)" - CBUILD="${CHOST}" - fi - fi + has_multilib_profile && CHOST_OPT="$(get_abi_CHOST)" case $(tc-arch) in ppc) @@ -568,27 +558,33 @@ setup_flags() { default|sparc) if is-flag "-mcpu=ultrasparc3"; then CHOST_OPT="sparcv9b-unknown-linux-gnu" + tc-is-cross-compiler || CBUILD_OPT=${CHOST_OPT} else CHOST_OPT="sparcv9-unknown-linux-gnu" + tc-is-cross-compiler || CBUILD_OPT=${CHOST_OPT} fi ;; sparc64) if is-flag "-mcpu=ultrasparc3"; then CHOST_OPT="sparc64b-unknown-linux-gnu" + tc-is-cross-compiler || CBUILD_OPT=${CHOST_OPT} CFLAGS_sparc64="$(get_abi_CFLAGS) -Wa,-xarch=v9b" else CHOST_OPT="sparc64-unknown-linux-gnu" + tc-is-cross-compiler || CBUILD_OPT=${CHOST_OPT} CFLAGS_sparc64="$(get_abi_CFLAGS) -Wa,-xarch=v9a" fi filter-flags -Wa,-xarch -Wa,-A ;; esac - elif tc-is-cross-compiler && use nptl; then + else if is-flag "-mcpu=ultrasparc3"; then CHOST_OPT="sparcv9b-unknown-linux-gnu" - else + CBUILD_OPT=${CHOST_OPT} + elif { tc-is-cross-compiler && use nptl; } || is-flag "-mcpu=ultrasparc2" || is-flag "-mcpu=ultrasparc"; then CHOST_OPT="sparcv9-unknown-linux-gnu" + CBUILD_OPT=${CHOST_OPT} fi fi ;; @@ -775,7 +771,7 @@ glibc_do_configure() { # Who knows if this works :) myconf="${myconf} --without-cvs --enable-bind-now - --build=${CBUILD} + --build=${CBUILD_OPT:-${CBUILD}} --host=${CHOST_OPT:-${CHOST}} --disable-profile --without-gd @@ -783,7 +779,7 @@ glibc_do_configure() { --prefix=$(alt_prefix) --mandir=$(alt_prefix)/share/man --infodir=$(alt_prefix)/share/info - --libexecdir=$(alt_prefix)/lib/misc" + --libexecdir=$(alt_prefix)/libexec" GBUILDDIR="${WORKDIR}/build-${ABI}-${CHOST}-$1" mkdir -p ${GBUILDDIR} @@ -1133,11 +1129,10 @@ src_install() { mv ${D}/lib ${D}/$(get_libdir) mv ${D}/usr/lib ${D}/usr/$(get_libdir) - mkdir ${D}/lib + dodir /lib + dodir /usr/lib + mv ${D}/usr/$(get_libdir)/locale ${D}/usr/lib dosym ../$(get_libdir)/ld-linux.so.2 /lib/ld-linux.so.2 - dosed "s:/lib/:/$(get_libdir)/:g" /usr/$(get_libdir)/libc.so /usr/$(get_libdir)/libpthread.so - - rm -rf ${D}/usr/$(get_libdir)/misc ${D}/usr/$(get_libdir)/locale for f in ${D}/usr/$(get_libdir)/*.so; do local basef=$(basename ${f}) @@ -1149,10 +1144,10 @@ src_install() { fi done - sed -i "s:/lib/:/$(get_libdir)/:g" /usr/$(get_libdir)/lib{c,pthread}.so + dosed "s:/lib/:/$(get_libdir)/:g" /usr/$(get_libdir)/lib{c,pthread}.so if use nptl && use !nptlonly; then - sed -i "s:/lib/:/$(get_libdir)/:g" /usr/$(get_libdir)/nptl/lib{c,pthread}.so + dosed "s:/lib/:/$(get_libdir)/:g" /usr/$(get_libdir)/nptl/lib{c,pthread}.so fi fi } |