* [gentoo-commits] gentoo-x86 commit in sys-libs/glibc/files/eblits: common.eblit pkg_setup.eblit
@ 2011-03-20 22:23 Mike Frysinger (vapier)
0 siblings, 0 replies; 2+ messages in thread
From: Mike Frysinger (vapier) @ 2011-03-20 22:23 UTC (permalink / raw
To: gentoo-commits
vapier 11/03/20 22:23:47
Modified: common.eblit pkg_setup.eblit
Log:
Check for the __sync_fetch_and_add symbol directly rather than trying to mess with the defines in the CPP output #199334 by Xavier Neys.
(Portage version: 2.2.0_alpha26/cvs/Linux x86_64)
Revision Changes Path
1.20 sys-libs/glibc/files/eblits/common.eblit
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/glibc/files/eblits/common.eblit?rev=1.20&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/glibc/files/eblits/common.eblit?rev=1.20&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/glibc/files/eblits/common.eblit?r1=1.19&r2=1.20
Index: common.eblit
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-libs/glibc/files/eblits/common.eblit,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- common.eblit 20 Mar 2011 21:28:51 -0000 1.19
+++ common.eblit 20 Mar 2011 22:23:47 -0000 1.20
@@ -1,6 +1,6 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/files/eblits/common.eblit,v 1.19 2011/03/20 21:28:51 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/files/eblits/common.eblit,v 1.20 2011/03/20 22:23:47 vapier Exp $
# We need to be able to set alternative headers for
# compiling for non-native platform
@@ -46,19 +46,19 @@
case $(tc-arch) in
x86)
- # -march needed for #185404
- local t=${CTARGET_OPT:-${CTARGET}}
- t=${t%%-*}
- if ! echo "" | $(tc-getCC) ${CFLAGS} -E -dD - | grep -qs __${t}__ ; then
+ # -march needed for #185404 #199334
+ if ! glibc_compile_test "" 'void f(int i, void *p) {if (__sync_fetch_and_add(&i, 1)) f(i, p);}\nint main(){return 0;}\n' ; then
+ local t=${CTARGET_OPT:-${CTARGET}}
+ t=${t%%-*}
filter-flags '-march=*'
export CFLAGS="-march=${t} ${CFLAGS}"
fi
;;
amd64)
- # -march needed for #185404
- local t=${CTARGET_OPT:-${CTARGET}}
- t=${t%%-*}
- if ! echo "" | $(tc-getCC) ${CFLAGS} ${CFLAGS_x86} -m32 -E -dD - | grep -qs __${t}__ ; then
+ # -march needed for #185404 #199334
+ if ! glibc_compile_test "${CFLAGS_x86}" 'void f(int i, void *p) {if (__sync_fetch_and_add(&i, 1)) f(i, p);}\nint main(){return 0;}\n' ; then
+ local t=${CTARGET_OPT:-${CTARGET}}
+ t=${t%%-*}
filter-flags '-march=*'
export CFLAGS_x86="${CFLAGS_x86} -march=${t}"
fi
1.6 sys-libs/glibc/files/eblits/pkg_setup.eblit
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/glibc/files/eblits/pkg_setup.eblit?rev=1.6&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/glibc/files/eblits/pkg_setup.eblit?rev=1.6&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/glibc/files/eblits/pkg_setup.eblit?r1=1.5&r2=1.6
Index: pkg_setup.eblit
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-libs/glibc/files/eblits/pkg_setup.eblit,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- pkg_setup.eblit 9 Mar 2011 08:02:57 -0000 1.5
+++ pkg_setup.eblit 20 Mar 2011 22:23:47 -0000 1.6
@@ -1,31 +1,48 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/files/eblits/pkg_setup.eblit,v 1.5 2011/03/09 08:02:57 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/files/eblits/pkg_setup.eblit,v 1.6 2011/03/20 22:23:47 vapier Exp $
-glibc_run_test() {
- local ret
+glibc_compile_test() {
+ local ret save_cflags=${CFLAGS}
+ CFLAGS+=" $1"
+ shift
pushd "${T}" >/dev/null
+ rm -f glibc-test*
printf '%b' "$*" > glibc-test.c
+ emake -s glibc-test
+ ret=$?
+
+ popd >/dev/null
+
+ CFLAGS=${save_cflags}
+ return ${ret}
+}
+
+glibc_run_test() {
+ local ret
+
if [[ ${EMERGE_FROM} == "binary" ]] ; then
# ignore build failures when installing a binary package #324685
- emake -s glibc-test 2>/dev/null || return 0
+ glibc_compile_test "" "$@" 2>/dev/null || return 0
else
- if ! emake glibc-test ; then
+ if ! glibc_compile_test "" "$@" ; then
ewarn "Simple build failed ... assuming this is desired #324685"
return 0
fi
fi
+ pushd "${T}" >/dev/null
+
./glibc-test
ret=$?
rm -f glibc-test*
popd >/dev/null
- return $ret
+ return ${ret}
}
eblit-glibc-pkg_setup() {
^ permalink raw reply [flat|nested] 2+ messages in thread
* [gentoo-commits] gentoo-x86 commit in sys-libs/glibc/files/eblits: common.eblit pkg_setup.eblit
@ 2014-10-17 17:30 Mike Frysinger (vapier)
0 siblings, 0 replies; 2+ messages in thread
From: Mike Frysinger (vapier) @ 2014-10-17 17:30 UTC (permalink / raw
To: gentoo-commits
vapier 14/10/17 17:30:04
Modified: common.eblit pkg_setup.eblit
Log:
Tweak nonfatal indirection for EAPI=0 to fix binpkg handling #523332 by Alex Efros.
(Portage version: 2.2.14_rc1/cvs/Linux x86_64, signed Manifest commit with key D2E96200)
Revision Changes Path
1.44 sys-libs/glibc/files/eblits/common.eblit
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/glibc/files/eblits/common.eblit?rev=1.44&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/glibc/files/eblits/common.eblit?rev=1.44&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/glibc/files/eblits/common.eblit?r1=1.43&r2=1.44
Index: common.eblit
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-libs/glibc/files/eblits/common.eblit,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- common.eblit 18 Sep 2014 16:48:15 -0000 1.43
+++ common.eblit 17 Oct 2014 17:30:04 -0000 1.44
@@ -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/common.eblit,v 1.43 2014/09/18 16:48:15 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/files/eblits/common.eblit,v 1.44 2014/10/17 17:30:04 vapier Exp $
alt_prefix() {
is_crosscompile && echo /usr/${CTARGET}
@@ -12,7 +12,10 @@
fi
if [[ ${EAPI:-0} == [0123] ]] ; then
nonfatal() { "$@" ; }
+ _nonfatal() { "$@" ; }
fi
+# This indirection is for binpkgs. #523332
+_nonfatal() { nonfatal "$@" ; }
# We need to be able to set alternative headers for
# compiling for non-native platform
1.14 sys-libs/glibc/files/eblits/pkg_setup.eblit
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/glibc/files/eblits/pkg_setup.eblit?rev=1.14&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/glibc/files/eblits/pkg_setup.eblit?rev=1.14&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/glibc/files/eblits/pkg_setup.eblit?r1=1.13&r2=1.14
Index: pkg_setup.eblit
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-libs/glibc/files/eblits/pkg_setup.eblit,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- pkg_setup.eblit 17 Sep 2014 22:53:43 -0000 1.13
+++ pkg_setup.eblit 17 Oct 2014 17:30:04 -0000 1.14
@@ -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/pkg_setup.eblit,v 1.13 2014/09/17 22:53:43 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/files/eblits/pkg_setup.eblit,v 1.14 2014/10/17 17:30:04 vapier Exp $
glibc_compile_test() {
local ret save_cflags=${CFLAGS}
@@ -12,7 +12,7 @@
rm -f glibc-test*
printf '%b' "$*" > glibc-test.c
- nonfatal emake -s glibc-test
+ _nonfatal emake -s glibc-test
ret=$?
popd >/dev/null
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2014-10-17 17:30 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-10-17 17:30 [gentoo-commits] gentoo-x86 commit in sys-libs/glibc/files/eblits: common.eblit pkg_setup.eblit Mike Frysinger (vapier)
-- strict thread matches above, loose matches on Subject: below --
2011-03-20 22:23 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