* [gentoo-commits] gentoo-x86 commit in sys-libs/glibc/files/eblits: src_configure.eblit
@ 2014-12-31 8:20 Mike Frysinger (vapier)
0 siblings, 0 replies; 5+ messages in thread
From: Mike Frysinger (vapier) @ 2014-12-31 8:20 UTC (permalink / raw
To: gentoo-commits
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() {
^ permalink raw reply [flat|nested] 5+ messages in thread
* [gentoo-commits] gentoo-x86 commit in sys-libs/glibc/files/eblits: src_configure.eblit
@ 2015-02-09 15:39 Mike Frysinger (vapier)
0 siblings, 0 replies; 5+ messages in thread
From: Mike Frysinger (vapier) @ 2015-02-09 15:39 UTC (permalink / raw
To: gentoo-commits
vapier 15/02/09 15:39:48
Modified: src_configure.eblit
Log:
Disable -Werror when building.
(Portage version: 2.2.15/cvs/Linux x86_64, signed Manifest commit with key D2E96200)
Revision Changes Path
1.4 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.4&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/glibc/files/eblits/src_configure.eblit?rev=1.4&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/glibc/files/eblits/src_configure.eblit?r1=1.3&r2=1.4
Index: src_configure.eblit
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-libs/glibc/files/eblits/src_configure.eblit,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- src_configure.eblit 31 Dec 2014 08:20:02 -0000 1.3
+++ src_configure.eblit 9 Feb 2015 15:39:48 -0000 1.4
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 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.3 2014/12/31 08:20:02 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/files/eblits/src_configure.eblit,v 1.4 2015/02/09 15:39:48 vapier Exp $
dump_toolchain_settings() {
echo
@@ -101,6 +101,7 @@
myconf+=(
--without-cvs
+ --disable-werror
--enable-bind-now
--build=${CBUILD_OPT:-${CBUILD}}
--host=${CTARGET_OPT:-${CTARGET}}
@@ -213,6 +214,7 @@
--disable-sanity-checks
--enable-hacker-mode
--without-cvs
+ --disable-werror
--enable-bind-now
--build=${CBUILD_OPT:-${CBUILD}}
--host=${CTARGET_OPT:-${CTARGET}}
^ permalink raw reply [flat|nested] 5+ messages in thread
* [gentoo-commits] gentoo-x86 commit in sys-libs/glibc/files/eblits: src_configure.eblit
@ 2015-02-09 16:14 Mike Frysinger (vapier)
0 siblings, 0 replies; 5+ messages in thread
From: Mike Frysinger (vapier) @ 2015-02-09 16:14 UTC (permalink / raw
To: gentoo-commits
vapier 15/02/09 16:14:04
Modified: src_configure.eblit
Log:
Drop unused ports variable #532760#2 by Arfrever Frehtes Taifersar Arahesis.
(Portage version: 2.2.15/cvs/Linux x86_64, signed Manifest commit with key D2E96200)
Revision Changes Path
1.5 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.5&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/glibc/files/eblits/src_configure.eblit?rev=1.5&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/glibc/files/eblits/src_configure.eblit?r1=1.4&r2=1.5
Index: src_configure.eblit
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-libs/glibc/files/eblits/src_configure.eblit,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- src_configure.eblit 9 Feb 2015 15:39:48 -0000 1.4
+++ src_configure.eblit 9 Feb 2015 16:14:04 -0000 1.5
@@ -1,6 +1,6 @@
# Copyright 1999-2015 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.4 2015/02/09 15:39:48 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/files/eblits/src_configure.eblit,v 1.5 2015/02/09 16:14:04 vapier Exp $
dump_toolchain_settings() {
echo
@@ -209,7 +209,7 @@
export ${v}
done
- local ports="" myconf=()
+ local myconf=()
myconf+=(
--disable-sanity-checks
--enable-hacker-mode
^ permalink raw reply [flat|nested] 5+ messages in thread
* [gentoo-commits] gentoo-x86 commit in sys-libs/glibc/files/eblits: src_configure.eblit
@ 2015-03-17 0:06 Mike Frysinger (vapier)
0 siblings, 0 replies; 5+ messages in thread
From: Mike Frysinger (vapier) @ 2015-03-17 0:06 UTC (permalink / raw
To: gentoo-commits
vapier 15/03/17 00:06:40
Modified: src_configure.eblit
Log:
Use new tc-ld-disable-gold helper.
(Portage version: 2.2.18/cvs/Linux x86_64, signed Manifest commit with key D2E96200)
Revision Changes Path
1.6 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.6&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/glibc/files/eblits/src_configure.eblit?rev=1.6&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/glibc/files/eblits/src_configure.eblit?r1=1.5&r2=1.6
Index: src_configure.eblit
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-libs/glibc/files/eblits/src_configure.eblit,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- src_configure.eblit 9 Feb 2015 16:14:04 -0000 1.5
+++ src_configure.eblit 17 Mar 2015 00:06:40 -0000 1.6
@@ -1,6 +1,6 @@
# Copyright 1999-2015 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.5 2015/02/09 16:14:04 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/files/eblits/src_configure.eblit,v 1.6 2015/03/17 00:06:40 vapier Exp $
dump_toolchain_settings() {
echo
@@ -8,23 +8,20 @@
einfo "$*"
local v
- for v in ABI CBUILD CHOST CTARGET CBUILD_OPT CTARGET_OPT CC {AS,C,CPP,CXX,LD}FLAGS ; do
+ for v in ABI CBUILD CHOST CTARGET CBUILD_OPT CTARGET_OPT CC LD {AS,C,CPP,CXX,LD}FLAGS ; do
einfo " $(printf '%15s' ${v}:) ${!v}"
done
- export CC=$(tc-getCC ${CTARGET})
- # Glibc does not work with gold (for various reasons) #269274.
- if $(tc-getLD ${CTARGET}) --version | grep -q 'GNU gold' ; then
- local d="${T}/bfd-linker"
- mkdir -p "${d}"
- ln -sf $(which ${CTARGET}-ld.bfd) "${d}"/ld
- CC+=" -B${d}"
- fi
+ # The glibc configure script doesn't properly use LDFLAGS all the time.
+ export CC="$(tc-getCC ${CTARGET}) ${LDFLAGS}"
einfo " $(printf '%15s' 'Manual CC:') ${CC}"
echo
}
glibc_do_configure() {
+ # Glibc does not work with gold (for various reasons) #269274.
+ tc-ld-disable-gold
+
dump_toolchain_settings "Configuring glibc for $1"
local myconf=()
^ permalink raw reply [flat|nested] 5+ messages in thread
* [gentoo-commits] gentoo-x86 commit in sys-libs/glibc/files/eblits: src_configure.eblit
@ 2015-05-30 5:29 Mike Frysinger (vapier)
0 siblings, 0 replies; 5+ messages in thread
From: Mike Frysinger (vapier) @ 2015-05-30 5:29 UTC (permalink / raw
To: gentoo-commits
vapier 15/05/30 05:29:28
Modified: src_configure.eblit
Log:
Hack around mips compiler settings when generating glibc headers #550192 by Andrew Aladjev.
(Portage version: 2.2.20/cvs/Linux x86_64, signed Manifest commit with key D2E96200)
Revision Changes Path
1.7 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.7&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/glibc/files/eblits/src_configure.eblit?rev=1.7&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/glibc/files/eblits/src_configure.eblit?r1=1.6&r2=1.7
Index: src_configure.eblit
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-libs/glibc/files/eblits/src_configure.eblit,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- src_configure.eblit 17 Mar 2015 00:06:40 -0000 1.6
+++ src_configure.eblit 30 May 2015 05:29:28 -0000 1.7
@@ -1,6 +1,6 @@
# Copyright 1999-2015 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.6 2015/03/17 00:06:40 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/files/eblits/src_configure.eblit,v 1.7 2015/05/30 05:29:28 vapier Exp $
dump_toolchain_settings() {
echo
@@ -206,6 +206,14 @@
export ${v}
done
+ # Blow away some random CC settings that screw things up. #550192
+ if [[ -d ${S}/sysdeps/mips ]]; then
+ pushd "${S}"/sysdeps/mips >/dev/null
+ sed -i -e '/^CC +=/s:=.*:= -D_MIPS_SZPTR=32:' mips32/Makefile mips64/n32/Makefile || die
+ sed -i -e '/^CC +=/s:=.*:= -D_MIPS_SZPTR=64:' mips64/n64/Makefile || die
+ popd >/dev/null
+ fi
+
local myconf=()
myconf+=(
--disable-sanity-checks
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2015-05-30 5:29 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-02-09 15:39 [gentoo-commits] gentoo-x86 commit in sys-libs/glibc/files/eblits: src_configure.eblit Mike Frysinger (vapier)
-- strict thread matches above, loose matches on Subject: below --
2015-05-30 5:29 Mike Frysinger (vapier)
2015-03-17 0:06 Mike Frysinger (vapier)
2015-02-09 16:14 Mike Frysinger (vapier)
2014-12-31 8:20 Mike Frysinger (vapier)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox