Fix undefined references on x32

Package-Manager: portage-2.1.11.1/cvs/Linux x86_64

5 files changed, 176 insertions, 81 deletions

diff --git a/dev-libs/nspr/ChangeLog b/dev-libs/nspr/ChangeLog
index 702d3e020799..af94fcdb2c5d 100644
--- a/dev-libs/nspr/ChangeLog
+++ b/dev-libs/nspr/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-libs/nspr
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/nspr/ChangeLog,v 1.190 2012/06/22 02:57:33 anarchy Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/nspr/ChangeLog,v 1.191 2012/06/24 03:56:49 anarchy Exp $
+
+*nspr-4.9.1-r2 (24 Jun 2012)
+
+  24 Jun 2012; Jory A. Pratt <anarchy@gentoo.org> -nspr-4.9.1-r1.ebuild,
+  +nspr-4.9.1-r2.ebuild, +files/nspr-4.9.1-x32_v0.1.patch,
+  -files/nspr-4.9.1-x32.patch:
+  Fix undefined references for x32
 
 *nspr-4.9.1-r1 (22 Jun 2012)
 
diff --git a/dev-libs/nspr/Manifest b/dev-libs/nspr/Manifest
index 826a5da6d2ce..e75d1eb65271 100644
--- a/dev-libs/nspr/Manifest
+++ b/dev-libs/nspr/Manifest
@@ -15,26 +15,26 @@ AUX nspr-4.8.3-aix-soname.patch 1164 RMD160 da8fe1e17cade02ab6a4862ef901dd6c1606
 AUX nspr-4.8.4-darwin-install_name.patch 1102 RMD160 eb565bc36822129e05f2fa45aaa52284333f2aee SHA1 5f7a057a457c3176aa255dfe1503cb23b5f37f09 SHA256 ca17efc9a60f4372b5da9c29ddf1143726381b9825907f8e3162974224636fab
 AUX nspr-4.8.9-link-flags.patch 995 RMD160 68a140db428f707f9f8295757c55f343e0f774e3 SHA1 8885af906cd5d21d0d678b42e51b667568fb449a SHA256 f986c69ff6250f54eb291339ab5503e73cc5cc68af4c3c3ed5a25812bf47b610
 AUX nspr-4.9-pkgconfig-gentoo.patch 3710 RMD160 c25988e23698df566f69618989eb864dd8bd8848 SHA1 c10e52de61057047a53d8a45f56e7ad901014b57 SHA256 1483506296818ffffbb292d28d336d37147154e5e3db35e7e07d37bb728e2253
