vapier 14/12/31 08:20:02 Modified: src_configure.eblit Log: 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)
Revision Changes Path 1.3 sys-libs/glibc/files/eblits/src_configure.eblit file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/glibc/files/eblits/src_configure.eblit?rev=1.3&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/glibc/files/eblits/src_configure.eblit?rev=1.3&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/glibc/files/eblits/src_configure.eblit?r1=1.2&r2=1.3 Index: src_configure.eblit =================================================================== RCS file: /var/cvsroot/gentoo-x86/sys-libs/glibc/files/eblits/src_configure.eblit,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- src_configure.eblit 18 Sep 2014 16:48:15 -0000 1.2 +++ src_configure.eblit 31 Dec 2014 08:20:02 -0000 1.3 @@ -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 @@ 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 @@ ${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_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() {
