Fixed patch to support hppa, changed ebuild to use toolchain-funcs

Package-Manager: portage-2.0.53

4 files changed, 42 insertions, 17 deletions

diff --git a/dev-lang/spidermonkey/ChangeLog b/dev-lang/spidermonkey/ChangeLog
index 429269589012..463a62c15c84 100644
--- a/dev-lang/spidermonkey/ChangeLog
+++ b/dev-lang/spidermonkey/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-lang/spidermonkey
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/spidermonkey/ChangeLog,v 1.10 2005/08/17 03:12:23 squash Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/spidermonkey/ChangeLog,v 1.11 2005/12/02 18:33:15 jer Exp $
+
+  02 Dec 2005; Jeroen Roovers <jer@gentoo.org>
+  files/spidermonkey-1.5_rc6-va_copy-fix.patch,
+  spidermonkey-1.5_rc6-r1.ebuild:
+  Fixed patch to support hppa, changed ebuild to use toolchain-funcs
 
   17 Aug 2005; Josh Grebe <squash@gentoo.org> spidermonkey-1.5_rc5.ebuild:
   GOod on sparc, bug #89510
diff --git a/dev-lang/spidermonkey/Manifest b/dev-lang/spidermonkey/Manifest
index d3d4c856e4de..ad69188801e0 100644
--- a/dev-lang/spidermonkey/Manifest
+++ b/dev-lang/spidermonkey/Manifest
@@ -1,8 +1,8 @@
-MD5 fcf506eeef4c52d110c89ccf778faa6b ChangeLog 1604
-MD5 92316cef417fab365401f2ce9d8f7394 spidermonkey-1.5_rc5.ebuild 802
-MD5 15f3923dfe0861bb637f0070debeb4e7 spidermonkey-1.5_rc6-r1.ebuild 1302
-MD5 b0a39d97a54b44ecd77f8b5671cd7fdd spidermonkey-1.5_rc6.ebuild 1147
+MD5 cf450138f8ee1fd1a507d6957593a689 ChangeLog 1800
 MD5 e7bfb72073e1ade3470d60ba93042804 files/digest-spidermonkey-1.5_rc5 63
 MD5 8e216cdd6972fcc5206162ef5f0a9702 files/digest-spidermonkey-1.5_rc6 64
 MD5 8e216cdd6972fcc5206162ef5f0a9702 files/digest-spidermonkey-1.5_rc6-r1 64
-MD5 432f897c13753f70b1dea5c066c10ac1 files/spidermonkey-1.5_rc6-va_copy-fix.patch 1129
+MD5 28f680a9a90133efd1e29dd6945ceb90 files/spidermonkey-1.5_rc6-va_copy-fix.patch 1643
+MD5 92316cef417fab365401f2ce9d8f7394 spidermonkey-1.5_rc5.ebuild 802
+MD5 0d34205067a3f52da2e017b87884da4f spidermonkey-1.5_rc6-r1.ebuild 1319
+MD5 b0a39d97a54b44ecd77f8b5671cd7fdd spidermonkey-1.5_rc6.ebuild 1147
diff --git a/dev-lang/spidermonkey/files/spidermonkey-1.5_rc6-va_copy-fix.patch b/dev-lang/spidermonkey/files/spidermonkey-1.5_rc6-va_copy-fix.patch
index 5dda900f60bf..d9643119c3a8 100644
--- a/dev-lang/spidermonkey/files/spidermonkey-1.5_rc6-va_copy-fix.patch
+++ b/dev-lang/spidermonkey/files/spidermonkey-1.5_rc6-va_copy-fix.patch
@@ -1,5 +1,17 @@
---- config/Linux_All.mk.orig	2005-02-09 22:10:41.756776680 +0000
-+++ config/Linux_All.mk	2005-02-09 22:17:12.809327656 +0000
+diff -Nurd js/src/config/Linux_All.mk js-new/src/config/Linux_All.mk
+--- js/src/config/Linux_All.mk	2003-05-16 02:21:08.000000000 +0200
++++ js-new/src/config/Linux_All.mk	2005-12-02 16:35:38.000000000 +0100
+@@ -36,8 +36,8 @@
+ # Config for all versions of Linux
+ #
+ 
+-CC = gcc
+-CCC = g++
++#CC = gcc
++#CCC = g++
+ CFLAGS +=  -Wall -Wno-format
+ OS_CFLAGS = -DXP_UNIX -DSVR4 -DSYSV -D_BSD_SOURCE -DPOSIX_SOURCE -DHAVE_LOCALTIME_R
+ 
 @@ -86,7 +86,7 @@
  JS_EDITLINE = 1
  
