Added a build-fix patch for hppa.

4 files changed, 174 insertions, 6 deletions

diff --git a/dev-libs/nss/ChangeLog b/dev-libs/nss/ChangeLog
index 01956d562795..939b4955b9f9 100644
--- a/dev-libs/nss/ChangeLog
+++ b/dev-libs/nss/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-libs/nss
 # Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/nss/ChangeLog,v 1.18 2004/02/26 13:59:48 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/nss/ChangeLog,v 1.19 2004/04/06 19:57:44 gmsoft Exp $
+
+  06 Apr 2004; Guy Martin <gmsoft@gentoo.org> nss-3.8.ebuild:
+  Added a build-fix patch for hppa.
 
   26 Feb 2004; Gustavo Zacarias <gustavoz@gentoo.org> nss-3.8.ebuild:
   stable on hppa
diff --git a/dev-libs/nss/Manifest b/dev-libs/nss/Manifest
index 0b97ac390672..034699da555a 100644
--- a/dev-libs/nss/Manifest
+++ b/dev-libs/nss/Manifest
@@ -1,6 +1,7 @@
-MD5 cefb9eb8e49d63a1b032044131daf6c2 nss-3.8.ebuild 2461
-MD5 f949e5d1259d42e212ba8a913cd51f21 ChangeLog 2281
+MD5 08f2d5c790458381d5c8f7de05c87ab4 ChangeLog 2378
 MD5 8f906ffe0aa837e5e26fe03af3043461 metadata.xml 219
-MD5 2bba753992f9510d4a440a2ca18858c4 files/nss-3.8-mips.patch 503
-MD5 d5948dfd93b61198742855ec3d2a254d files/nss-3.8-amd64.patch 8306
+MD5 f47de42ef4d3e01c9e10b5a7d384d7c4 nss-3.8.ebuild 2548
 MD5 80da1f67cfbd587017f411109c5ca57b files/digest-nss-3.8 60
