From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.77) (envelope-from ) id 1SsOwn-0004LE-7G for garchives@archives.gentoo.org; Sat, 21 Jul 2012 01:57:33 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 63CF7E055C; Sat, 21 Jul 2012 01:57:24 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 1C0E7E055C for ; Sat, 21 Jul 2012 01:57:24 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 228E41B404F for ; Sat, 21 Jul 2012 01:57:23 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 6755AE5434 for ; Sat, 21 Jul 2012 01:57:21 +0000 (UTC) From: "Jory Pratt" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Jory Pratt" Message-ID: <1342835787.076d716e3adcd037b23def8deeb7335e52bdd2f8.anarchy@gentoo> Subject: [gentoo-commits] proj/mozilla:master commit in: dev-libs/nspr/files/, dev-libs/nspr/ X-VCS-Repository: proj/mozilla X-VCS-Files: dev-libs/nspr/Manifest dev-libs/nspr/files/nspr-4.9.1-x32_v0.1.patch dev-libs/nspr/files/nspr-4.9.1-x32_v0.2.patch dev-libs/nspr/nspr-4.9.1-r2.ebuild dev-libs/nspr/nspr-4.9.1-r3.ebuild X-VCS-Directories: dev-libs/nspr/files/ dev-libs/nspr/ X-VCS-Committer: anarchy X-VCS-Committer-Name: Jory Pratt X-VCS-Revision: 076d716e3adcd037b23def8deeb7335e52bdd2f8 X-VCS-Branch: master Date: Sat, 21 Jul 2012 01:57:21 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: 9ed9fd56-be7f-4a21-808e-a7a8c2f6721a X-Archives-Hash: 4066ac667fa49e8618d0494a647abf0b commit: 076d716e3adcd037b23def8deeb7335e52bdd2f8 Author: Jory A. Pratt gentoo org> AuthorDate: Sat Jul 21 01:56:27 2012 +0000 Commit: Jory Pratt gentoo org> CommitDate: Sat Jul 21 01:56:27 2012 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/mozilla.git;a= =3Dcommit;h=3D076d716e Rework nspr x32 support --- dev-libs/nspr/Manifest | 26 ++-- dev-libs/nspr/files/nspr-4.9.1-x32_v0.1.patch | 156 --------------= ------ dev-libs/nspr/files/nspr-4.9.1-x32_v0.2.patch | 91 ++++++++++++ .../{nspr-4.9.1-r2.ebuild =3D> nspr-4.9.1-r3.ebuild} | 10 +- 4 files changed, 109 insertions(+), 174 deletions(-) diff --git a/dev-libs/nspr/Manifest b/dev-libs/nspr/Manifest index 180b4db..fe12f1d 100644 --- a/dev-libs/nspr/Manifest +++ b/dev-libs/nspr/Manifest @@ -1,13 +1,13 @@ -AUX nspr-4.6.1-config-1.patch 565 RMD160 62fef94c85f636249c83cb6f4a7cc00= a71adf3f6 SHA1 51f8e14107dc2edc951377991e9a7d08757d0f91 SHA256 9ed8fd1510= 2ef3de6d837d40ec5d73aef0ea45bf9059b4cf5ff1f47b6a519ed6 -AUX nspr-4.6.1-lang.patch 1718 RMD160 6c3fb440f4b4004289de3f65b996936bcf= cbaa45 SHA1 a5ae7b8c95204279fbcb1ac46a242448aa5a894d SHA256 326f5f9d020e7= 3a6ed8e949124eb075f21d856d0b099b8d04035ecc937cd35fb -AUX nspr-4.7.0-prtime.patch 964 RMD160 a963c21fb1ce5e8913d3c41753ca37b24= e80798d SHA1 b47ffa12022ea83b738e5d847e61cca026ec7f07 SHA256 3fd4f3c68257= dced021c0bfa00245d0da2d6c64205135b1cc89f96a3375dffc7 -AUX nspr-4.7.1-solaris.patch 516 RMD160 aaa024e1afabfae51a0060db328536e1= a624ed3a SHA1 6766a9939830e8277f2342db806235ab2e30ab14 SHA256 e47a0abb5b1= 06af38fdfab2ca8661b4a1596d48ff7ca988280728dc6b8a49447 -AUX nspr-4.7.4-solaris.patch 2011 RMD160 08060ba3885a1a659ad5a5505715ced= 0dd669d5f SHA1 9b0e2021e9dca56f741b505e5aa5ca56da47bbb1 SHA256 9e72078c94= 1229e7112b4bc184e195821c9243bfb9411e9eeefcdb889866ff9f -AUX nspr-4.8-config.patch 1429 RMD160 1988289c042f97ad8c3681b7febbbea45a= 3de9a6 SHA1 0055fb2f27865e3bcc6d6a9e6f79b633443295d6 SHA256 7cb63ea677ad9= c92dde4513b16258f092b463738cb145edd95dd671bcfaa2150 -AUX nspr-4.8.3-aix-gcc.patch 3673 RMD160 01b03fb2be761c72dd3eb9c7e9f03bb= 9c3cf9efc SHA1 7919b736f4ebe12d8067ba400325487c06df3d04 SHA256 b801bc5e93= c57e54a076f1b1ed85fc6c4d5d6f344e830929e0a2c4046930a17f -AUX nspr-4.8.3-aix-soname.patch 1164 RMD160 da8fe1e17cade02ab6a4862ef901= dd6c1606a1e3 SHA1 7a919bf08fa9d7a68815cdceda9082f5db8be445 SHA256 cec2e8b= 1cdf9e81f6b36c7981a5cb017fbf18192586c00d3e80ad897917bfcaa -AUX nspr-4.8.4-darwin-install_name.patch 1102 RMD160 eb565bc36822129e05f= 2fa45aaa52284333f2aee SHA1 5f7a057a457c3176aa255dfe1503cb23b5f37f09 SHA25= 6 ca17efc9a60f4372b5da9c29ddf1143726381b9825907f8e3162974224636fab -AUX nspr-4.8.9-link-flags.patch 995 RMD160 68a140db428f707f9f8295757c55f= 343e0f774e3 SHA1 8885af906cd5d21d0d678b42e51b667568fb449a SHA256 f986c69f= f6250f54eb291339ab5503e73cc5cc68af4c3c3ed5a25812bf47b610 -AUX nspr-4.9.1-x32_v0.1.patch 4930 RMD160 fcc0bbfdcddb1f9bddbb89307b688e= 226263622b SHA1 3e80fe9b56eecd3fc838d641870d0bf7d92a1e0c SHA256 a12bb9c20= e2d888ef227bc98624133059068f79c2cf4a0b5ee26d43b05852e7f -DIST nspr-4.9.1.tar.gz 1172951 RMD160 e541d6ead14dbf0145061c75d176f6391f= c186cd SHA1 1d52282668f2f8f5aabf7a5a3e7f6ba9a5df9710 SHA256 5b696b80a3254= aa0e5c7f0614b6bb9b14c483df46af66c792993e3d853568d17 -EBUILD nspr-4.9.1-r2.ebuild 3703 RMD160 138621f81b9c7a0871d581d9b78419e9= adaccdf7 SHA1 09d720b08f69add1d2f416f7071282ba848385d5 SHA256 99e83842eee= 5deb42b975ba8b436655f6d3224ba1dee1fcc0a9bbbf1715a3a25 +AUX nspr-4.6.1-config-1.patch 565 SHA256 9ed8fd15102ef3de6d837d40ec5d73a= ef0ea45bf9059b4cf5ff1f47b6a519ed6 SHA512 3556cff96d3e773d6e1762d94b9c3252= 07578e4e910d33464c26b2084f42f2162c5fbb12d8f2206dbe4c5a7ecb1c8c63a699f08bd= 1b31c5b71eb73d257c46be6 WHIRLPOOL 7c249f1465f65da765b37b256d9cd8c8cef7d5f= c7cb8a57f40f29a98cb2247cc3e1ec002f106d50bc531cfc6a8c9de5a85d6f522ad5b8f6e= 956fc0790d5993b4 +AUX nspr-4.6.1-lang.patch 1718 SHA256 326f5f9d020e73a6ed8e949124eb075f21= d856d0b099b8d04035ecc937cd35fb SHA512 ee23a7fffb36e8ea10fe029dcd2fa374eb3= 97fb038c628d9140f20c9a6267dd2ee4f76fb02ec79698fae4a1493fe58b7b4f28795afd5= 4cb868ef6fce276cf291 WHIRLPOOL 56ad48b4d75cc624382a60d783e36dfaf2c6fc5195= f300710a35fa7a058ea4b0f5904e7d6de361e5f340116531c824cd86175dc80e52efbc04f= 5ded92e592ce9 +AUX nspr-4.7.0-prtime.patch 964 SHA256 3fd4f3c68257dced021c0bfa00245d0da= 2d6c64205135b1cc89f96a3375dffc7 SHA512 f8e09dda87e1d4a226fcf48ebc2cdfb20e= 67c351ffd227603b150636b19df49471ca0c617005e515ccee715df248363ed2e2162563e= a6bce978e8607b6aba001 WHIRLPOOL 0090d17ebc287a39d18dbe531dc31522601ce4fc3= 2ddd9a45bd9024987c328aa9fab7c7606673a1220c9b8602ee76c7f58bd7c4d3d639e8edb= 356d4d0efbd32e +AUX nspr-4.7.1-solaris.patch 516 SHA256 e47a0abb5b106af38fdfab2ca8661b4a= 1596d48ff7ca988280728dc6b8a49447 SHA512 864b842e77353b29f7d0b44cdd64d1a0f= 613fafa2d074f10adc30a1f1c2b69c5270646c25faa64a7b072e3f7d0f68134fe23eeaafd= 7bdf46d12f889074a8ef78 WHIRLPOOL b2caa24d39bb372a184a60f1a775d6787b6d6aec= 65db5d32772de5c70953b4a53ab6244b569bd5c1da63f5a6e00a7a50da6bd7e807085e3f3= 483aa90810ffe64 +AUX nspr-4.7.4-solaris.patch 2011 SHA256 9e72078c941229e7112b4bc184e1958= 21c9243bfb9411e9eeefcdb889866ff9f SHA512 ff8b6403470e9eec401eafb33b109a85= 0ca72e3b6e05e31514e68e9b0ca77aaf7dc0e8062f45406f5abd96671d3c352d9690b8da0= 9454555929422a86d9c4fd4 WHIRLPOOL ea7a6543f474ccd45cfd6448d75ebf17057d995= 2fdb6d7610ad33603e94bcce0fe1c60b07d80570e49d35c0828748f239aacdce588514aea= e472927fecaa8490 +AUX nspr-4.8-config.patch 1429 SHA256 7cb63ea677ad9c92dde4513b16258f092b= 463738cb145edd95dd671bcfaa2150 SHA512 0180b026a89080c557ff39496f015195127= 343319d054904274fa118c4394b567b1e79bf72ddffe4d6ce821b831a72926fc40a558979= 76a6cdaee0cea52d070b WHIRLPOOL 1f31f98e552a771a77acd731b4e071386aad4a94c7= 1d638f6074224f0f79eb8f4f49763ded4282d910f2a7fea8c05000c1428b7d895c8204a29= 82775022b42d3 +AUX nspr-4.8.3-aix-gcc.patch 3673 SHA256 b801bc5e93c57e54a076f1b1ed85fc6= c4d5d6f344e830929e0a2c4046930a17f SHA512 08a1625bb4ca7263e9f98289355e6def= 516e4b31a4bc856e75686a808575f2603056490b6b5dd6f33e616923c6e035cafec89ff86= bcc4b9ceb0b9a5c10334f48 WHIRLPOOL f42200ebdd0ac5b6739c61a2673345a63a33eb1= b9d0c471d6700c5b9f7a305a3a518d0d0715041e3aedb80a923e6ff183d035da151c0c514= 57a2e628317887ea +AUX nspr-4.8.3-aix-soname.patch 1164 SHA256 cec2e8b1cdf9e81f6b36c7981a5c= b017fbf18192586c00d3e80ad897917bfcaa SHA512 8c82c281ebc3ffade81445bef2832= 3a89199e47a95b7ec8351cf14dc441f71d1126f112d564431e6c73657ae2de0c7cbdc701f= f133d7086fd970e6c61cd58add WHIRLPOOL 90dca0ac6ae7931468d5b3835e786a817dea= ae1c4021fb033f127dd9aabae42975bcc8c4ccb3ea7db713b3224ec90669179cbb71a8492= 910a5aa75e0f8d1beac +AUX nspr-4.8.4-darwin-install_name.patch 1102 SHA256 ca17efc9a60f4372b5d= a9c29ddf1143726381b9825907f8e3162974224636fab SHA512 1c62eaea00c4eebe6885= bfffca41131cfd5cd1c848d7564ccae32a39f012834684b2d3113dcb1a3d4607629dbec99= 09d6754491dc7caa977203e6010623fef4d WHIRLPOOL 1f5674fe691d75dbf7b9549d587= 00fef973a8fd6f805a389727843ffb336392587833bbb19af9c22b1388b3d3dcd2c760978= 676c9a55d894b646e029f8ba7280 +AUX nspr-4.8.9-link-flags.patch 995 SHA256 f986c69ff6250f54eb291339ab550= 3e73cc5cc68af4c3c3ed5a25812bf47b610 SHA512 3c20019b5a378bc0cec1925c2324fc= 1b72bd1427e9262065952632c406bc6a8f9303fc55aabad472713f5e8656973db5c503dd9= 072ea01283a6f671dcd26b049 WHIRLPOOL 695310cfd54140b2c333f0b6556d8c049441b= 246a006cc885d2149a6d73d8d6223964d47d5af87c949ab2693fd320c4ecf67fd120b0986= 2972a39df0cc00c7ca +AUX nspr-4.9.1-x32_v0.2.patch 2348 SHA256 2adf3138542bbb497776cb4349f87e= 093085f3ffec9b4b9845f18bd9dabbb648 SHA512 019e627936cfc644b472af82cf60a25= 3e795574e5762f5464f7dff536fbbe471a576b791c5abf737aa2f91515865c7e9c0b936c5= 9bd3753195257df0d43eb09c WHIRLPOOL 03a07fce0adfae840ab3d330d705eebbc114b3= dfb28cbcbf6b2b15b20da3e4000e8a28284fb75275baecb876b2b3e3ba70fc6e1147b112c= 167e9f2f1bfc76b93 +DIST nspr-4.9.1.tar.gz 1172951 SHA256 5b696b80a3254aa0e5c7f0614b6bb9b14c= 483df46af66c792993e3d853568d17 SHA512 b7613eb5f97d9d8d0254d454fb516a67266= 4fbf46b34eb03cc51a9b3af11d8cbdc117691c068f8e64a8255aadfd28b2814eda53edcd9= 7a643b26b94b5adec341 WHIRLPOOL 9df74a88ea050d0fb2ff8f8a38d703c2bd77f6ecc4= c5e6fe09c240bf9f99266ba56083aed566ea2e0a1df7afdb090861dbe6b45725906af5979= 242f9b2a82161 +EBUILD nspr-4.9.1-r3.ebuild 3697 SHA256 f5b8bfb9f1be78d004755ed1302f8996= df15c0fd13ac62095b13b78aa0e942c0 SHA512 cea9bba36807ec7d88a6faf83db985177= db27ed11a00940e1a1058ce1101e1600aca7b8c58ea593ad6c6d2ca0d256b4bea008f6084= 525545037685089a19c2d9 WHIRLPOOL 5989ba5eb442609530572d3ed71a109edef08819= c2b9868e4fc2a167e1d42b2d9e7052c91f20c784baed379cb30490a6a0bdf001a3eb3e17c= ced308e92b71416 diff --git a/dev-libs/nspr/files/nspr-4.9.1-x32_v0.1.patch b/dev-libs/nsp= r/files/nspr-4.9.1-x32_v0.1.patch deleted file mode 100644 index 3de2a0f..0000000 --- a/dev-libs/nspr/files/nspr-4.9.1-x32_v0.1.patch +++ /dev/null @@ -1,156 +0,0 @@ -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 -=20 - #define PR_BYTES_PER_WORD_LOG2 3 - #define PR_BYTES_PER_DWORD_LOG2 3 -=20 - #elif defined(__x86_64__) -- -+#ifdef __LP64__ - #define IS_LITTLE_ENDIAN 1 - #undef IS_BIG_ENDIAN - #define IS_64 -=20 - #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 -=20 - #define PR_BYTES_PER_WORD_LOG2 3 - #define PR_BYTES_PER_DWORD_LOG2 3 -=20 -+#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__) -=20 - #undef IS_LITTLE_ENDIAN - #define IS_BIG_ENDIAN 1 -=20 - #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 -=20 - #ifdef __FreeBSD_kernel__ - #define _PR_HAVE_SOCKADDR_LEN - #endif -=20 --#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 -=20 --#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/files/nspr-4.9.1-x32_v0.2.patch b/dev-libs/nsp= r/files/nspr-4.9.1-x32_v0.2.patch new file mode 100644 index 0000000..6880141 --- /dev/null +++ b/dev-libs/nspr/files/nspr-4.9.1-x32_v0.2.patch @@ -0,0 +1,91 @@ +# HG changeset patch +# Parent 6b1ef31834235cde5153f91a7443b29398b541d9 +# User Jory A. Pratt +Add initial support for x32 abi + +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 +@@ -207,16 +207,63 @@ + #define PR_ALIGN_OF_POINTER 8 + #define PR_ALIGN_OF_WORD 8 +=20 + #define PR_BYTES_PER_WORD_LOG2 3 + #define PR_BYTES_PER_DWORD_LOG2 3 +=20 + #elif defined(__x86_64__) +=20 ++#ifdef __ILP32__ ++ ++#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 ++ ++#else ++ + #define IS_LITTLE_ENDIAN 1 + #undef IS_BIG_ENDIAN + #define IS_64 +=20 + #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 +298,18 @@ + #define PR_ALIGN_OF_FLOAT 4 + #define PR_ALIGN_OF_DOUBLE 8 + #define PR_ALIGN_OF_POINTER 8 + #define PR_ALIGN_OF_WORD 8 +=20 + #define PR_BYTES_PER_WORD_LOG2 3 + #define PR_BYTES_PER_DWORD_LOG2 3 +=20 ++#endif ++ + #elif defined(__mc68000__) +=20 + #undef IS_LITTLE_ENDIAN + #define IS_BIG_ENDIAN 1 +=20 + #define PR_BYTES_PER_BYTE 1 + #define PR_BYTES_PER_SHORT 2 + #define PR_BYTES_PER_INT 4 diff --git a/dev-libs/nspr/nspr-4.9.1-r2.ebuild b/dev-libs/nspr/nspr-4.9.= 1-r3.ebuild similarity index 93% rename from dev-libs/nspr/nspr-4.9.1-r2.ebuild rename to dev-libs/nspr/nspr-4.9.1-r3.ebuild index 9f1bf05..fabd0ac 100644 --- a/dev-libs/nspr/nspr-4.9.1-r2.ebuild +++ b/dev-libs/nspr/nspr-4.9.1-r3.ebuild @@ -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_v0.1.patch + epatch "${FILESDIR}"/${PN}-4.9.1-x32_v0.2.patch =20 # We must run eautoconf to regenerate configure cd "${S}"/mozilla/nsprpub @@ -50,12 +50,12 @@ src_configure() { =20 echo > "${T}"/test.c $(tc-getCC) -c "${T}"/test.c -o "${T}"/test.o - case $(scanelf -BF'%M' "${T}"/test.o)$(scanmacho -BF'%M' "${T}"/test.o)= in - ELFCLASS64*|POWERPC64*|X86_64*) myconf=3D"${myconf} --enable-64bit";; - ELFCLASS32*|POWERPC*|I386*|ARM*) ;; + case $(file "${T}"/test.o) in + *32-bit*x86-64*) myconf=3D"${myconf} --enable-64bit";; + *64-bit*|*ppc64*|*x86_64*) myconf=3D"${myconf} --enable-64bit";; + *32-bit*|*ppc*|*i386*) ;; *) die "Failed to detect whether your arch is 64bits or 32bits, disabl= e distcc if you're using it, please";; esac - myconf=3D"${myconf} --libdir=3D${EPREFIX}/usr/$(get_libdir)" =20 LC_ALL=3D"C" ECONF_SOURCE=3D"../mozilla/nsprpub" econf \