@@ -9,7 +21,7 @@
  # FIXME: better use it everywhere
  OS_CFLAGS += -DHAVE_VA_COPY
  endif
-@@ -96,3 +96,15 @@
+@@ -96,3 +96,21 @@
  # FIXME: better patch rules.mk & fdlibm/Makefile*
  OS_CFLAGS += -DPIC -fPIC
  endif
@@ -25,8 +37,15 @@
 +# FIXME: better patch rules.mk & fdlibm/Makefile*
 +OS_CFLAGS += -DPIC -fPIC
 +endif
---- jsprf.c.orig	2005-02-09 22:22:38.017888440 +0000
-+++ jsprf.c	2005-02-09 22:16:53.509261712 +0000
++
++ifeq ($(CPU_ARCH),parisc)
++# We need PIC code for shared libraries
++# FIXME: better patch rules.mk & fdlibm/Makefile*
++OS_CFLAGS += -DPIC -fPIC
++endif
+diff -Nurd js/src/jsprf.c js-new/src/jsprf.c
+--- js/src/jsprf.c	2004-02-25 14:33:42.000000000 +0100
++++ js-new/src/jsprf.c	2005-12-02 16:30:07.000000000 +0100
 @@ -55,7 +55,7 @@
  ** and requires array notation.
  */
diff --git a/dev-lang/spidermonkey/spidermonkey-1.5_rc6-r1.ebuild b/dev-lang/spidermonkey/spidermonkey-1.5_rc6-r1.ebuild
index 972612a78204..b316010685da 100644
--- a/dev-lang/spidermonkey/spidermonkey-1.5_rc6-r1.ebuild
+++ b/dev-lang/spidermonkey/spidermonkey-1.5_rc6-r1.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/spidermonkey/spidermonkey-1.5_rc6-r1.ebuild,v 1.6 2005/08/01 18:52:40 josejx Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/spidermonkey/spidermonkey-1.5_rc6-r1.ebuild,v 1.7 2005/12/02 18:33:15 jer Exp $
 
-inherit eutils
+inherit eutils toolchain-funcs
 
 MY_PV="${PV/_/-}a"
 DESCRIPTION="Stand-alone JavaScript C library"
@@ -11,7 +11,7 @@ SRC_URI="ftp://ftp.mozilla.org/pub/mozilla.org/js/js-${MY_PV}.tar.gz"
 
 LICENSE="NPL-1.1"
 SLOT="0"
-KEYWORDS="amd64 ppc ppc64 ~x86"
+KEYWORDS="amd64 ~hppa ppc ppc64 ~x86"
 IUSE=""
 
 DEPEND=""
@@ -22,7 +22,7 @@ src_unpack() {
 	unpack ${A}
 	cd ${S}
 
-	epatch ${FILESDIR}/${PN}-${PV}-va_copy-fix.patch || die 'Patching failed.'
+	epatch ${FILESDIR}/${P}-va_copy-fix.patch || die 'Patching failed.'
 }
 
 src_compile() {
@@ -34,9 +34,10 @@ install-headers: $(HFILES)
 	install -g root -o root -m 444 $^ $(DESTDIR)/usr/include/js
 EOF
 
+	export CC="$(tc-getCC)"
+	export LD="$(tc-getLD)"
 	# it needs to run twice
-	emake -j1 -f Makefile.ref BUILD_OPT=1 \
-		|| emake -j1 -f Makefile.ref BUILD_OPT=1 || die
+	emake -j1 -f Makefile.ref BUILD_OPT=1 || die
 }
 
 src_install() {