diff options
| author |   Mike Frysinger <vapier@gentoo.org> | 2014-12-31 08:20:02 +0000 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2014-12-31 08:20:02 +0000 |
| commit | d7b3f93c2f5d87e7d61e5137f55dcfd476b1776e (patch) | |
| tree | f2d66d61236a8a8bed3c2207fd8ef67dca9f891d /sys-libs | |
| parent | Initial import. Dependency for dev-ruby/rspectacular. (diff) | |
| download | gentoo-2-d7b3f93c2f5d87e7d61e5137f55dcfd476b1776e.tar.gz gentoo-2-d7b3f93c2f5d87e7d61e5137f55dcfd476b1776e.tar.bz2 gentoo-2-d7b3f93c2f5d87e7d61e5137f55dcfd476b1776e.zip | |
Fix glibc headers builds with newer EAPIs and newer glibc versions #532760 by Ruud Koolen.
(Portage version: 2.2.15/cvs/Linux x86_64, signed Manifest commit with key D2E96200)
Diffstat (limited to 'sys-libs')
| -rw-r--r-- | sys-libs/glibc/ChangeLog | 7 | ||||
| -rw-r--r-- | sys-libs/glibc/files/eblits/src_configure.eblit | 20 |
2 files changed, 20 insertions, 7 deletions
diff --git a/sys-libs/glibc/ChangeLog b/sys-libs/glibc/ChangeLog index 3db6876a0b54..8486d84a19ba 100644 --- a/sys-libs/glibc/ChangeLog +++ b/sys-libs/glibc/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for sys-libs/glibc # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/ChangeLog,v 1.1032 2014/12/28 17:09:09 blueness Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/ChangeLog,v 1.1033 2014/12/31 08:20:02 vapier Exp $ + + 31 Dec 2014; Mike Frysinger <vapier@gentoo.org> + files/eblits/src_configure.eblit: + Fix glibc headers builds with newer EAPIs and newer glibc versions #532760 by + Ruud Koolen. *glibc-2.20-r1 (28 Dec 2014) diff --git a/sys-libs/glibc/files/eblits/src_configure.eblit b/sys-libs/glibc/files/eblits/src_configure.eblit index e0fc185761e0..5a85488dfa44 100644 --- a/sys-libs/glibc/files/eblits/src_configure.eblit +++ b/sys-libs/glibc/files/eblits/src_configure.eblit @@ -1,6 +1,6 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/files/eblits/src_configure.eblit,v 1.2 2014/09/18 16:48:15 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/files/eblits/src_configure.eblit,v 1.3 2014/12/31 08:20:02 vapier Exp $ dump_toolchain_settings() { echo @@ -208,13 +208,10 @@ toolchain-glibc_headers_configure() { export ${v} done - # Pick out the correct location for build headers local ports="" myconf=() - [[ -d ${S}/ports ]] && ports=",ports" myconf+=( --disable-sanity-checks --enable-hacker-mode - --enable-add-ons=nptl${ports} --without-cvs --enable-bind-now --build=${CBUILD_OPT:-${CBUILD}} @@ -224,9 +221,16 @@ toolchain-glibc_headers_configure() { ${EXTRA_ECONF} ) + local addons + [[ -d ${S}/ports ]] && addons+=",ports" + # Newer versions require nptl, so there is no addon for it. + version_is_at_least 2.20 || addons+=",nptl" + 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[@]}" + echo "$@" CC="$(tc-getBUILD_CC)" \ CFLAGS="-O1 -pipe" \ CPPFLAGS="-U_FORTIFY_SOURCE" \ @@ -235,8 +239,12 @@ toolchain-glibc_headers_configure() { } toolchain-glibc_src_configure() { - want_linuxthreads && glibc_do_configure linuxthreads - want_nptl && glibc_do_configure nptl + if just_headers ; then + toolchain-glibc_headers_configure + else + want_linuxthreads && glibc_do_configure linuxthreads + want_nptl && glibc_do_configure nptl + fi } eblit-glibc-src_configure() { |