Fix x32 builds #451038 by Zenitur.

(Portage version: 2.2.0_alpha144/cvs/Linux x86_64, signed Manifest commit with key FB7C4156)

3 files changed, 53 insertions, 9 deletions

diff --git a/dev-libs/gmp/ChangeLog b/dev-libs/gmp/ChangeLog
index e5ac8fd2b2d1..e67aa2ebcd63 100644
--- a/dev-libs/gmp/ChangeLog
+++ b/dev-libs/gmp/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-libs/gmp
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/gmp/ChangeLog,v 1.171 2012/12/24 18:49:45 vapier Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/gmp/ChangeLog,v 1.172 2013/01/10 19:51:04 vapier Exp $
+
+  10 Jan 2013; Mike Frysinger <vapier@gentoo.org>
+  +files/gmp-5.1.0-x32-support.patch, gmp-5.1.0.ebuild:
+  Fix x32 builds #451038 by Zenitur.
 
   24 Dec 2012; Mike Frysinger <vapier@gentoo.org>
   +files/gmp-5.1.0-x86-nopie-tests.patch, gmp-5.1.0.ebuild:
diff --git a/dev-libs/gmp/files/gmp-5.1.0-x32-support.patch b/dev-libs/gmp/files/gmp-5.1.0-x32-support.patch
new file mode 100644
index 000000000000..fda361d9b294
--- /dev/null
+++ b/dev-libs/gmp/files/gmp-5.1.0-x32-support.patch
@@ -0,0 +1,42 @@
+Upstream-Status: Pending
+
+Add X32 support in gmp configure.
+
+Patch Originator: H J Lu @ Intel
+Patch modified for Yocto by Nitin Kamble
+Signed Off By: Nitin A Kamble <nitin.a.kamble@intel.com> 2011/11/21
+
+--- gmp-5.1.0/configure
++++ gmp-5.1.0/configure
+@@ -5237,6 +5237,22 @@ echo "include_mpn(\`vax/elf.m4')" >> $gmp_tmpconfigm4i
+ 	    extra_functions_64="invert_limb_table"
+ 	fi
+ 
++	# X32 support.
++	case x"$path_64" in
++	  xx86_64*)
++		abilist="x32 64 32"
++		path_x32="$path_64"
++		limb_x32=longlong
++		cclist_x32="gcc"
++		gcc_x32_cflags="-O2 -mx32"
++		any_x32_testlist="sizeof-long-4"
++		CALLING_CONVENTIONS_OBJS_x32=$CALLING_CONVENTIONS_OBJS_64
++		SPEED_CYCLECOUNTER_OBJ_x32=$SPEED_CYCLECOUNTER_OBJ_64
++		cyclecounter_size_x32=$cyclecounter_size_64
++		extra_functions_x32=$extra_functions_64
++	    ;;
++	esac
++
+ 	case $host in
+ 	  *-*-solaris*)
+ 	    # Sun cc.
+@@ -28611,7 +28627,7 @@ echo "include_mpn(\`x86/darwin.m4')" >> $gmp_tmpconfigm4i
+  ;;
+ 	  esac
+           ;;
+-        64)
++        64|x32)
+ 
+ echo "include_mpn(\`x86_64/x86_64-defs.m4')" >> $gmp_tmpconfigm4i
+ 
diff --git a/dev-libs/gmp/gmp-5.1.0.ebuild b/dev-libs/gmp/gmp-5.1.0.ebuild
index c52d5d92ff7b..a8df635b6a85 100644
--- a/dev-libs/gmp/gmp-5.1.0.ebuild
+++ b/dev-libs/gmp/gmp-5.1.0.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/gmp/gmp-5.1.0.ebuild,v 1.2 2012/12/24 18:49:45 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/gmp/gmp-5.1.0.ebuild,v 1.3 2013/01/10 19:51:04 vapier Exp $
 
 inherit flag-o-matic eutils libtool unpacker toolchain-funcs
 
@@ -29,7 +29,7 @@ src_unpack() {
 	cd "${S}"
 	[[ -d ${FILESDIR}/${PV} ]] && EPATCH_SUFFIX="diff" EPATCH_FORCE="yes" epatch "${FILESDIR}"/${PV}
 	epatch "${FILESDIR}"/${PN}-4.1.4-noexecstack.patch
-	epatch "${FILESDIR}"/${PN}-5.0.5-x32-support.patch
+	epatch "${FILESDIR}"/${PN}-5.1.0-x32-support.patch
 
 	# disable -fPIE -pie in the tests for x86  #236054
 	if use x86 && gcc-specs-pie ; then
@@ -44,7 +44,7 @@ src_unpack() {
 	mv configure configure.wrapped || die
 	cat <<-\EOF > configure
 	#!/bin/sh
-	exec env ABI="$GMPABI" "${0}.wrapped" "$@"
+	exec env ABI="$GMPABI" "$0.wrapped" "$@"
 	EOF
 	chmod a+rx configure
 }
@@ -67,10 +67,8 @@ src_compile() {
 	tc-export CC
 	econf \
 		--localstatedir=/var/state/gmp \
-		--disable-mpbsd \
 		$(use_enable cxx) \
-		$(use_enable static-libs static) \
-		|| die
+		$(use_enable static-libs static)
 
 	emake || die
 }