diff options
| author |   Zhang Le <r0bertz@gentoo.org> | 2009-02-25 15:06:48 +0800 |
|---|---|---|
| committer | Zhang Le <r0bertz@gentoo.org> | 2009-02-25 15:06:48 +0800 |
| commit | af683c3062173442a12e0aead40269823bdb64ad (patch) | |
| tree | 40768921d3807cefb38e47b8b40822c45e66d1bc /sys-libs/glibc | |
| parent | glibc: fixed manifest (diff) | |
| download | loongson-af683c3062173442a12e0aead40269823bdb64ad.tar.gz loongson-af683c3062173442a12e0aead40269823bdb64ad.tar.bz2 loongson-af683c3062173442a12e0aead40269823bdb64ad.zip | |
removed mips64el crossdev work around to src_compile.eblit
Signed-off-by: Zhang Le <r0bertz@gentoo.org>
Diffstat (limited to 'sys-libs/glibc')
| -rw-r--r-- | sys-libs/glibc/Manifest | 2 | ||||
| -rw-r--r-- | sys-libs/glibc/files/eblits/src_compile.eblit | 6 | ||||
| -rw-r--r-- | sys-libs/glibc/glibc-2.9_p20081201-r2.ebuild | 6 |
3 files changed, 7 insertions, 7 deletions
diff --git a/sys-libs/glibc/Manifest b/sys-libs/glibc/Manifest index 3a40fdb..cc343f5 100644 --- a/sys-libs/glibc/Manifest +++ b/sys-libs/glibc/Manifest @@ -103,7 +103,7 @@ AUX 2.6/glibc-2.6-gentoo-stack_chk_fail.c 9545 RMD160 9a21c9deb6ebca5d2245e3bb50 AUX 2.6/glibc-2.6-hardened-inittls-nosysenter.patch 8674 RMD160 f4e7df0cb25292afc13e18332569d2ca288fdf92 SHA1 7f34ef26d6607321e0ec5ad0f389cb1aedf5e0da SHA256 cf58ded8fbe9fcb3dc094521feec2588c1520ff2c632b20c69d6a210325c4fcf AUX 2.7/glibc-2.7-hardened-inittls-nosysenter.patch 8755 RMD160 b674894f3b16f63193bb8040f8a5657dce82e1f9 SHA1 79fb3a4454b85af70dac95dd79134be3fe3a9201 SHA256 b0b1bf0746f7160b89cf281502b95c38dec9cb948d6a50a907b84fd6230a2dc3 AUX eblits/common.eblit 8670 RMD160 9bf0886b0a63f959bacfb09b01e83741d9276aad SHA1 3b8eb208b69da4c8a0ae15d03eba7e1bd964f480 SHA256 8f49bbc22edd38d40f82ff6d2fbc0707c580e39a928d7216aca7425c9314e851 -AUX eblits/src_compile.eblit 5300 RMD160 20767168c88db46b3f2b574a1e016277e05feb0c SHA1 e5d9fa728328769677da2f39b72e513287e19f10 SHA256 2d65febd48588df74fb5abc644ac52a3a42791d87eafd50d6e3559740c692877 +AUX eblits/src_compile.eblit 5655 RMD160 08d2f96a3211dd92b0a048961a35090a4ef83411 SHA1 1082f2edc1060eaaf8138d37b5f334ff7effb3fd SHA256 de4d7bbca21edd14bbd153d2ea5a46abc9214f6f37828b29d9c163c9aec8614a AUX eblits/src_install-2.6.eblit 7946 RMD160 6cc258a316b78212777ab328a3c0cb73de1616d4 SHA1 94895689b56fd712156e8ac84a2a639d8475da03 SHA256 54081c34217c230d0ff43c5df378897a37576e727fe41ee4d681767110667f3e AUX eblits/src_install.eblit 7893 RMD160 789a4518bbb0be8a028f331e2673e423d2717a93 SHA1 7288c1bcc7f05e8aa0d4f90d4c63be128a2d225d SHA256 d5f0cb0345c33f66a90d73e7e0264867d9bcf4a137190d6ae4008d63a3b7bd56 AUX eblits/src_test.eblit 1162 RMD160 349db09c5f2c2e412a108b8c5371adf946e1a3f0 SHA1 357ef650e1dce62d5d688133426bc62b9085009d SHA256 bac1db2da478f6e6709275c36cc1f9a98fac7fcc2e80bd8831f2077207754962 diff --git a/sys-libs/glibc/files/eblits/src_compile.eblit b/sys-libs/glibc/files/eblits/src_compile.eblit index 3ed979e..1cdc550 100644 --- a/sys-libs/glibc/files/eblits/src_compile.eblit +++ b/sys-libs/glibc/files/eblits/src_compile.eblit @@ -135,6 +135,12 @@ toolchain-glibc_headers_compile() { libc_cv_ppc_machine=yes \ libc_cv_mips_tls=yes + if [[ ${CTARGET} == "mips64el-unknown-linux-gnu" ]] ; then + sed -i 's/-mabi=$mips_config_abi//g' "${S}"/ports/sysdeps/mips/preconfigure + sed -i 's/CC/CFLAGS/' "${S}"/ports/sysdeps/mips/mips64/n32/Makefile + sed -i 's/CC/CFLAGS/' "${S}"/ports/sysdeps/mips/mips64/n64/Makefile + fi + # Pick out the correct location for build headers local ports="" myconf="--disable-sanity-checks --enable-hacker-mode" [[ -d ${S}/ports ]] && ports=",ports" diff --git a/sys-libs/glibc/glibc-2.9_p20081201-r2.ebuild b/sys-libs/glibc/glibc-2.9_p20081201-r2.ebuild index fbbc128..75b77d1 100644 --- a/sys-libs/glibc/glibc-2.9_p20081201-r2.ebuild +++ b/sys-libs/glibc/glibc-2.9_p20081201-r2.ebuild @@ -173,12 +173,6 @@ src_install() { eblit-run src_install ; } eblit-src_unpack-post() { cd "${S}" epatch "${FILESDIR}"/glibc-mips-N32-readelflib.c.patch - if use crosscompile_opts_headers-only ; then - sed -i 's/-mabi=$mips_config_abi//g' "${S}"/ports/sysdeps/mips/preconfigure - sed -i 's/CC/CFLAGS/' "${S}"/ports/sysdeps/mips/mips64/n32/Makefile - sed -i 's/CC/CFLAGS/' "${S}"/ports/sysdeps/mips/mips64/n64/Makefile - fi - if use hardened ; then einfo "Patching to get working PIE binaries on PIE (hardened) platforms" gcc-specs-pie && epatch "${FILESDIR}"/2.5/glibc-2.5-hardened-pie.patch |