-AUX nspr-4.9.1-x32.patch 1799 RMD160 3bd442b2be01d5031aac2340d0584359cc6f3cdc SHA1 d8772443f935e3ffa0dd6a8be89710ae81295dae SHA256 629e013fbe7968d69e3bb0ccd43a3538ce0b649e3238cca89daf84116acae446
+AUX nspr-4.9.1-x32_v0.1.patch 4930 RMD160 fcc0bbfdcddb1f9bddbb89307b688e226263622b SHA1 3e80fe9b56eecd3fc838d641870d0bf7d92a1e0c SHA256 a12bb9c20e2d888ef227bc98624133059068f79c2cf4a0b5ee26d43b05852e7f
 DIST nspr-4.8.8.tar.gz 1246068 RMD160 a058982a067fb3348b908eaf6f06f0ba17385c55 SHA1 f5fd346b0f5f6ceac3677ce18cb94490992717ad SHA256 92f3f4ded2ee313e396c180d5445cc3c718ff347d86c06b7bf14a1b5e049d4c9
 DIST nspr-4.8.9.tar.gz 1235265 RMD160 6c7089a9d798367b8d559e5dea8e732e73b47df2 SHA1 509785e68f52542778c770445329cc4db15c749b SHA256 ff43c7c819e72f03bb908e7652c5d5f59a5d31ee86c333e692650207103d1cce
 DIST nspr-4.9.1.tar.gz 1172951 RMD160 e541d6ead14dbf0145061c75d176f6391fc186cd SHA1 1d52282668f2f8f5aabf7a5a3e7f6ba9a5df9710 SHA256 5b696b80a3254aa0e5c7f0614b6bb9b14c483df46af66c792993e3d853568d17
 DIST nspr-4.9.tar.gz 1218528 RMD160 35298a4752aa657196b9d2f41ad46f1bef7e22a2 SHA1 57a6bb09ccb90d14303c3d9a6ec2592d8a5c0752 SHA256 ecc632bc578c125650999776673eeff952096afa6d151f6d91f6c3a93e1e716a
 EBUILD nspr-4.8.8.ebuild 3553 RMD160 eb3b82725a1035c5b0b1bac07fa67fbba3934a2a SHA1 a4a7d25b3d637b77c69dd03f4886922dbe0d8e4b SHA256 c178bf852a1fa2150716ff08ade3c6fb2755986bed4fbf44227f068d5e38b86c
 EBUILD nspr-4.8.9.ebuild 3784 RMD160 96ff3c68fff994bfa7f9a65ba9a71fd50c8d4e68 SHA1 07819d873d451306e6bf12270c86975dee0b8d71 SHA256 888de34db739f48ca4368827b97f91932efb81de781f686995016f346fb0607c
-EBUILD nspr-4.9.1-r1.ebuild 3698 RMD160 973f4db9bf307d78bbea0282c523cbd28ff52fd9 SHA1 cbdef5b02c74ded9ece6ad75d82ae33a8a8778e3 SHA256 3ea29134d0a928148e370cf8e04cc2673c67d7c50714455b51beef60cded3bce
+EBUILD nspr-4.9.1-r2.ebuild 3703 RMD160 46354d17f6778e8fad6d7dc7caf9f68e8659ea9d SHA1 5dad97f7492e3a7a424824cee095174a42beb8cd SHA256 d3429fc7ef1076b9339657efdbdc29f7f179c7f0bd1d66416bbab187d0e3e59a
 EBUILD nspr-4.9.1.ebuild 3651 RMD160 0809bb785e49d1c8eaf36046a4de107ae38cd02a SHA1 92a7ebdce303067e36e02cfff730bf514ea3be59 SHA256 4b353ba4a0091202f93bba2bc2e13f5151096d59162a4ab367746911d7f10eda
 EBUILD nspr-4.9.ebuild 3694 RMD160 ca9638a7476cb3d49e91ffcaf9589105031ca8ca SHA1 f6a3897f3a2cc145a0f368d0d701f54a66e9a30d SHA256 ac361ad04f2363f4cf9f359f6ee239ea948a9804d8ebe123aedb54c4dbb261d5
