| 1 |
commit: 7d9b4acf8af33007bf79448ac5c5c1126e8a5700 |
| 2 |
Author: Jory A. Pratt <anarchy <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Fri Jun 22 00:49:48 2012 +0000 |
| 4 |
Commit: Jory Pratt <anarchy <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Fri Jun 22 00:49:48 2012 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/mozilla.git;a=commit;h=7d9b4acf |
| 7 |
|
| 8 |
add x32 support to nspr |
| 9 |
|
| 10 |
--- |
| 11 |
dev-libs/nspr/Manifest | 3 +- |
| 12 |
dev-libs/nspr/files/nspr-4.9.1-x32.patch | 68 ++++++++++++++++++++ |
| 13 |
.../{nspr-4.9.1.ebuild => nspr-4.9.1-r1.ebuild} | 1 + |
| 14 |
3 files changed, 71 insertions(+), 1 deletions(-) |
| 15 |
|
| 16 |
diff --git a/dev-libs/nspr/Manifest b/dev-libs/nspr/Manifest |
| 17 |
index 683f7b0..009784c 100644 |
| 18 |
--- a/dev-libs/nspr/Manifest |
| 19 |
+++ b/dev-libs/nspr/Manifest |
| 20 |
@@ -8,5 +8,6 @@ AUX nspr-4.8.3-aix-gcc.patch 3673 RMD160 01b03fb2be761c72dd3eb9c7e9f03bb9c3cf9ef |
| 21 |
AUX nspr-4.8.3-aix-soname.patch 1164 RMD160 da8fe1e17cade02ab6a4862ef901dd6c1606a1e3 SHA1 7a919bf08fa9d7a68815cdceda9082f5db8be445 SHA256 cec2e8b1cdf9e81f6b36c7981a5cb017fbf18192586c00d3e80ad897917bfcaa |
| 22 |
AUX nspr-4.8.4-darwin-install_name.patch 1102 RMD160 eb565bc36822129e05f2fa45aaa52284333f2aee SHA1 5f7a057a457c3176aa255dfe1503cb23b5f37f09 SHA256 ca17efc9a60f4372b5da9c29ddf1143726381b9825907f8e3162974224636fab |
| 23 |
AUX nspr-4.8.9-link-flags.patch 995 RMD160 68a140db428f707f9f8295757c55f343e0f774e3 SHA1 8885af906cd5d21d0d678b42e51b667568fb449a SHA256 f986c69ff6250f54eb291339ab5503e73cc5cc68af4c3c3ed5a25812bf47b610 |
| 24 |
+AUX nspr-4.9.1-x32.patch 1799 RMD160 3bd442b2be01d5031aac2340d0584359cc6f3cdc SHA1 d8772443f935e3ffa0dd6a8be89710ae81295dae SHA256 629e013fbe7968d69e3bb0ccd43a3538ce0b649e3238cca89daf84116acae446 |
| 25 |
DIST nspr-4.9.1.tar.gz 1172951 RMD160 e541d6ead14dbf0145061c75d176f6391fc186cd SHA1 1d52282668f2f8f5aabf7a5a3e7f6ba9a5df9710 SHA256 5b696b80a3254aa0e5c7f0614b6bb9b14c483df46af66c792993e3d853568d17 |
| 26 |
-EBUILD nspr-4.9.1.ebuild 3651 RMD160 d13d12a0eb5cfbef63687930bf5110c405752b6f SHA1 92b4ac2a96ad4e9bf62de3d941fc7abdf409fdda SHA256 9f33a59933a14448b22273d37cae80dc39bb98a76d8451968dbbcd531b4b253f |
| 27 |
+EBUILD nspr-4.9.1-r1.ebuild 3695 RMD160 fed9c53ee5df774ac44f6c2a478c24c9f43707da SHA1 07d4f33295c04d4e848b2816c431933d1ab88229 SHA256 99e4490cffae470d6d948435b59ae27098870a35d046a0346842744b800c1a78 |
| 28 |
|
| 29 |
diff --git a/dev-libs/nspr/files/nspr-4.9.1-x32.patch b/dev-libs/nspr/files/nspr-4.9.1-x32.patch |
| 30 |
new file mode 100644 |
| 31 |
index 0000000..dd7a8be |
| 32 |
--- /dev/null |
| 33 |
+++ b/dev-libs/nspr/files/nspr-4.9.1-x32.patch |
| 34 |
@@ -0,0 +1,68 @@ |
| 35 |
+diff -urN a/mozilla/nsprpub/pr/include/md/_linux.cfg b/mozilla/nsprpub/pr/include/md/_linux.cfg |
| 36 |
+--- a/mozilla/nsprpub/pr/include/md/_linux.cfg 2012-05-18 16:55:29.000000000 -0500 |
| 37 |
++++ b/mozilla/nsprpub/pr/include/md/_linux.cfg 2012-06-21 15:10:35.397358851 -0500 |
| 38 |
+@@ -211,7 +211,7 @@ |
| 39 |
+ #define PR_BYTES_PER_DWORD_LOG2 3 |
| 40 |
+ |
| 41 |
+ #elif defined(__x86_64__) |
| 42 |
+- |
| 43 |
++#ifdef __LP64__ |
| 44 |
+ #define IS_LITTLE_ENDIAN 1 |
| 45 |
+ #undef IS_BIG_ENDIAN |
| 46 |
+ #define IS_64 |
| 47 |
+@@ -256,6 +256,54 @@ |
| 48 |
+ #define PR_BYTES_PER_WORD_LOG2 3 |
| 49 |
+ #define PR_BYTES_PER_DWORD_LOG2 3 |
| 50 |
+ |
| 51 |
++#else |
| 52 |
++ |
| 53 |
++ |
| 54 |
++#define IS_LITTLE_ENDIAN 1 |
| 55 |
++#undef IS_BIG_ENDIAN |
| 56 |
++ |
| 57 |
++#define PR_BYTES_PER_BYTE 1 |
| 58 |
++#define PR_BYTES_PER_SHORT 2 |
| 59 |
++#define PR_BYTES_PER_INT 4 |
| 60 |
++#define PR_BYTES_PER_INT64 8 |
| 61 |
++#define PR_BYTES_PER_LONG 4 |
| 62 |
++#define PR_BYTES_PER_FLOAT 4 |
| 63 |
++#define PR_BYTES_PER_DOUBLE 8 |
| 64 |
++#define PR_BYTES_PER_WORD 4 |
| 65 |
++#define PR_BYTES_PER_DWORD 8 |
| 66 |
++ |
| 67 |
++#define PR_BITS_PER_BYTE 8 |
| 68 |
++#define PR_BITS_PER_SHORT 16 |
| 69 |
++#define PR_BITS_PER_INT 32 |
| 70 |
++#define PR_BITS_PER_INT64 64 |
| 71 |
++#define PR_BITS_PER_LONG 32 |
| 72 |
++#define PR_BITS_PER_FLOAT 32 |
| 73 |
++#define PR_BITS_PER_DOUBLE 64 |
| 74 |
++#define PR_BITS_PER_WORD 32 |
| 75 |
++ |
| 76 |
++#define PR_BITS_PER_BYTE_LOG2 3 |
| 77 |
++#define PR_BITS_PER_SHORT_LOG2 4 |
| 78 |
++#define PR_BITS_PER_INT_LOG2 5 |
| 79 |
++#define PR_BITS_PER_INT64_LOG2 6 |
| 80 |
++#define PR_BITS_PER_LONG_LOG2 5 |
| 81 |
++#define PR_BITS_PER_FLOAT_LOG2 5 |
| 82 |
++#define PR_BITS_PER_DOUBLE_LOG2 6 |
| 83 |
++#define PR_BITS_PER_WORD_LOG2 5 |
| 84 |
++ |
| 85 |
++#define PR_ALIGN_OF_SHORT 2 |
| 86 |
++#define PR_ALIGN_OF_INT 4 |
| 87 |
++#define PR_ALIGN_OF_LONG 4 |
| 88 |
++#define PR_ALIGN_OF_INT64 4 |
| 89 |
++#define PR_ALIGN_OF_FLOAT 4 |
| 90 |
++#define PR_ALIGN_OF_DOUBLE 4 |
| 91 |
++#define PR_ALIGN_OF_POINTER 4 |
| 92 |
++#define PR_ALIGN_OF_WORD 4 |
| 93 |
++ |
| 94 |
++#define PR_BYTES_PER_WORD_LOG2 2 |
| 95 |
++#define PR_BYTES_PER_DWORD_LOG2 3 |
| 96 |
++ |
| 97 |
++#endif |
| 98 |
++ |
| 99 |
+ #elif defined(__mc68000__) |
| 100 |
+ |
| 101 |
+ #undef IS_LITTLE_ENDIAN |
| 102 |
+ |
| 103 |
|
| 104 |
diff --git a/dev-libs/nspr/nspr-4.9.1.ebuild b/dev-libs/nspr/nspr-4.9.1-r1.ebuild |
| 105 |
similarity index 98% |
| 106 |
rename from dev-libs/nspr/nspr-4.9.1.ebuild |
| 107 |
rename to dev-libs/nspr/nspr-4.9.1-r1.ebuild |
| 108 |
index cddaeee..de71a1a 100644 |
| 109 |
--- a/dev-libs/nspr/nspr-4.9.1.ebuild |
| 110 |
+++ b/dev-libs/nspr/nspr-4.9.1-r1.ebuild |
| 111 |
@@ -31,6 +31,7 @@ src_prepare() { |
| 112 |
#epatch "${FILESDIR}"/${PN}-4.8.3-aix-soname.patch |
| 113 |
epatch "${FILESDIR}"/${PN}-4.8.4-darwin-install_name.patch |
| 114 |
epatch "${FILESDIR}"/${PN}-4.8.9-link-flags.patch |
| 115 |
+ epatch "${FILESDIR}"/${PN}-4.9.1-x32.patch |
| 116 |
|
| 117 |
# We must run eautoconf to regenerate configure |
| 118 |
cd "${S}"/mozilla/nsprpub |
Archives