+MD5 d5948dfd93b61198742855ec3d2a254d files/nss-3.8-amd64.patch 8306
+MD5 2bba753992f9510d4a440a2ca18858c4 files/nss-3.8-mips.patch 503
+MD5 ef044b71f9a324137ddae80c970ea246 files/nss-3.8-hppa.patch 4758
diff --git a/dev-libs/nss/files/nss-3.8-hppa.patch b/dev-libs/nss/files/nss-3.8-hppa.patch
new file mode 100644
index 000000000000..0d378ccfd0ca
--- /dev/null
+++ b/dev-libs/nss/files/nss-3.8-hppa.patch
@@ -0,0 +1,160 @@
+diff -uNr nss-3.8.orig/mozilla/nsprpub/config/Linux.mk nss-3.8/mozilla/nsprpub/config/Linux.mk
+--- nss-3.8.orig/mozilla/nsprpub/config/Linux.mk	2004-04-05 20:27:43.000000000 +0000
++++ nss-3.8/mozilla/nsprpub/config/Linux.mk	2004-04-05 20:28:07.000000000 +0000
+@@ -66,12 +66,22 @@
+ ifeq (86,$(findstring 86,$(OS_TEST)))
+ CPU_ARCH		:= x86
+ else
++ifeq ($(OS_TEST),parisc)
++OS_REL_CFLAGS		= -DLINUX1_2 -D_XOPEN_SOURCE
++CPU_ARCH		= hppa
++else
++ifeq ($(OS_TEST),parisc64)
++OS_REL_CFLAGS		= -DLINUX1_2 -D_XOPEN_SOURCE
++CPU_ARCH		= hppa
++else
+ ifeq (,$(filter-out arm% sa110,$(OS_TEST)))
+ CPU_ARCH		:= arm
+ else
+ CPU_ARCH		:= $(OS_TEST)
+ endif
+ endif
++endif
++endif
+ CPU_ARCH_TAG		= _$(CPU_ARCH)
+ 
+ CC			= gcc
+diff -uNr nss-3.8.orig/mozilla/nsprpub/pr/include/md/_linux.cfg nss-3.8/mozilla/nsprpub/pr/include/md/_linux.cfg
+--- nss-3.8.orig/mozilla/nsprpub/pr/include/md/_linux.cfg	2004-04-05 20:27:45.000000000 +0000
++++ nss-3.8/mozilla/nsprpub/pr/include/md/_linux.cfg	2004-04-05 20:28:07.000000000 +0000
+@@ -414,6 +414,96 @@
+ #define PR_BYTES_PER_WORD_LOG2   2
+ #define PR_BYTES_PER_DWORD_LOG2  3
+ 
++#elif defined(__hppa__)
++
++#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
++#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   8
++#define PR_ALIGN_OF_FLOAT   4
++#define PR_ALIGN_OF_DOUBLE  8
++#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
++
++#elif defined(__hppa__)
++
++#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
++#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   8
++#define PR_ALIGN_OF_FLOAT   4
++#define PR_ALIGN_OF_DOUBLE  8
++#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
++
+ #elif defined(__s390__)
+ 
+ #define IS_BIG_ENDIAN 1
+diff -uNr nss-3.8.orig/mozilla/nsprpub/pr/include/md/_linux.h nss-3.8/mozilla/nsprpub/pr/include/md/_linux.h
+--- nss-3.8.orig/mozilla/nsprpub/pr/include/md/_linux.h	2004-04-05 20:27:45.000000000 +0000
++++ nss-3.8/mozilla/nsprpub/pr/include/md/_linux.h	2004-04-05 20:28:07.000000000 +0000
+@@ -63,6 +63,8 @@
+ #define _PR_SI_ARCHITECTURE "s390"
+ #elif defined(__s390x__)
+ #define _PR_SI_ARCHITECTURE "s390x"
++#elif defined(__hppa__)
++#define _PR_SI_ARCHITECTURE "hppa"
+ #else
+ #error "Unknown CPU architecture"
+ #endif
+diff -uNr nss-3.8.orig/mozilla/security/coreconf/Linux.mk nss-3.8/mozilla/security/coreconf/Linux.mk
+--- nss-3.8.orig/mozilla/security/coreconf/Linux.mk	2004-04-05 20:27:49.000000000 +0000
++++ nss-3.8/mozilla/security/coreconf/Linux.mk	2004-04-05 20:28:23.000000000 +0000
+@@ -78,6 +78,10 @@
+ 	OS_REL_CFLAGS   = -DLINUX1_2 -D_XOPEN_SOURCE
+ 	CPU_ARCH        = arm
+ else
++ifeq ($(OS_TEST),parisc)
++	OS_REL_CFLAGS   = -DLINUX1_2 -D_XOPEN_SOURCE
++	CPU_ARCH        = hppa
++else
+ ifeq ($(OS_TEST),parisc64)
+ 	OS_REL_CFLAGS   = -DLINUX1_2 -D_XOPEN_SOURCE
+ 	CPU_ARCH        = hppa
+@@ -102,6 +106,7 @@
+ endif
+ endif
+ endif
++endif
+ 
+ 
+ LIBC_TAG		= _glibc
diff --git a/dev-libs/nss/nss-3.8.ebuild b/dev-libs/nss/nss-3.8.ebuild
index a8da78eeb824..b449525b38f1 100644
--- a/dev-libs/nss/nss-3.8.ebuild
+++ b/dev-libs/nss/nss-3.8.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/nss/nss-3.8.ebuild,v 1.20 2004/02/26 13:59:48 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/nss/nss-3.8.ebuild,v 1.21 2004/04/06 19:57:44 gmsoft Exp $
 
 S=${WORKDIR}/${P}
 
@@ -43,6 +43,10 @@ src_unpack() {
 	if [ "${ARCH}" = "amd64" ]
 	then
 		cd ${S}; epatch ${FILESDIR}/${PN}-${PV}-amd64.patch
+	elif [ "${ARCH}" = "hppa" ]
+	then
+		cd ${S}
+		epatch ${FILESDIR}/${PN}-${PV}-hppa.patch
 	fi
 
 	if [ "`use mips`" ]; then