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.60) (envelope-from ) id 1Shs52-0004zu-4D for garchives@archives.gentoo.org; Fri, 22 Jun 2012 00:50:32 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id B73A1E0C4F; Fri, 22 Jun 2012 00:50:22 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 57213E0C4F for ; Fri, 22 Jun 2012 00:50:22 +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 9456F1B4013 for ; Fri, 22 Jun 2012 00:50:21 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 4CB1DE5435 for ; Fri, 22 Jun 2012 00:50:20 +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: <1340326188.7d9b4acf8af33007bf79448ac5c5c1126e8a5700.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.patch dev-libs/nspr/nspr-4.9.1-r1.ebuild dev-libs/nspr/nspr-4.9.1.ebuild X-VCS-Directories: dev-libs/nspr/files/ dev-libs/nspr/ X-VCS-Committer: anarchy X-VCS-Committer-Name: Jory Pratt X-VCS-Revision: 7d9b4acf8af33007bf79448ac5c5c1126e8a5700 X-VCS-Branch: master Date: Fri, 22 Jun 2012 00:50:20 +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: fd7d0417-995e-45ce-aba0-322a945f422c X-Archives-Hash: 932d45384202de157e58b1b4f333a807 commit: 7d9b4acf8af33007bf79448ac5c5c1126e8a5700 Author: Jory A. Pratt gentoo org> AuthorDate: Fri Jun 22 00:49:48 2012 +0000 Commit: Jory Pratt gentoo org> CommitDate: Fri Jun 22 00:49:48 2012 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/mozilla.git;a= =3Dcommit;h=3D7d9b4acf add x32 support to nspr --- dev-libs/nspr/Manifest | 3 +- dev-libs/nspr/files/nspr-4.9.1-x32.patch | 68 ++++++++++++++= ++++++ .../{nspr-4.9.1.ebuild =3D> nspr-4.9.1-r1.ebuild} | 1 + 3 files changed, 71 insertions(+), 1 deletions(-) diff --git a/dev-libs/nspr/Manifest b/dev-libs/nspr/Manifest index 683f7b0..009784c 100644 --- a/dev-libs/nspr/Manifest +++ b/dev-libs/nspr/Manifest @@ -8,5 +8,6 @@ AUX nspr-4.8.3-aix-gcc.patch 3673 RMD160 01b03fb2be761c72= dd3eb9c7e9f03bb9c3cf9ef 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.patch 1799 RMD160 3bd442b2be01d5031aac2340d0584359cc6= f3cdc SHA1 d8772443f935e3ffa0dd6a8be89710ae81295dae SHA256 629e013fbe7968= d69e3bb0ccd43a3538ce0b649e3238cca89daf84116acae446 DIST nspr-4.9.1.tar.gz 1172951 RMD160 e541d6ead14dbf0145061c75d176f6391f= c186cd SHA1 1d52282668f2f8f5aabf7a5a3e7f6ba9a5df9710 SHA256 5b696b80a3254= aa0e5c7f0614b6bb9b14c483df46af66c792993e3d853568d17 -EBUILD nspr-4.9.1.ebuild 3651 RMD160 d13d12a0eb5cfbef63687930bf5110c4057= 52b6f SHA1 92b4ac2a96ad4e9bf62de3d941fc7abdf409fdda SHA256 9f33a59933a144= 48b22273d37cae80dc39bb98a76d8451968dbbcd531b4b253f +EBUILD nspr-4.9.1-r1.ebuild 3695 RMD160 fed9c53ee5df774ac44f6c2a478c24c9= f43707da SHA1 07d4f33295c04d4e848b2816c431933d1ab88229 SHA256 99e4490cffa= e470d6d948435b59ae27098870a35d046a0346842744b800c1a78 diff --git a/dev-libs/nspr/files/nspr-4.9.1-x32.patch b/dev-libs/nspr/fil= es/nspr-4.9.1-x32.patch new file mode 100644 index 0000000..dd7a8be --- /dev/null +++ b/dev-libs/nspr/files/nspr-4.9.1-x32.patch @@ -0,0 +1,68 @@ +diff -urN a/mozilla/nsprpub/pr/include/md/_linux.cfg b/mozilla/nsprpub/p= r/include/md/_linux.cfg +--- a/mozilla/nsprpub/pr/include/md/_linux.cfg 2012-05-18 16:55:29.00000= 0000 -0500 ++++ b/mozilla/nsprpub/pr/include/md/_linux.cfg 2012-06-21 15:10:35.39735= 8851 -0500 +@@ -211,7 +211,7 @@ + #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 +@@ -256,6 +256,54 @@ + #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 + diff --git a/dev-libs/nspr/nspr-4.9.1.ebuild b/dev-libs/nspr/nspr-4.9.1-r= 1.ebuild similarity index 98% rename from dev-libs/nspr/nspr-4.9.1.ebuild rename to dev-libs/nspr/nspr-4.9.1-r1.ebuild index cddaeee..de71a1a 100644 --- a/dev-libs/nspr/nspr-4.9.1.ebuild +++ b/dev-libs/nspr/nspr-4.9.1-r1.ebuild @@ -31,6 +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 =20 # We must run eautoconf to regenerate configure cd "${S}"/mozilla/nsprpub