[gentoo-commits] proj/mozilla:master commit in: dev-libs/nspr/files/, dev-libs/nspr/

public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed

From: "Jory Pratt" <anarchy@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] proj/mozilla:master commit in: dev-libs/nspr/files/, dev-libs/nspr/
Date: Sun, 24 Jun 2012 03:31:48 +0000 (UTC)	[thread overview]
Message-ID: <1340508672.e72990d448085791452898371505d232d7ee918a.anarchy@gentoo> (raw)

commit:     e72990d448085791452898371505d232d7ee918a
Author:     Jory A. Pratt <anarchy <AT> gentoo <DOT> org>
AuthorDate: Sun Jun 24 03:31:12 2012 +0000
Commit:     Jory Pratt <anarchy <AT> gentoo <DOT> org>
CommitDate: Sun Jun 24 03:31:12 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/mozilla.git;a=commit;h=e72990d4

Fix x32 patch force update to fix undefined references.

---
 dev-libs/nspr/Manifest                             |    4 +-
 dev-libs/nspr/files/nspr-4.9.1-x32.patch           |  107 -------------
 dev-libs/nspr/files/nspr-4.9.1-x32_v0.1.patch      |  156 ++++++++++++++++++++
 .../{nspr-4.9.1-r1.ebuild => nspr-4.9.1-r2.ebuild} |    2 +-
 4 files changed, 159 insertions(+), 110 deletions(-)

diff --git a/dev-libs/nspr/Manifest b/dev-libs/nspr/Manifest
index f47ab4b..180b4db 100644
--- a/dev-libs/nspr/Manifest
+++ b/dev-libs/nspr/Manifest
@@ -8,6 +8,6 @@ AUX nspr-4.8.3-aix-gcc.patch 3673 RMD160 01b03fb2be761c72dd3eb9c7e9f03bb9c3cf9ef
 AUX nspr-4.8.3-aix-soname.patch 1164 RMD160 da8fe1e17cade02ab6a4862ef901dd6c1606a1e3 SHA1 7a919bf08fa9d7a68815cdceda9082f5db8be445 SHA256 cec2e8b1cdf9e81f6b36c7981a5cb017fbf18192586c00d3e80ad897917bfcaa
 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.1-x32.patch 3199 RMD160 c309585536472c3de43f465666c63fecc640c254 SHA1 9499a952f638872f686d31b6a12d5e9c196cab9d SHA256 bf996243de2e024ca6c12eb37ea51c59075bf58718e004b5ea663cf0b58a5738
+AUX nspr-4.9.1-x32_v0.1.patch 4930 RMD160 fcc0bbfdcddb1f9bddbb89307b688e226263622b SHA1 3e80fe9b56eecd3fc838d641870d0bf7d92a1e0c SHA256 a12bb9c20e2d888ef227bc98624133059068f79c2cf4a0b5ee26d43b05852e7f
 DIST nspr-4.9.1.tar.gz 1172951 RMD160 e541d6ead14dbf0145061c75d176f6391fc186cd SHA1 1d52282668f2f8f5aabf7a5a3e7f6ba9a5df9710 SHA256 5b696b80a3254aa0e5c7f0614b6bb9b14c483df46af66c792993e3d853568d17
