Add fix from upstream for PIC compile checks #417179 by Richard Yao.

Package-Manager: portage-2.2.0_alpha144/cvs/Linux x86_64
Manifest-Sign-Key: 0xFB7C4156

4 files changed, 145 insertions, 6 deletions

diff --git a/dev-libs/libffi/ChangeLog b/dev-libs/libffi/ChangeLog
index 8dba90dfe021..01312a9bb2a5 100644
--- a/dev-libs/libffi/ChangeLog
+++ b/dev-libs/libffi/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-libs/libffi
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libffi/ChangeLog,v 1.157 2012/12/07 23:12:09 ago Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libffi/ChangeLog,v 1.158 2013/01/13 04:52:11 vapier Exp $
+
+  13 Jan 2013; Mike Frysinger <vapier@gentoo.org>
+  +files/libffi-3.0.11-x86-pic-check.patch, libffi-3.0.11.ebuild:
+  Add fix from upstream for PIC compile checks #417179 by Richard Yao.
 
   07 Dec 2012; Agostino Sarubbo <ago@gentoo.org> libffi-3.0.11.ebuild:
   Stable for ppc64, wrt bug #416669
diff --git a/dev-libs/libffi/Manifest b/dev-libs/libffi/Manifest
index d770590f17ed..49d4f17f71d3 100644
--- a/dev-libs/libffi/Manifest
+++ b/dev-libs/libffi/Manifest
@@ -1,7 +1,28 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
+AUX libffi-3.0.11-x86-pic-check.patch 3716 SHA256 247edfe37709f7a0d193169a31a0a8baa730b0d63606ec56928088aadf498c4f SHA512 addbab5c6a9a4701e43443ae438b2fe6cee6c2b5b09b5d40706ca648c311ef9d0d900b9234cfa7872aacb52bee9f499c9d3f8e27af1d983c2f791185fcb028ea WHIRLPOOL 395e3081d5c5b4da7cbbd60689e64459533eb348d8962b59a507f19d3167543b57e4a1ce82b5a979e4709daf7125bc61ef32d0870578951f30a1365745c8613e
 AUX libffi-3.0.9-x32.patch 2113 SHA256 97a339b12f62b734c7d4d07145e7210c67577552d13cc506f7cc69468daeea71 SHA512 7f014ac96f43335515c4b1c39eae6461a47f34afdafae82cb7dd647852f586a9ec32f7f0cfca90cbb5fbe061bbddad32240c4b92cb345a845c125caea53ab42e WHIRLPOOL 9ee1811d85e07eb0b82e2912ca7852a15353256546621ae5ff121f6940a61f753d83d20d498aa63e86d1972872fb78e48c20e2e90a47b2badd4112050dbfe61d
 DIST libffi-3.0.10.tar.gz 753346 SHA256 f01eb9027e9eb56aeaeef636649877756d475d714ef8b47f627f65bc5f3b492f SHA512 56076fe3c1556970fbbb9c8398101583492471de00d58fa3b87a18c9c01c276fc5bf429e49da0196e840126e8fef59d231734739c673c636f6be7a798b081cf7 WHIRLPOOL 29550a9dc21bbdb694fc78f6020dd70f0ed6067859164be92d9b076e9fdeb59af032fb20bb786376cf920b67f3bb0e10c5f7754aefa5c4a46d17718409d4f7fa
 DIST libffi-3.0.11.tar.gz 794220 SHA256 70bfb01356360089aa97d3e71e3edf05d195599fd822e922e50d46a0055a6283 SHA512 0049388d16207078a3d6dce97c877f1d9647aa9d908a9372a3f67ca064b70d8c8b23ee458be4a15a6344a5d39ea3e6292be728dfbcc73e1efc0b1db03be874f3 WHIRLPOOL c5ee01a6415b2715a4542d0997e3a7f42cbc97e476589d4e093fcff44315cc83f78a02dc04929c96831309966ac196e6ceb134c8b14cfc02313e139a98e6c11a
 EBUILD libffi-3.0.10.ebuild 1620 SHA256 c5e2a9ec831ffc2165fe4391510ceb43796fd048e98066742065d9818af4c4cd SHA512 70212f59dcf98e4d8b49ccfb7d5ebd61587aa785bc44c5a5c73cbb71c977c1adb74883ccafb6def20b9fe4f8275118edd277dbf12a6f933a45288e2ef68a8de6 WHIRLPOOL 711aea572e153dd608f21c8fb032bcb1e34c5c68723f49d4192c4fb15bd3d9b3205be2b2b360eeac96743a8b64e1b428a3d944233a012521e22aec15d00874b7
-EBUILD libffi-3.0.11.ebuild 1931 SHA256 e6f3df276fb72d565ed26472e0b87534b6b4d9f18aa13534b4df25937d7b6fdf SHA512 1a8b2652b06378e9aa66d6ff70adb3a4fc87c5c4820378dba9a767778276e193cbadf4a7c6ce580fd63271790c8238fc97e1caf37c59a165c8eadf994ff8b117 WHIRLPOOL 8fed37efb9c294222ae57f9b1e2a9bf14a46f0de4dfe99ba1b272d63f7255ad2bd3eede34c0da8a37276e5abab9ebe7b6faded854d0c4ac2e8ef94edf51563d9
-MISC ChangeLog 21056 SHA256 98a6926c1a5a5b036ee691f38ac3f810e68989aea3d5335cf379a9b065ff90cc SHA512 65ba83178302a2517f2813d398f0791805a572bd7a6d070bd2e6577e5ac5c0e2b5f3f3b8ef2c4ddf3aedde9fe8f0163d0987e21b561f2770907a62d4395eceae WHIRLPOOL a381af6d96cab3b4fecba257ca3e82fd41d090668ba813f5dec6e3b9178d587e5db278f75430f03c925ac8ca5ca8fdc3d662af2eaab02ac8729072cca18482b8
+EBUILD libffi-3.0.11.ebuild 1989 SHA256 f2465f8d03e744b3f42d0d032da9e0011e8369fa70ab2cdf9b6a18b070140fa0 SHA512 9e172673c9229224efb6a527ad0f5a9e21cea93a3f750073aefb0b9ea27e7f82f6c1749e5f5a75e32b8e548d68e12372ecba04fc9754a6f7e9f9873cb3c8a25b WHIRLPOOL 2c1d90a9812ebda02a1bdf5398820826215fdebc50377273b01e9b83b5363118d06e778beba5ea30bccdcbc7a4151d9e2b3b18ddec27e25504ddc178113f2c6d
+MISC ChangeLog 21247 SHA256 8d5d16ff34357364342a39ea4741569538ad23e107cf483ffdcff71944f0c461 SHA512 e6f548415a06d3352e60b873f4e9a04b065e2b1c45216f8f16dffa46520898012a615498ea5fb952418b348f35b9166c3fd8f65c5d4169a0b29696a824e509ed WHIRLPOOL 78885b374ac65a76273bad49c2c51144ca171d29d8d29253ec69f2ecc1768d0d7ae6f6d432390541b2a852845f374673e9ffd086cbb58b6d611be1d5a9b5cf26
 MISC metadata.xml 1663 SHA256 f03f0b55cdf4405ead462ba1c1b8ff2f1b6821c22c3f23d484490f8c875f6073 SHA512 ec2605d08f41729ed229d488890faaae9931c13ff43b2d2eda63fc3b55d475b0e7dd84fda8aec58bcf53954c23bf31591784e9a3b60b3037b18828ed7651766f WHIRLPOOL 538b12775d5cb85f1be40c8ac7b017b0a8840f2d48c7fc2d1b1756385d3b6854b0e0998011afab70b1dd8aec4151358ebfcfc172fddda761c9304ff3a07254c4
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iQIcBAEBCAAGBQJQ8j4vAAoJELEHsLL7fEFWB6MP/0F0D98LhRhMIhO3jbdBJtfM
+ziiChnSNVNbk8cJQZ2JkTEjuG1e6v1in1SbdMUmdoZKOxbo9b8/sQE8jsB1s9pnO
+dpCmwRvKSQIycFabc3rtB6b8LjA6jzQsGa8hzNIvsobSgDl8HsNjuPG7R3TsTrv1
+ec6lm6W7a513aRJlI12vao8KFRIsx40GNiRLfSp3BWoIn1apMY9VGWyimrPr4qOz
+WzTel72D9Mq+IH7DzqZoFKf2ZvO7+GFUDVgkhFQ7iEXvkHdlagGUnX66ODwkuIcc
+pXcnfaQuk5W9mwOwgWnXBHdAawc4fLoqcTUBKy5WlSX1l01x8STGWSr5fV71YmnE
+N8jAzvym470/0rVn/4yGEDONwIs1Uei7bwWEgUfj+A5bb+JXWl/x75eydJ80t4uV
+/Badfj6ly4K7ph/YjH5VtAv4573JttvreAkd0DlXvMMLQR7QEuoFBbNjb2A80cWU
+a+fDoyU/zFxko/fF1KLNPyTPxa/jMUJqp6G5hs8bjMN3Xh3oDQXLUSoXooDNfeKz
+OTD2fSrAZJwvhhWunVe2P1zLdLZxsE6Bm+b40m8Jq5k92pz8O3/jkdhO5+hekhL8
+P7cvwKlQMuFBOzTN+kfC1jRGUAWlpeq+yAxTxeo8m9f2vURN/RlwsOMO2nGh0Di2
+lHECkbOJ4Pigek+UfckC
+=wfUN
+-----END PGP SIGNATURE-----
diff --git a/dev-libs/libffi/files/libffi-3.0.11-x86-pic-check.patch b/dev-libs/libffi/files/libffi-3.0.11-x86-pic-check.patch
new file mode 100644
index 000000000000..40f553221089
--- /dev/null
+++ b/dev-libs/libffi/files/libffi-3.0.11-x86-pic-check.patch
@@ -0,0 +1,113 @@
+https://bugs.gentoo.org/417179
+https://github.com/atgreen/libffi/issues/21
+
+From bff052d9cd5be41ba9e47c76114054af487d3c30 Mon Sep 17 00:00:00 2001
+From: Anthony Green <green@moxielogic.com>
+Date: Fri, 11 Jan 2013 10:24:32 -0500
+Subject: [PATCH] 32-bit x86 fix and more
+
+---
+ ChangeLog          |    8 ++++++++
+ README             |    2 ++
+ configure          |   43 +++++--------------------------------------
+ configure.ac       |    6 +++---
+ m4/ax_cc_maxopt.m4 |    3 ++-
+ 5 files changed, 20 insertions(+), 42 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 5ca32fd..32ec7c5 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -334,10 +334,10 @@ fi
+ if test x$TARGET = xX86 || test x$TARGET = xX86_WIN32 || test x$TARGET = xX86_64; then
+     AC_CACHE_CHECK([assembler supports pc related relocs],
+ 	libffi_cv_as_x86_pcrel, [
+-	libffi_cv_as_x86_pcrel=yes
++	libffi_cv_as_x86_pcrel=no
+ 	echo '.text; foo: nop; .data; .long foo-.; .text' > conftest.s
+-	if $CC $CFLAGS -c conftest.s 2>&1 | $EGREP -i 'illegal|warning' > /dev/null; then
+-	    libffi_cv_as_x86_pcrel=no
++	if $CC $CFLAGS -c conftest.s > /dev/null 2>&1; then
++	    libffi_cv_as_x86_pcrel=yes
+ 	fi
+ 	])
+     if test "x$libffi_cv_as_x86_pcrel" = xyes; then
+diff --git a/m4/ax_cc_maxopt.m4 b/m4/ax_cc_maxopt.m4
+index f5f7517..62e3b53 100644
+--- a/m4/ax_cc_maxopt.m4
++++ b/m4/ax_cc_maxopt.m4
+@@ -141,7 +141,8 @@ if test "$ac_test_CFLAGS" != "set"; then
+      CFLAGS="-O3 -fomit-frame-pointer"
+ 
+      # -malign-double for x86 systems
+-     AX_CHECK_COMPILE_FLAG(-malign-double, CFLAGS="$CFLAGS -malign-double")
++     # LIBFFI -- DON'T DO THIS - CHANGES ABI
++     # AX_CHECK_COMPILE_FLAG(-malign-double, CFLAGS="$CFLAGS -malign-double")
+ 
+      #  -fstrict-aliasing for gcc-2.95+
+      AX_CHECK_COMPILE_FLAG(-fstrict-aliasing,
+diff --git a/configure b/configure
+index 95d950b..41bde69 100755
+--- a/configure
++++ b/configure
+@@ -12426,41 +12426,8 @@ $as_echo "$icc_archflag" >&6; }
+      CFLAGS="-O3 -fomit-frame-pointer"
+ 
+      # -malign-double for x86 systems
+-     { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether C compiler accepts -malign-double" >&5
+-$as_echo_n "checking whether C compiler accepts -malign-double... " >&6; }
+-if ${ax_cv_check_cflags___malign_double+:} false; then :
+-  $as_echo_n "(cached) " >&6
+-else
+-
+-  ax_check_save_flags=$CFLAGS
+-  CFLAGS="$CFLAGS  -malign-double"
+-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+-/* end confdefs.h.  */
+-
+-int
+-main ()
+-{
+-
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-if ac_fn_c_try_compile "$LINENO"; then :
+-  ax_cv_check_cflags___malign_double=yes
+-else
+-  ax_cv_check_cflags___malign_double=no
+-fi
+-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+-  CFLAGS=$ax_check_save_flags
+-fi
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_cv_check_cflags___malign_double" >&5
+-$as_echo "$ax_cv_check_cflags___malign_double" >&6; }
+-if test x"$ax_cv_check_cflags___malign_double" = xyes; then :
+-  CFLAGS="$CFLAGS -malign-double"
+-else
+-  :
+-fi
+-
++     # LIBFFI -- DON'T DO THIS - CHANGES ABI
++     # AX_CHECK_COMPILE_FLAG(-malign-double, CFLAGS="$CFLAGS -malign-double")
+ 
+      #  -fstrict-aliasing for gcc-2.95+
+      { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether C compiler accepts -fstrict-aliasing" >&5
+@@ -14480,10 +14447,10 @@ if ${libffi_cv_as_x86_pcrel+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+ 
+-	libffi_cv_as_x86_pcrel=yes
++	libffi_cv_as_x86_pcrel=no
+ 	echo '.text; foo: nop; .data; .long foo-.; .text' > conftest.s
+-	if $CC $CFLAGS -c conftest.s 2>&1 | $EGREP -i 'illegal|warning' > /dev/null; then
+-	    libffi_cv_as_x86_pcrel=no
++	if $CC $CFLAGS -c conftest.s > /dev/null 2>&1; then
++	    libffi_cv_as_x86_pcrel=yes
+ 	fi
+ 
+ fi
+-- 
+1.7.10
+
diff --git a/dev-libs/libffi/libffi-3.0.11.ebuild b/dev-libs/libffi/libffi-3.0.11.ebuild
index 3279f066639c..73e42c93bc18 100644
--- a/dev-libs/libffi/libffi-3.0.11.ebuild
+++ b/dev-libs/libffi/libffi-3.0.11.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libffi/libffi-3.0.11.ebuild,v 1.17 2012/12/07 23:12:09 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libffi/libffi-3.0.11.ebuild,v 1.18 2013/01/13 04:52:11 vapier Exp $
 
 EAPI=4
 
@@ -39,6 +39,7 @@ pkg_setup() {
 }
 
 src_prepare() {
+	epatch "${FILESDIR}"/${P}-x86-pic-check.patch #417179
 	epatch_user
 	elibtoolize
 }