diff options
| author |   Zhang Le <r0bertz@gentoo.org> | 2009-02-26 21:23:11 +0800 |
|---|---|---|
| committer | Zhang Le <r0bertz@gentoo.org> | 2009-02-26 21:23:11 +0800 |
| commit | ffc96ad14dc4d2c7c4f2e164dbaee24d494fb959 (patch) | |
| tree | 596cae6646aaf68b05340a4d3abf6641a2491f06 /sys-libs/glibc | |
| parent | Merge branch 'master' of ssh://192.168.1.101/var/git/loongson (diff) | |
| download | loongson-ffc96ad14dc4d2c7c4f2e164dbaee24d494fb959.tar.gz loongson-ffc96ad14dc4d2c7c4f2e164dbaee24d494fb959.tar.bz2 loongson-ffc96ad14dc4d2c7c4f2e164dbaee24d494fb959.zip | |
define _MIPS_SZPTR as 32, added comments, restore wordsize.h after installation
Signed-off-by: Zhang Le <r0bertz@gentoo.org>
Diffstat (limited to 'sys-libs/glibc')
| -rw-r--r-- | sys-libs/glibc/Manifest | 4 | ||||
| -rw-r--r-- | sys-libs/glibc/files/eblits/src_compile.eblit | 5 | ||||
| -rw-r--r-- | sys-libs/glibc/files/eblits/src_install.eblit | 5 |
3 files changed, 11 insertions, 3 deletions
diff --git a/sys-libs/glibc/Manifest b/sys-libs/glibc/Manifest index 2173e6e..6760206 100644 --- a/sys-libs/glibc/Manifest +++ b/sys-libs/glibc/Manifest @@ -103,9 +103,9 @@ 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 5655 RMD160 08d2f96a3211dd92b0a048961a35090a4ef83411 SHA1 1082f2edc1060eaaf8138d37b5f334ff7effb3fd SHA256 de4d7bbca21edd14bbd153d2ea5a46abc9214f6f37828b29d9c163c9aec8614a +AUX eblits/src_compile.eblit 5835 RMD160 2a3a1e0a7af480bdebe79bcdb260475add55b662 SHA1 e5b18b51bad63a76fbd912f930c8feb4267a5931 SHA256 f1c9ff3fa0cd477d524aa329f74c17e3be1c5b013d5dade041e4ea1a45bb8db2 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_install.eblit 8115 RMD160 dbc9b0491839b44fbcee2bf0801b811a2e11457b SHA1 441c50de0a1776e2c786f3efece6c5ef20355fe3 SHA256 05cc0b3df35d044121a6c9c06f2bca4fe740bdc35d96eb57e7e945e1a93926f9 AUX eblits/src_test.eblit 1162 RMD160 349db09c5f2c2e412a108b8c5371adf946e1a3f0 SHA1 357ef650e1dce62d5d688133426bc62b9085009d SHA256 bac1db2da478f6e6709275c36cc1f9a98fac7fcc2e80bd8831f2077207754962 AUX eblits/src_unpack.eblit 4971 RMD160 64a210a53ca8b8048e9395ba5b716dd064abf755 SHA1 29b1936f649de5606feb12c29f726e312ed3401f SHA256 047d2b0cf9594333bedbfbf4954f939065e8632617151573edc230d3a5825152 AUX fix-sysctl_h.patch 376 RMD160 b5dd68158224b09ddc42986be02351c74f81e0a0 SHA1 5601fbea6961368bcc192aef78e96ee2c5310713 SHA256 3a589f63fd1f3f6c5a00c66a10943d3d64630aefb1eb5b37e7f2a856fcea234a diff --git a/sys-libs/glibc/files/eblits/src_compile.eblit b/sys-libs/glibc/files/eblits/src_compile.eblit index 8cfe5aa..e482daf 100644 --- a/sys-libs/glibc/files/eblits/src_compile.eblit +++ b/sys-libs/glibc/files/eblits/src_compile.eblit @@ -136,10 +136,13 @@ toolchain-glibc_headers_compile() { libc_cv_mips_tls=yes if [[ ${CTARGET} == "mips64el-unknown-linux-gnu" ]] ; then + # remove "-n32" gcc switch, since gcc for other arch don't have this 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 - sed -i 's/_MIPS_SZPTR/64/' "${S}"/ports/sysdeps/mips/bits/wordsize.h + # fix stdio_lim.h missing problem + # if you are building a n64 system, you may need to replace 32 with 64 + sed -i 's/_MIPS_SZPTR/32/' "${S}"/ports/sysdeps/mips/bits/wordsize.h fi # Pick out the correct location for build headers diff --git a/sys-libs/glibc/files/eblits/src_install.eblit b/sys-libs/glibc/files/eblits/src_install.eblit index aa1d4e7..1e54425 100644 --- a/sys-libs/glibc/files/eblits/src_install.eblit +++ b/sys-libs/glibc/files/eblits/src_install.eblit @@ -194,6 +194,11 @@ toolchain-glibc_headers_install() { # we build a 2nd stage cross-compiler, gcc finds the target # system headers correctly. See gcc/doc/gccinstall.info dosym usr/include /usr/${CTARGET}/sys-include + # restore wordsize.h + if [[ ${CTARGET} == "mips64el-unknown-linux-gnu" ]] ; then + sed -i 's/\(__WORDSIZE.\+\)\(32\|64\)$/\1_MIPS_SZPTR/' \ + "${D}"/$(alt_headers)/bits/wordsize.h || die "restore wordsize.h failde" + fi } src_strip() { |