-MISC ChangeLog 24683 RMD160 90d65c547896733be3f7e9b2b3ba10c31acef6d1 SHA1 c55cc0673ea0a04e1086cfd23f40700001129746 SHA256 60d2eff5a585cb48751ad8182630139cc3f58d8c7c337dac3e7df798d9e061db
+MISC ChangeLog 24912 RMD160 8acd3e56b8c07c9758e89906d10192cb4f949bcb SHA1 ab11317caec656fa201124949e9552473e542ec0 SHA256 35156e64db754b7e38e4f4c2aaa12111daab3c8cef384a3dc20cac9ebb886196
 MISC metadata.xml 160 RMD160 d5a9f0bf8989621c2bde30facb53bcae00aba709 SHA1 5015c07af2083f20f9552d7fb11afb5ea69af345 SHA256 0cc5126362a12cee42ec1197c528a804cf36859329dd2c6d9225726831d14b8b
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBCgAGBQJP498XAAoJEIXV9xahDnCo3kMH/A4QuvfVWhKBM+l9hlnSNE9M
-kgpq6ojwLypEe+POyOZoPTibc7B17VwOuiSGD58IdWnBqZhvBPY+TrVvR/Mu0aJs
-hLIImfOCoDrFi7mE0xbh/ghRCi14l8Hz/D5wKgzo/+BLVJsd4lKOc/eqwu5C66NI
-1lTCbtJ+rmBfQsFym9FOBXq+TXqvzO/05MCyeO98B5r+P7YYO3apE/uPU6HK2gMa
-z3D+ZXBz0DzckELvLhXMiiUMQ/7wx7KbvmzewjFCjbG/hmsBn9sqftdKPY5pgnz/
-+/W9d9oMpyGWQ14XaL+ibdsjxRzO/c+vLieDjGBxo1XxF09esmrQywSRWNF3Fbo=
-=+qlA
+iQEcBAEBCgAGBQJP5o//AAoJEIXV9xahDnCoplAH/2jIklA7bT2qUt5PRSGjM9Qn
+Rs+ZrR3HUQdgl0Y0ik9n/4MfHkwTGZGNMTKogKiQ2Fn8Q0vqdxKHwYHu+aUtrsCP
+xwD9IC6X1L6k/2FPVBpGiXL0Xb2CWFQpchJKygq0A/mtJwiaEAA8SV6aWKK8bko8
+8OYJAGb+T/uDdfBzdQK1s7TTpigNDcdBwJGL6KkN4FUy2qfrsmjCMRCePcxnmH3V
+K+DppWr26IRssqp11Jp0sBwEEHa975PJSTNG6f6FZKzSp3bEesnr2mbTWDTvTPJ/
+xX8HgFolIleangPWZbKozT8cE40ogO9Ae1jZynNQ82ZThqHFGPW2TUxNsp1ZrUQ=
+=mGKG
 -----END PGP SIGNATURE-----
diff --git a/dev-libs/nspr/files/nspr-4.9.1-x32.patch b/dev-libs/nspr/files/nspr-4.9.1-x32.patch
deleted file mode 100644
index dd7a8be747ec..000000000000
--- a/dev-libs/nspr/files/nspr-4.9.1-x32.patch
+++ /dev/null
@@ -1,68 +0,0 @@
-diff -urN a/mozilla/nsprpub/pr/include/md/_linux.cfg b/mozilla/nsprpub/pr/include/md/_linux.cfg
---- a/mozilla/nsprpub/pr/include/md/_linux.cfg	2012-05-18 16:55:29.000000000 -0500
-+++ b/mozilla/nsprpub/pr/include/md/_linux.cfg	2012-06-21 15:10:35.397358851 -0500
-@@ -211,7 +211,7 @@
- #define PR_BYTES_PER_DWORD_LOG2 3
- 
- #elif defined(__x86_64__)
--
-+#ifdef __LP64__
- #define IS_LITTLE_ENDIAN 1
- #undef  IS_BIG_ENDIAN
- #define IS_64
-@@ -256,6 +256,54 @@
- #define PR_BYTES_PER_WORD_LOG2  3
- #define PR_BYTES_PER_DWORD_LOG2 3
- 
-+#else
-+
-+
-+#define IS_LITTLE_ENDIAN 1
-+#undef  IS_BIG_ENDIAN
-+
-+#define PR_BYTES_PER_BYTE   1
-+#define PR_BYTES_PER_SHORT  2
-+#define PR_BYTES_PER_INT    4
-+#define PR_BYTES_PER_INT64  8
-+#define PR_BYTES_PER_LONG   4
-+#define PR_BYTES_PER_FLOAT  4
-+#define PR_BYTES_PER_DOUBLE 8
-+#define PR_BYTES_PER_WORD   4
-+#define PR_BYTES_PER_DWORD  8
-+
-+#define PR_BITS_PER_BYTE    8
-+#define PR_BITS_PER_SHORT   16
-+#define PR_BITS_PER_INT     32
-+#define PR_BITS_PER_INT64   64
-+#define PR_BITS_PER_LONG    32
-+#define PR_BITS_PER_FLOAT   32
-+#define PR_BITS_PER_DOUBLE  64
-+#define PR_BITS_PER_WORD    32
-+
-+#define PR_BITS_PER_BYTE_LOG2   3
-+#define PR_BITS_PER_SHORT_LOG2  4
-+#define PR_BITS_PER_INT_LOG2    5
-+#define PR_BITS_PER_INT64_LOG2  6
-+#define PR_BITS_PER_LONG_LOG2   5
-+#define PR_BITS_PER_FLOAT_LOG2  5
-+#define PR_BITS_PER_DOUBLE_LOG2 6
-+#define PR_BITS_PER_WORD_LOG2   5
-+
-+#define PR_ALIGN_OF_SHORT   2
-+#define PR_ALIGN_OF_INT     4
-+#define PR_ALIGN_OF_LONG    4
-+#define PR_ALIGN_OF_INT64   4
-+#define PR_ALIGN_OF_FLOAT   4
-+#define PR_ALIGN_OF_DOUBLE  4
-+#define PR_ALIGN_OF_POINTER 4
-+#define PR_ALIGN_OF_WORD    4
-+
-+#define PR_BYTES_PER_WORD_LOG2   2
-+#define PR_BYTES_PER_DWORD_LOG2  3
-+
-+#endif
-+
- #elif defined(__mc68000__)
- 
- #undef  IS_LITTLE_ENDIAN
-
diff --git a/dev-libs/nspr/files/nspr-4.9.1-x32_v0.1.patch b/dev-libs/nspr/files/nspr-4.9.1-x32_v0.1.patch
new file mode 100644
index 000000000000..3de2a0f95dcf
--- /dev/null
+++ b/dev-libs/nspr/files/nspr-4.9.1-x32_v0.1.patch
@@ -0,0 +1,156 @@
+diff --git a/mozilla/nsprpub/pr/include/md/_linux.cfg b/mozilla/nsprpub/pr/include/md/_linux.cfg
+--- a/mozilla/nsprpub/pr/include/md/_linux.cfg
++++ b/mozilla/nsprpub/pr/include/md/_linux.cfg
+@@ -206,17 +206,17 @@
+ #define PR_ALIGN_OF_DOUBLE  8
+ #define PR_ALIGN_OF_POINTER 8
+ #define PR_ALIGN_OF_WORD    8
+ 
+ #define PR_BYTES_PER_WORD_LOG2  3
+ #define PR_BYTES_PER_DWORD_LOG2 3
+ 
+ #elif defined(__x86_64__)
+-
++#ifdef __LP64__
+ #define IS_LITTLE_ENDIAN 1
+ #undef  IS_BIG_ENDIAN
+ #define IS_64
+ 
+ #define PR_BYTES_PER_BYTE   1
+ #define PR_BYTES_PER_SHORT  2
+ #define PR_BYTES_PER_INT    4
+ #define PR_BYTES_PER_INT64  8
+@@ -251,16 +251,64 @@
+ #define PR_ALIGN_OF_FLOAT   4
+ #define PR_ALIGN_OF_DOUBLE  8
+ #define PR_ALIGN_OF_POINTER 8
+ #define PR_ALIGN_OF_WORD    8
+ 
+ #define PR_BYTES_PER_WORD_LOG2  3
+ #define PR_BYTES_PER_DWORD_LOG2 3
+ 
++#else
++
++
++#define IS_LITTLE_ENDIAN 1
++#undef  IS_BIG_ENDIAN
++
++#define PR_BYTES_PER_BYTE   1
++#define PR_BYTES_PER_SHORT  2
++#define PR_BYTES_PER_INT    4
++#define PR_BYTES_PER_INT64  8
++#define PR_BYTES_PER_LONG   4
++#define PR_BYTES_PER_FLOAT  4
++#define PR_BYTES_PER_DOUBLE 8
++#define PR_BYTES_PER_WORD   4
++#define PR_BYTES_PER_DWORD  8
++
++#define PR_BITS_PER_BYTE    8
++#define PR_BITS_PER_SHORT   16
++#define PR_BITS_PER_INT     32
++#define PR_BITS_PER_INT64   64
++#define PR_BITS_PER_LONG    32
++#define PR_BITS_PER_FLOAT   32
++#define PR_BITS_PER_DOUBLE  64
++#define PR_BITS_PER_WORD    32
++
++#define PR_BITS_PER_BYTE_LOG2   3
++#define PR_BITS_PER_SHORT_LOG2  4
++#define PR_BITS_PER_INT_LOG2    5
++#define PR_BITS_PER_INT64_LOG2  6
++#define PR_BITS_PER_LONG_LOG2   5
++#define PR_BITS_PER_FLOAT_LOG2  5
++#define PR_BITS_PER_DOUBLE_LOG2 6
++#define PR_BITS_PER_WORD_LOG2   5
++
++#define PR_ALIGN_OF_SHORT   2
++#define PR_ALIGN_OF_INT     4
++#define PR_ALIGN_OF_LONG    4
++#define PR_ALIGN_OF_INT64   4
++#define PR_ALIGN_OF_FLOAT   4
++#define PR_ALIGN_OF_DOUBLE  4
++#define PR_ALIGN_OF_POINTER 4
++#define PR_ALIGN_OF_WORD    4
++
++#define PR_BYTES_PER_WORD_LOG2   2
++#define PR_BYTES_PER_DWORD_LOG2  3
++
++#endif
++
+ #elif defined(__mc68000__)
+ 
+ #undef  IS_LITTLE_ENDIAN
+ #define IS_BIG_ENDIAN 1
+ 
+ #define PR_BYTES_PER_BYTE   1
+ #define PR_BYTES_PER_SHORT  2
+ #define PR_BYTES_PER_INT    4
+diff --git a/mozilla/nsprpub/pr/include/md/_linux.h b/mozilla/nsprpub/pr/include/md/_linux.h
+--- a/mozilla/nsprpub/pr/include/md/_linux.h
++++ b/mozilla/nsprpub/pr/include/md/_linux.h
+@@ -22,25 +22,25 @@
+ #ifdef __powerpc64__
+ #define _PR_SI_ARCHITECTURE "ppc64"
+ #elif defined(__powerpc__)
+ #define _PR_SI_ARCHITECTURE "ppc"
+ #elif defined(__alpha)
+ #define _PR_SI_ARCHITECTURE "alpha"
+ #elif defined(__ia64__)
+ #define _PR_SI_ARCHITECTURE "ia64"
+-#elif defined(__x86_64__)
++#elif defined(__x86_64__) && defined(__LP64__)
+ #define _PR_SI_ARCHITECTURE "x86-64"
+ #elif defined(__mc68000__)
+ #define _PR_SI_ARCHITECTURE "m68k"
+ #elif defined(__sparc__) && defined(__arch64__)
+ #define _PR_SI_ARCHITECTURE "sparc64"
+ #elif defined(__sparc__)
+ #define _PR_SI_ARCHITECTURE "sparc"
+-#elif defined(__i386__)
++#elif defined(__i386__) || (defined(__x86_64__) && !defined(__LP64__))
+ #define _PR_SI_ARCHITECTURE "x86"
+ #elif defined(__mips__)
+ #define _PR_SI_ARCHITECTURE "mips"
+ #elif defined(__arm__)
+ #define _PR_SI_ARCHITECTURE "arm"
+ #elif defined(__hppa__)
+ #define _PR_SI_ARCHITECTURE "hppa"
+ #elif defined(__s390x__)
+@@ -73,17 +73,17 @@
+ #if defined(ANDROID)
+ #define NO_DLOPEN_NULL
+ #endif
+ 
+ #ifdef __FreeBSD_kernel__
+ #define _PR_HAVE_SOCKADDR_LEN
+ #endif
+ 
+-#if defined(__i386__)
++#if defined(__i386__) || (defined(__x86_64__) && !defined(__LP64__))
+ #define _PR_HAVE_ATOMIC_OPS
+ #define _MD_INIT_ATOMIC()
+ extern PRInt32 _PR_x86_AtomicIncrement(PRInt32 *val);
+ #define _MD_ATOMIC_INCREMENT          _PR_x86_AtomicIncrement
+ extern PRInt32 _PR_x86_AtomicDecrement(PRInt32 *val);
+ #define _MD_ATOMIC_DECREMENT          _PR_x86_AtomicDecrement
+ extern PRInt32 _PR_x86_AtomicAdd(PRInt32 *ptr, PRInt32 val);
+ #define _MD_ATOMIC_ADD                _PR_x86_AtomicAdd
+@@ -99,17 +99,17 @@ extern PRInt32 _PR_ia64_AtomicIncrement(
+ extern PRInt32 _PR_ia64_AtomicDecrement(PRInt32 *val);
+ #define _MD_ATOMIC_DECREMENT          _PR_ia64_AtomicDecrement
+ extern PRInt32 _PR_ia64_AtomicAdd(PRInt32 *ptr, PRInt32 val);
+ #define _MD_ATOMIC_ADD                _PR_ia64_AtomicAdd
+ extern PRInt32 _PR_ia64_AtomicSet(PRInt32 *val, PRInt32 newval);
+ #define _MD_ATOMIC_SET                _PR_ia64_AtomicSet
+ #endif
+ 
+-#if defined(__x86_64__)
++#if defined(__x86_64__) && defined(__LP64__)
+ #define _PR_HAVE_ATOMIC_OPS
+ #define _MD_INIT_ATOMIC()
+ extern PRInt32 _PR_x86_64_AtomicIncrement(PRInt32 *val);
+ #define _MD_ATOMIC_INCREMENT          _PR_x86_64_AtomicIncrement
+ extern PRInt32 _PR_x86_64_AtomicDecrement(PRInt32 *val);
+ #define _MD_ATOMIC_DECREMENT          _PR_x86_64_AtomicDecrement
+ extern PRInt32 _PR_x86_64_AtomicAdd(PRInt32 *ptr, PRInt32 val);
+ #define _MD_ATOMIC_ADD                _PR_x86_64_AtomicAdd
diff --git a/dev-libs/nspr/nspr-4.9.1-r1.ebuild b/dev-libs/nspr/nspr-4.9.1-r2.ebuild
index 3ba665987b1c..5f856676d7fc 100644
--- a/dev-libs/nspr/nspr-4.9.1-r1.ebuild
+++ b/dev-libs/nspr/nspr-4.9.1-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/nspr/nspr-4.9.1-r1.ebuild,v 1.1 2012/06/22 02:57:33 anarchy Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/nspr/nspr-4.9.1-r2.ebuild,v 1.1 2012/06/24 03:56:49 anarchy Exp $
 
 EAPI=3
 WANT_AUTOCONF="2.1"
@@ -31,7 +31,7 @@ src_prepare() {
 	#epatch "${FILESDIR}"/${PN}-4.8.3-aix-soname.patch
 	epatch "${FILESDIR}"/${PN}-4.8.4-darwin-install_name.patch
 	epatch "${FILESDIR}"/${PN}-4.8.9-link-flags.patch
-	epatch "${FILESDIR}"/${PN}-4.9.1-x32.patch
+	epatch "${FILESDIR}"/${PN}-4.9.1-x32_v0.1.patch
 
 	# We must run eautoconf to regenerate configure
 	cd "${S}"/mozilla/nsprpub