diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2018-04-07 13:16:39 +0100 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2018-04-07 13:16:39 +0100 |
commit | e91a1aaa5ec8fab37f0fd082ac6024d41c6651e2 (patch) | |
tree | ee7587dfd365faadd9b297d595c31368bf94f9ca /sys-libs/glibc | |
parent | 2d446203bcf1a0db08e99abca43513d246dfa73d (diff) |
gentoo resync : 07.04.2018
Diffstat (limited to 'sys-libs/glibc')
-rw-r--r-- | sys-libs/glibc/Manifest | 4 | ||||
-rw-r--r-- | sys-libs/glibc/glibc-2.27-r1.ebuild | 50 | ||||
-rw-r--r-- | sys-libs/glibc/glibc-9999.ebuild | 51 |
3 files changed, 47 insertions, 58 deletions
diff --git a/sys-libs/glibc/Manifest b/sys-libs/glibc/Manifest index 508ddfaa3dd7..7b0d7c5e5db7 100644 --- a/sys-libs/glibc/Manifest +++ b/sys-libs/glibc/Manifest @@ -52,6 +52,6 @@ EBUILD glibc-2.25-r11.ebuild 5003 BLAKE2B 9d9334d713519b971f1d46a554f1474f74f373 EBUILD glibc-2.25-r9.ebuild 4999 BLAKE2B 6c0784aa614374954c0747deb7a33fdba0f8b1935cc28c62af29880d64991cc93740eddefe8dca971d6c1bbba14161e10db75e00a91d73282e0c0bf094004b94 SHA512 3b5dc2073ae44e6cf5a4f8f64a3c3fd837ebaa222009ee617105259765ff4222fb3960be1c537d4fde6c7e928bd85325d9070cb668b31cb6afb03368c079141f EBUILD glibc-2.26-r5.ebuild 25260 BLAKE2B f28cc4e685eb88a500655c60de886dc862495499413a27034bcb6e49db4a5737df081f813cdc1bf06f763fc03b652ad8ccf0b9d0cad3f975b8d7cf9309af1506 SHA512 a1a40a8b076dbaa71d1f778a3e17d1ff2267dddde68c69e2db68a860f6186eeaab083fad5935113d12ed86fd0d0f20ded0c662df29391e211728ec887f3a6260 EBUILD glibc-2.26-r6.ebuild 25614 BLAKE2B 32bd3f11186c7f5619a7c83358cd5e416bc9c4ff6f6355ab9f65d68e94fefad99557bc993033a711fbea3f402c898ddcd494ecbc3c10f5e0c8dacdfce632b8e0 SHA512 256bbd3e1a5c4aaee844e4da88a0851608ec75fe7d1d10486849be57d14a202e4d10904873cdae565ae9ac216607072f765d18967007a0d16ea5f2103a76b20c -EBUILD glibc-2.27-r1.ebuild 42649 BLAKE2B 731b82d1649c34ab3f32780443666941e2b73c831c06b68d678563f38063841513eae2d90acb7f540419046859ddc1002615bcbd57172d6f69454f4141851895 SHA512 d8dfbcddb7dc76f685a1071e495a130729aa1133a9ef7f2211732355b5c6b21ad074c91fb1b00eb3ec080b684dc449fe2e6e2eaf643abc1a7774fe449c5f89f8 -EBUILD glibc-9999.ebuild 42648 BLAKE2B a71edc5e47761984bbff09c422a1feb356e4a670725feadcad99ad7f9d6c7be39790dbee5d14bf9654f81d1488eb2c43bd903469531692e1b7fc883e47a409af SHA512 a066df7cdfea7b4e8e4938c78eeea27478f197cf8e3a26838c592bbc67880a5ac1e3696fe0907c3082044d87412b017f41ebb7874b85616933b99d71a01729da +EBUILD glibc-2.27-r1.ebuild 41850 BLAKE2B f492330f493a63926de409d2a88a80a85946db6e94d24fe4a9969db115049ac5f68e71ffcec6b823ea157e28f4d145023c992693c7b16ad1b4733847f38a0177 SHA512 b9862f40eeef4eef8472e07a33c06c42def519bf52de39abe16859e0ea5ed4088bf55480221f90c3f63a0aadca6167229e77bafbabe535ca4fc56dbb4bd4230f +EBUILD glibc-9999.ebuild 41850 BLAKE2B 81a39750dbc562c1fdffdc9fefa6f7c17b1e4a8d8f0e5512c95f4ed968bf752faaf7c2f71853eb4a835143348194fa1b9d4b123f1da88ec0873d4b7b33b297ae SHA512 90db26e5834175a50544f81355cdcce039d59655c1d31222ac884cb497828ecd2bd44c0992d10ecb0c1fa7e3fe1002509eeca83bd9b2d1a29608cc813d057324 MISC metadata.xml 1054 BLAKE2B dbc091e54130729385bc02aaa1025885f101caa88d601b1f7670974d89e7e24aae5d37fd6699278a37c0064e1f3232c04954dc127869427317b5d80b499f3813 SHA512 65474b7d32ceb6bafe8ae0e18aa0b46b68cefecce5570a0e8d4a0117019e6540f2feae35cecbebad382b4f06d6e5ae1dfa9b8a61889881e8534956dd42df8e4b diff --git a/sys-libs/glibc/glibc-2.27-r1.ebuild b/sys-libs/glibc/glibc-2.27-r1.ebuild index 588eebae7f2d..3cc1a137ada3 100644 --- a/sys-libs/glibc/glibc-2.27-r1.ebuild +++ b/sys-libs/glibc/glibc-2.27-r1.ebuild @@ -754,33 +754,6 @@ src_prepare() { einfo "Done." fi - if just_headers ; then - if [[ -e ports/sysdeps/mips/preconfigure ]] ; then - # mips peeps like to screw with us. if building headers, - # we don't have a real compiler, so we can't let them - # insert -mabi on us. - sed -i '/CPPFLAGS=.*-mabi/s|.*|:|' ports/sysdeps/mips/preconfigure || die - find ports/sysdeps/mips/ -name Makefile -exec sed -i '/^CC.*-mabi=/s:-mabi=.*:-D_MIPS_SZPTR=32:' {} + - fi - if [[ -e sysdeps/riscv/preconfigure ]] ; then - # RISC-V interrogates the compiler to determine which target to - # build. If building the headers then we don't strictly need a - # RISC-V compiler, so the built-in definitions that are provided - # along with all RISC-V compiler might not exist. This causes - # glibc's RISC-V preconfigure script to blow up. Since we're just - # building the headers any value will actually work here, so just - # pick the standard one (rv64g/lp64d) to make the build scripts - # happy for now -- the headers are all the same anyway so it - # doesn't matter. - sed -i 's/^ xlen=.*/ xlen=64/g' sysdeps/riscv/preconfigure || die - sed -i 's/^ flen=.*/ flen=64/g' sysdeps/riscv/preconfigure || die - sed -i 's/^ float_abi=.*/ float_abi=double/g' sysdeps/riscv/preconfigure || die - sed -i 's/^ atomic=.*/ atomic=__riscv_atomic/g' sysdeps/riscv/preconfigure || die - sed -i 's/^libc_cv_riscv_float_abi=no/libc_cv_riscv_float_abi=d/g' sysdeps/unix/sysv/linux/riscv/configure.ac || die - sed -i 's/^libc_cv_riscv_float_abi=no/libc_cv_riscv_float_abi=d/g' sysdeps/unix/sysv/linux/riscv/configure || die - fi - fi - default gnuconfig_update @@ -1016,6 +989,8 @@ glibc_headers_configure() { export ${v} done + local headers_only_arch_CPPFLAGS=() + # Blow away some random CC settings that screw things up. #550192 if [[ -d ${S}/sysdeps/mips ]]; then pushd "${S}"/sysdeps/mips >/dev/null @@ -1032,6 +1007,25 @@ glibc_headers_configure() { popd >/dev/null fi + case ${CTARGET} in + riscv*) + # RISC-V interrogates the compiler to determine which target to + # build. If building the headers then we don't strictly need a + # RISC-V compiler, so the built-in definitions that are provided + # along with all RISC-V compiler might not exist. This causes + # glibc's RISC-V preconfigure script to blow up. Since we're just + # building the headers any value will actually work here, so just + # pick the standard one (rv64g/lp64d) to make the build scripts + # happy for now -- the headers are all the same anyway so it + # doesn't matter. + headers_only_arch_CPPFLAGS+=( + -D__riscv_xlen=64 + -D__riscv_flen=64 + -D__riscv_float_abi_double=1 + -D__riscv_atomic=1 + ) ;; + esac + local myconf=() myconf+=( --disable-sanity-checks @@ -1050,7 +1044,7 @@ glibc_headers_configure() { # So forcing CC/CFLAGS is sane. local headers_only_CC=$(tc-getBUILD_CC) local headers_only_CFLAGS="-O1 -pipe" - local headers_only_CPPFLAGS="-U_FORTIFY_SOURCE" + local headers_only_CPPFLAGS="-U_FORTIFY_SOURCE ${headers_only_arch_CPPFLAGS[*]}" local headers_only_LDFLAGS="" set -- "${S}"/configure "${myconf[@]}" echo \ diff --git a/sys-libs/glibc/glibc-9999.ebuild b/sys-libs/glibc/glibc-9999.ebuild index e6d10969e8b3..519bc28c9546 100644 --- a/sys-libs/glibc/glibc-9999.ebuild +++ b/sys-libs/glibc/glibc-9999.ebuild @@ -754,33 +754,6 @@ src_prepare() { einfo "Done." fi - if just_headers ; then - if [[ -e ports/sysdeps/mips/preconfigure ]] ; then - # mips peeps like to screw with us. if building headers, - # we don't have a real compiler, so we can't let them - # insert -mabi on us. - sed -i '/CPPFLAGS=.*-mabi/s|.*|:|' ports/sysdeps/mips/preconfigure || die - find ports/sysdeps/mips/ -name Makefile -exec sed -i '/^CC.*-mabi=/s:-mabi=.*:-D_MIPS_SZPTR=32:' {} + - fi - if [[ -e sysdeps/riscv/preconfigure ]] ; then - # RISC-V interrogates the compiler to determine which target to - # build. If building the headers then we don't strictly need a - # RISC-V compiler, so the built-in definitions that are provided - # along with all RISC-V compiler might not exist. This causes - # glibc's RISC-V preconfigure script to blow up. Since we're just - # building the headers any value will actually work here, so just - # pick the standard one (rv64g/lp64d) to make the build scripts - # happy for now -- the headers are all the same anyway so it - # doesn't matter. - sed -i 's/^ xlen=.*/ xlen=64/g' sysdeps/riscv/preconfigure || die - sed -i 's/^ flen=.*/ flen=64/g' sysdeps/riscv/preconfigure || die - sed -i 's/^ float_abi=.*/ float_abi=double/g' sysdeps/riscv/preconfigure || die - sed -i 's/^ atomic=.*/ atomic=__riscv_atomic/g' sysdeps/riscv/preconfigure || die - sed -i 's/^libc_cv_riscv_float_abi=no/libc_cv_riscv_float_abi=d/g' sysdeps/unix/sysv/linux/riscv/configure.ac || die - sed -i 's/^libc_cv_riscv_float_abi=no/libc_cv_riscv_float_abi=d/g' sysdeps/unix/sysv/linux/riscv/configure || die - fi - fi - default gnuconfig_update @@ -1016,6 +989,8 @@ glibc_headers_configure() { export ${v} done + local headers_only_arch_CPPFLAGS=() + # Blow away some random CC settings that screw things up. #550192 if [[ -d ${S}/sysdeps/mips ]]; then pushd "${S}"/sysdeps/mips >/dev/null @@ -1032,6 +1007,25 @@ glibc_headers_configure() { popd >/dev/null fi + case ${CTARGET} in + riscv*) + # RISC-V interrogates the compiler to determine which target to + # build. If building the headers then we don't strictly need a + # RISC-V compiler, so the built-in definitions that are provided + # along with all RISC-V compiler might not exist. This causes + # glibc's RISC-V preconfigure script to blow up. Since we're just + # building the headers any value will actually work here, so just + # pick the standard one (rv64g/lp64d) to make the build scripts + # happy for now -- the headers are all the same anyway so it + # doesn't matter. + headers_only_arch_CPPFLAGS+=( + -D__riscv_xlen=64 + -D__riscv_flen=64 + -D__riscv_float_abi_double=1 + -D__riscv_atomic=1 + ) ;; + esac + local myconf=() myconf+=( --disable-sanity-checks @@ -1050,7 +1044,7 @@ glibc_headers_configure() { # So forcing CC/CFLAGS is sane. local headers_only_CC=$(tc-getBUILD_CC) local headers_only_CFLAGS="-O1 -pipe" - local headers_only_CPPFLAGS="-U_FORTIFY_SOURCE" + local headers_only_CPPFLAGS="-U_FORTIFY_SOURCE ${headers_only_arch_CPPFLAGS[*]}" local headers_only_LDFLAGS="" set -- "${S}"/configure "${myconf[@]}" echo \ @@ -1108,6 +1102,7 @@ src_test() { if just_headers ; then return fi + # Give tests more time to complete. export TIMEOUTFACTOR=5 |