| 1 |
vapier 14/12/31 08:20:02 |
| 2 |
|
| 3 |
Modified: src_configure.eblit |
| 4 |
Log: |
| 5 |
Fix glibc headers builds with newer EAPIs and newer glibc versions #532760 by Ruud Koolen. |
| 6 |
|
| 7 |
(Portage version: 2.2.15/cvs/Linux x86_64, signed Manifest commit with key D2E96200) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.3 sys-libs/glibc/files/eblits/src_configure.eblit |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/glibc/files/eblits/src_configure.eblit?rev=1.3&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/glibc/files/eblits/src_configure.eblit?rev=1.3&content-type=text/plain |
| 14 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/glibc/files/eblits/src_configure.eblit?r1=1.2&r2=1.3 |
| 15 |
|
| 16 |
Index: src_configure.eblit |
| 17 |
=================================================================== |
| 18 |
RCS file: /var/cvsroot/gentoo-x86/sys-libs/glibc/files/eblits/src_configure.eblit,v |
| 19 |
retrieving revision 1.2 |
| 20 |
retrieving revision 1.3 |
| 21 |
diff -u -r1.2 -r1.3 |
| 22 |
--- src_configure.eblit 18 Sep 2014 16:48:15 -0000 1.2 |
| 23 |
+++ src_configure.eblit 31 Dec 2014 08:20:02 -0000 1.3 |
| 24 |
@@ -1,6 +1,6 @@ |
| 25 |
# Copyright 1999-2014 Gentoo Foundation |
| 26 |
# Distributed under the terms of the GNU General Public License v2 |
| 27 |
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/files/eblits/src_configure.eblit,v 1.2 2014/09/18 16:48:15 vapier Exp $ |
| 28 |
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/files/eblits/src_configure.eblit,v 1.3 2014/12/31 08:20:02 vapier Exp $ |
| 29 |
|
| 30 |
dump_toolchain_settings() { |
| 31 |
echo |
| 32 |
@@ -208,13 +208,10 @@ |
| 33 |
export ${v} |
| 34 |
done |
| 35 |
|
| 36 |
- # Pick out the correct location for build headers |
| 37 |
local ports="" myconf=() |
| 38 |
- [[ -d ${S}/ports ]] && ports=",ports" |
| 39 |
myconf+=( |
| 40 |
--disable-sanity-checks |
| 41 |
--enable-hacker-mode |
| 42 |
- --enable-add-ons=nptl${ports} |
| 43 |
--without-cvs |
| 44 |
--enable-bind-now |
| 45 |
--build=${CBUILD_OPT:-${CBUILD}} |
| 46 |
@@ -224,9 +221,16 @@ |
| 47 |
${EXTRA_ECONF} |
| 48 |
) |
| 49 |
|
| 50 |
+ local addons |
| 51 |
+ [[ -d ${S}/ports ]] && addons+=",ports" |
| 52 |
+ # Newer versions require nptl, so there is no addon for it. |
| 53 |
+ version_is_at_least 2.20 || addons+=",nptl" |
| 54 |
+ myconf+=( --enable-add-ons="${addons#,}" ) |
| 55 |
+ |
| 56 |
# Nothing is compiled here which would affect the headers for the target. |
| 57 |
# So forcing CC/CFLAGS is sane. |
| 58 |
set -- "${S}"/configure "${myconf[@]}" |
| 59 |
+ echo "$@" |
| 60 |
CC="$(tc-getBUILD_CC)" \ |
| 61 |
CFLAGS="-O1 -pipe" \ |
| 62 |
CPPFLAGS="-U_FORTIFY_SOURCE" \ |
| 63 |
@@ -235,8 +239,12 @@ |
| 64 |
} |
| 65 |
|
| 66 |
toolchain-glibc_src_configure() { |
| 67 |
- want_linuxthreads && glibc_do_configure linuxthreads |
| 68 |
- want_nptl && glibc_do_configure nptl |
| 69 |
+ if just_headers ; then |
| 70 |
+ toolchain-glibc_headers_configure |
| 71 |
+ else |
| 72 |
+ want_linuxthreads && glibc_do_configure linuxthreads |
| 73 |
+ want_nptl && glibc_do_configure nptl |
| 74 |
+ fi |
| 75 |
} |
| 76 |
|
| 77 |
eblit-glibc-src_configure() { |
Archives