| 1 |
vapier 10/09/30 06:29:21 |
| 2 |
|
| 3 |
Modified: common.eblit src_compile.eblit |
| 4 |
Log: |
| 5 |
Take care of checking binutils gnu indirect support ourselves for now #336792 by Sergei Trofimovich. |
| 6 |
|
| 7 |
(Portage version: 2.2_rc86/cvs/Linux x86_64) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.12 sys-libs/glibc/files/eblits/common.eblit |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/glibc/files/eblits/common.eblit?rev=1.12&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/glibc/files/eblits/common.eblit?rev=1.12&content-type=text/plain |
| 14 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/glibc/files/eblits/common.eblit?r1=1.11&r2=1.12 |
| 15 |
|
| 16 |
Index: common.eblit |
| 17 |
=================================================================== |
| 18 |
RCS file: /var/cvsroot/gentoo-x86/sys-libs/glibc/files/eblits/common.eblit,v |
| 19 |
retrieving revision 1.11 |
| 20 |
retrieving revision 1.12 |
| 21 |
diff -u -r1.11 -r1.12 |
| 22 |
--- common.eblit 16 Jun 2010 01:43:37 -0000 1.11 |
| 23 |
+++ common.eblit 30 Sep 2010 06:29:21 -0000 1.12 |
| 24 |
@@ -1,6 +1,6 @@ |
| 25 |
-# Copyright 1999-2007 Gentoo Foundation |
| 26 |
+# Copyright 1999-2010 Gentoo Foundation |
| 27 |
# Distributed under the terms of the GNU General Public License v2 |
| 28 |
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/files/eblits/common.eblit,v 1.11 2010/06/16 01:43:37 zorry Exp $ |
| 29 |
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/files/eblits/common.eblit,v 1.12 2010/09/30 06:29:21 vapier Exp $ |
| 30 |
|
| 31 |
# We need to be able to set alternative headers for |
| 32 |
# compiling for non-native platform |
| 33 |
@@ -251,6 +251,17 @@ |
| 34 |
esac |
| 35 |
} |
| 36 |
|
| 37 |
+use_multiarch() { |
| 38 |
+ # Make sure binutils is new enough to support indirect functions #336792 |
| 39 |
+ local bver=$($(tc-getLD ${CTARGET}) -v | awk '{print $NF}') nver |
| 40 |
+ case $(tc-arch ${CTARGET}) in |
| 41 |
+ amd64|x86) nver="2.20" ;; |
| 42 |
+ sparc) nver="2.21" ;; |
| 43 |
+ *) return 1 ;; |
| 44 |
+ esac |
| 45 |
+ version_is_at_least ${nver} ${bver} |
| 46 |
+} |
| 47 |
+ |
| 48 |
# Setup toolchain variables that would be defined in the profiles for these archs. |
| 49 |
setup_env() { |
| 50 |
# silly users |
| 51 |
|
| 52 |
|
| 53 |
|
| 54 |
1.15 sys-libs/glibc/files/eblits/src_compile.eblit |
| 55 |
|
| 56 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/glibc/files/eblits/src_compile.eblit?rev=1.15&view=markup |
| 57 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/glibc/files/eblits/src_compile.eblit?rev=1.15&content-type=text/plain |
| 58 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/glibc/files/eblits/src_compile.eblit?r1=1.14&r2=1.15 |
| 59 |
|
| 60 |
Index: src_compile.eblit |
| 61 |
=================================================================== |
| 62 |
RCS file: /var/cvsroot/gentoo-x86/sys-libs/glibc/files/eblits/src_compile.eblit,v |
| 63 |
retrieving revision 1.14 |
| 64 |
retrieving revision 1.15 |
| 65 |
diff -u -r1.14 -r1.15 |
| 66 |
--- src_compile.eblit 30 Sep 2010 06:27:59 -0000 1.14 |
| 67 |
+++ src_compile.eblit 30 Sep 2010 06:29:21 -0000 1.15 |
| 68 |
@@ -1,6 +1,6 @@ |
| 69 |
# Copyright 1999-2010 Gentoo Foundation |
| 70 |
# Distributed under the terms of the GNU General Public License v2 |
| 71 |
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/files/eblits/src_compile.eblit,v 1.14 2010/09/30 06:27:59 vapier Exp $ |
| 72 |
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/files/eblits/src_compile.eblit,v 1.15 2010/09/30 06:29:21 vapier Exp $ |
| 73 |
|
| 74 |
glibc_do_configure() { |
| 75 |
local myconf |
| 76 |
@@ -85,6 +85,7 @@ |
| 77 |
--mandir=/usr/share/man |
| 78 |
--infodir=/usr/share/info |
| 79 |
--libexecdir=/usr/$(get_libdir)/misc/glibc |
| 80 |
+ $(use_multiarch || echo --disable-multi-arch) |
| 81 |
${EXTRA_ECONF}" |
| 82 |
|
| 83 |
# There is no configure option for this and we need to export it |
Archives