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/glibc-9999.ebuild | |
parent | 2d446203bcf1a0db08e99abca43513d246dfa73d (diff) |
gentoo resync : 07.04.2018
Diffstat (limited to 'sys-libs/glibc/glibc-9999.ebuild')
-rw-r--r-- | sys-libs/glibc/glibc-9999.ebuild | 51 |
1 files changed, 23 insertions, 28 deletions
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 |