-EBUILD nspr-4.9.1-r1.ebuild 3698 RMD160 973f4db9bf307d78bbea0282c523cbd28ff52fd9 SHA1 cbdef5b02c74ded9ece6ad75d82ae33a8a8778e3 SHA256 3ea29134d0a928148e370cf8e04cc2673c67d7c50714455b51beef60cded3bce
+EBUILD nspr-4.9.1-r2.ebuild 3703 RMD160 138621f81b9c7a0871d581d9b78419e9adaccdf7 SHA1 09d720b08f69add1d2f416f7071282ba848385d5 SHA256 99e83842eee5deb42b975ba8b436655f6d3224ba1dee1fcc0a9bbbf1715a3a25

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 a44e9e7..0000000
--- a/dev-libs/nspr/files/nspr-4.9.1-x32.patch
+++ /dev/null
@@ -1,107 +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 -urN a/mozilla/nsprpub/pr/include/md/_linux.h b/mozilla/nsprpub/pr/include/md/_linux.h
---- a/mozilla/nsprpub/pr/include/md/_linux.h	2012-06-20 12:02:07.401308346 +0000
-+++ b/mozilla/nsprpub/pr/include/md/_linux.h	2012-06-20 12:31:44.113394683 +0000
-@@ -27,7 +27,7 @@
- #define _PR_SI_ARCHITECTURE "alpha"
- #elif defined(__ia64__)
- #define _PR_SI_ARCHITECTURE "ia64"
--#elif defined(__x86_64__)
-+#elif defined(__x86_64__) && !defined(__ILP32__)
- #define _PR_SI_ARCHITECTURE "x86-64"
- #elif defined(__mc68000__)
- #define _PR_SI_ARCHITECTURE "m68k"
-@@ -35,7 +35,7 @@
- #define _PR_SI_ARCHITECTURE "sparc64"
- #elif defined(__sparc__)
- #define _PR_SI_ARCHITECTURE "sparc"
--#elif defined(__i386__)
-+#elif defined(__i386__) || (defined(__x86_64__) && defined(__ILP32__))
- #define _PR_SI_ARCHITECTURE "x86"
- #elif defined(__mips__)
- #define _PR_SI_ARCHITECTURE "mips"
-@@ -78,7 +78,7 @@
- #define _PR_HAVE_SOCKADDR_LEN
- #endif
- 
--#if defined(__i386__)
-+#if defined(__i386__) || (defined(__x86_64__) && defined(__ILP32__))
- #define _PR_HAVE_ATOMIC_OPS
- #define _MD_INIT_ATOMIC()
- extern PRInt32 _PR_x86_AtomicIncrement(PRInt32 *val);
-@@ -104,7 +104,7 @@
- #define _MD_ATOMIC_SET                _PR_ia64_AtomicSet
- #endif
- 
--#if defined(__x86_64__)
-+#if defined(__x86_64__) && !defined(__ILP32__)
- #define _PR_HAVE_ATOMIC_OPS
- #define _MD_INIT_ATOMIC()
- extern PRInt32 _PR_x86_64_AtomicIncrement(PRInt32 *val);
-

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 0000000..3de2a0f
--- /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
similarity index 98%
rename from dev-libs/nspr/nspr-4.9.1-r1.ebuild
rename to dev-libs/nspr/nspr-4.9.1-r2.ebuild
index 3ba6659..9f1bf05 100644
--- a/dev-libs/nspr/nspr-4.9.1-r1.ebuild
+++ b/dev-libs/nspr/nspr-4.9.1-r2.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.patch
+	epatch "${FILESDIR}"/${PN}-4.9.1-x32_v0.1.patch
 
 	# We must run eautoconf to regenerate configure
 	cd "${S}"/mozilla/nsprpub

next             reply	other threads:[~2012-06-24  3:32 UTC|newest]

Thread overview: 15+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-06-24  3:31 Jory Pratt [this message]
  -- strict thread matches above, loose matches on Subject: below --
2022-04-12 11:56 [gentoo-commits] proj/mozilla:master commit in: dev-libs/nspr/files/, dev-libs/nspr/ Joonas Niilola
2019-10-22  8:44 Lars Wendler
2017-06-07 17:26 Jory Pratt
2017-06-05 14:36 Jory Pratt
2016-07-09  3:25 Ian Stakenvicius
2015-11-21 19:46 Jory Pratt
2014-06-12 15:22 Ian Stakenvicius
2013-03-11 16:04 Jory Pratt
2013-02-17  2:59 Jory Pratt
2012-11-25 12:38 Jory Pratt
2012-07-21  1:57 Jory Pratt
2012-06-22  0:50 Jory Pratt
2012-02-21  0:24 Jory Pratt
2012-01-10  2:09 Jory Pratt

find likely ancestor, descendant, or conflicting patches for this message:
( dfblob:f47ab4b dfblob:180b4db dfblob:a44e9e7 dfblob:3de2a0f
dfblob:3ba6659 dfblob:9f1bf05 )
 OR (
bs:"[gentoo-commits] proj/mozilla:master commit in: dev-libs/nspr/files/, dev-libs/nspr/" )
	(help)

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1340508672.e72990d448085791452898371505d232d7ee918a.anarchy@gentoo \
    --to=anarchy@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

Be sure your reply has a Subject: header at the top and a blank line before the message body.

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox