diff options
Diffstat (limited to 'sys-libs')
| -rw-r--r-- | sys-libs/glibc/Manifest | 2 | ||||
| -rw-r--r-- | sys-libs/glibc/glibc-9999.ebuild | 58 |
2 files changed, 24 insertions, 36 deletions
diff --git a/sys-libs/glibc/Manifest b/sys-libs/glibc/Manifest index 689340378c4a..3e385054e0f4 100644 --- a/sys-libs/glibc/Manifest +++ b/sys-libs/glibc/Manifest @@ -56,7 +56,7 @@ EBUILD glibc-2.25-r5.ebuild 4966 SHA256 ed5fdeab50bec85ee4c5127b598cacf66d1f2b74 EBUILD glibc-2.25-r7.ebuild 4967 SHA256 3793570b4b1bd9bfc3475ba7edca14683b7c5ec9653141f2d1a67751d85f8f65 SHA512 242db7036410f38e18d9dccf75599602d190acdd6b36c344227383d62853526c398c44f88612628de857b7a8ee6f1194d123a1f4e13c23684ca46482f540f91e WHIRLPOOL 952248ef8b7b31c45e6136141cccbf6544f11f01d006ba9d9ba44528c8bdb8a4cf2dab9a0ce707c74987d71bd5b792e618309750457f72242932870a2d99900b EBUILD glibc-2.26-r1.ebuild 23722 SHA256 899859c6118f79e8a74ea4bf962ad05b9c6f7556aaa5fecc725529e4a5139470 SHA512 3ca6176057d707eb408217d19801cffc180f1c1f29b7031ce1b60b600fab92843354a4b41b3a05e195a526c81b3aa1c8b9fe936773365d69c6b3195eb6a4bdd8 WHIRLPOOL dc1d21e11cddbdb3e62ddfce6258fd69e2b79f159a9a98f769a6e38fff723cc074136923a7f2cc426f188fb25d780a0f8a48c752208c830f5b05371a3d7b97b6 EBUILD glibc-2.26-r2.ebuild 23725 SHA256 f67f77719efc019599fcefa6f54e1c5dd6f8ed90a0afb42307994d7d42b5ced8 SHA512 e9ef1fb2811ac3df63ea69f6f72d34c049917e8760ddb6526d10cd372d11958bfcff7de6d170553970de9a1a59f8eaace01743fa456a5bfa7156461059d30329 WHIRLPOOL 091ad1a6e474082e960a4a0b32a8fd461826a5e7a71b932f0c309c3e0eed7e97e664fdd109f945848a9fe77c6f5abc059555e0f4c258d3a9656201ccbc8c5aef -EBUILD glibc-9999.ebuild 23727 SHA256 4a47827f79af8a242f802a8bc4931edd714000a2cdb94f3844a96163c0ad612f SHA512 64fe6c86b3bb288ccb1f60a035d3cc26762b1d950c178b8c9717f422390783974417e7a40e4f29f77d790c31571e3d6bcbdd0200f401d129612c81c3d80b4f4c WHIRLPOOL 8fa3b2d67e4eac18332461e3a40a3ff11293fdf0ac866c21f4a6a7b8485e2234e1d471b1eb6ec264fcbeb12efe60872b653484296ce6d9a3fbf20ecb7c9c2348 +EBUILD glibc-9999.ebuild 23470 SHA256 de9ebe62576c2aec9b4100f721abe27e59654a44dbc28e760eb162da153c9264 SHA512 b8d8a5570e0979e6e64fc918ee8a6d62ce85aa66bcaf63c71f1b3ece630e937a0f0ae474858d3f18971c83eb0ca2f97743f73ef5f248d8745ab78b478bc342cd WHIRLPOOL 07f2d457468cd1d0f6062d696a9479963bf533dd2615a2d1e387a2c0e5bf390e5261ca5a308a2ce3acf34b4f9277969570b2d77f48fb15597c5b685050242345 MISC ChangeLog 17234 SHA256 6aa54d20b4de284c51e7d0691f861af52e68376d48e91788c79f8ee821300a91 SHA512 39aa17d86df6c1d53c9c2ad268b2123bafccd45a226e064e3b759bda73294c7896d43f9846bf2fa401d29fa04efecee414674d923bb632915175adf7e8b24b2b WHIRLPOOL d60c804c21d7b0065aca45a3f761f0c81f96fe681d60df7f33ce13c879325d23a9908a134f948e50f3c57b5c596c93d1b04932bfb501e88d6d1d88847df62d32 MISC ChangeLog-2007 108548 SHA256 d622be202eb0d61a363b0ae4065012cd1d494fefaa0c03d4aa7986177cdde6d0 SHA512 fdb3f311a3be4b97a6acfceb1763af5ea69e74d8195522c5d03307f75e15a9382991e9e29dbfdec79e74f1c36328f82648768749bc929e5050ff64b628c7ca98 WHIRLPOOL e550f354394569069e000a7e70ec69c94388a0f415c19b427203f0dcbcbeeec0f5e379ee2af7886cd2d68559e749fab8122e7e077985729d7e0e728ae9096d7a MISC ChangeLog-2015 77895 SHA256 d7c16b77521b14a7e1c148f1ad699128e4fcf7caf41a77b46844508ba68acf15 SHA512 1a7fee53e1ec55d0b16b949543b01ad6f429f74293cb6ed730f05a3ddfc4a21fdaf7ee80c0c839d456587a207780ccfefdaf68a236989db5129ffba30c77ff5e WHIRLPOOL 48d46ac586309e415b7d669598c330062afd6fcb2668600d5c62e234d5ab8c3dfd2e81d4f528689efb6d5fb5e2ca5e24c68a4c58be52e1c336127d63224e18fd diff --git a/sys-libs/glibc/glibc-9999.ebuild b/sys-libs/glibc/glibc-9999.ebuild index dacec0b7e245..f8e270e663ff 100644 --- a/sys-libs/glibc/glibc-9999.ebuild +++ b/sys-libs/glibc/glibc-9999.ebuild @@ -15,7 +15,7 @@ EMULTILIB_PKG="true" # Configuration variables if [[ ${PV} == 9999* ]]; then - EGIT_REPO_URI="git://sourceware.org/git/glibc.git" + EGIT_REPO_URI="https://sourceware.org/git/glibc.git" inherit git-r3 else # KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" @@ -64,6 +64,10 @@ is_crosscompile() { [[ ${CHOST} != ${CTARGET} ]] } +just_headers() { + is_crosscompile && use crosscompile_opts_headers-only +} + SLOT="2.2" # General: We need a new-enough binutils/gcc to match upstream baseline. @@ -108,6 +112,8 @@ fi # the phases # +# pkg_pretend + pkg_pretend() { # Make sure devpts is mounted correctly for use w/out setuid pt_chown check_devpts @@ -191,6 +197,10 @@ pkg_pretend() { fi fi } +# todo: shouldn't most of these checks be called also in src_configure again? +# (since consistency is not guaranteed between pkg_ and src_) + +# src_unpack src_unpack() { use multilib && unpack gcc-${GCC_BOOTSTRAP_VER}-multilib-bootstrap.tar.bz2 @@ -199,6 +209,7 @@ src_unpack() { # Check NPTL support _before_ we unpack things to save some time check_nptl_support + # todo: 1) move this to pkg_pretend? 2) use proper functions for kv if [[ -n ${EGIT_REPO_URI} ]] ; then git-r3_src_unpack @@ -211,13 +222,6 @@ src_unpack() { cd "${WORKDIR}" unpack glibc-${RELEASE_VER}-patches-${PATCH_VER}.tar.bz2 - # pull out all the addons - local d - for d in extra/*/configure ; do - d=${d%/configure} - [[ -d ${S}/${d} ]] && die "${d} already exists in \${S}" - mv "${d}" "${S}" || die "moving ${d} failed" - done } src_prepare() { @@ -277,7 +281,7 @@ glibc_do_configure() { # we accumulate crap across abis unset CXX - einfo "Configuring glibc for $1" + einfo "Configuring glibc for nptl" local v for v in ABI CBUILD CHOST CTARGET CBUILD_OPT CTARGET_OPT CC CXX LD {AS,C,CPP,CXX,LD}FLAGS ; do @@ -296,18 +300,6 @@ glibc_do_configure() { local myconf=() - # set addons - pushd "${S}" > /dev/null - local addons=$(echo */configure | sed \ - -e 's:/configure::g' \ - -e 's:\(linuxthreads\|nptl\|rtkaio\|glibc-compat\)\( \|$\)::g' \ - -e 's: \+$::' \ - -e 's! !,!g' \ - -e 's!^!,!' \ - -e '/^,\*$/d') - [[ -d ports ]] && addons+=",ports" - popd > /dev/null - case ${CTARGET} in powerpc-*) # Currently gcc on powerpc32 generates invalid code for @@ -325,12 +317,7 @@ glibc_do_configure() { [[ $(tc-is-softfloat) == "yes" ]] && myconf+=( --without-fp ) - if [[ $1 == "nptl" ]] ; then - myconf+=( --enable-kernel=${NPTL_KERN_VER} ) - else - die "invalid pthread option" - fi - myconf+=( --enable-add-ons="${addons#,}" ) + myconf+=( --enable-kernel=${NPTL_KERN_VER} ) # Since SELinux support is only required for nscd, only enable it if: # 1. USE selinux @@ -399,7 +386,7 @@ glibc_do_configure() { # this overriding check. #347761 export libc_cv_hashstyle=no - local builddir=$(builddir "$1") + local builddir=$(builddir nptl) mkdir -p "${builddir}" cd "${builddir}" set -- "${S}"/configure "${myconf[@]}" @@ -420,6 +407,10 @@ glibc_do_configure() { # to lie and use a local copy of gcc. Like if the system # is built with MULTILIB_ABIS="amd64 x86" but we want to # add x32 to it, gcc/glibc don't yet support x32. + # + # This reqires net-libs/rpcsvc-proto now (which provides + # rpcgen) !!! Needs analysis how to best add to deps. + # if [[ -n ${GCC_BOOTSTRAP_VER} ]] && use multilib ; then echo 'main(){}' > "${T}"/test.c if ! $(tc-getCC ${CTARGET}) ${CFLAGS} ${LDFLAGS} "${T}"/test.c -Wl,-emain -lgcc 2>/dev/null ; then @@ -504,10 +495,6 @@ glibc_headers_configure() { ${EXTRA_ECONF} ) - local addons - [[ -d ${S}/ports ]] && addons+=",ports" - myconf+=( --enable-add-ons="${addons#,}" ) - # Nothing is compiled here which would affect the headers for the target. # So forcing CC/CFLAGS is sane. set -- "${S}"/configure "${myconf[@]}" @@ -544,14 +531,14 @@ src_compile() { } glibc_src_test() { - cd "$(builddir $1)" + cd "$(builddir nptl)" emake -j1 check } do_src_test() { local ret=0 - glibc_src_test nptl + glibc_src_test : $(( ret |= $? )) return ${ret} @@ -719,9 +706,10 @@ glibc_do_src_install() { echo 'LDPATH="include ld.so.conf.d/*.conf"' > "${T}"/00glibc doenvd "${T}"/00glibc - for d in BUGS ChangeLog* CONFORMANCE FAQ NEWS NOTES PROJECTS README* ; do + for d in BUGS ChangeLog CONFORMANCE FAQ NEWS NOTES PROJECTS README* ; do [[ -s ${d} ]] && dodoc ${d} done + dodoc -r ChangeLog.old # Prevent overwriting of the /etc/localtime symlink. We'll handle the # creation of the "factory" symlink in pkg_postinst(). |