summaryrefslogtreecommitdiff
path: root/www
diff options
context:
space:
mode:
authoraymeric <aymeric@pkgsrc.org>2004-08-24 16:32:42 +0000
committeraymeric <aymeric@pkgsrc.org>2004-08-24 16:32:42 +0000
commita5f9a6a59091d935c609f3ebdbbb698762adf03a (patch)
tree2454c34598dae24d5799af7bbe81d58f781e5837 /www
parent2274148b6e0899334af0d59f66add8420aa5a04a (diff)
downloadpkgsrc-a5f9a6a59091d935c609f3ebdbbb698762adf03a.tar.gz
Forgot that one in previous commit: preprocess .s files with the C preprocessor
on ppc architectures
Diffstat (limited to 'www')
-rw-r--r--www/firefox/distinfo4
-rw-r--r--www/firefox/patches/patch-ac23
2 files changed, 17 insertions, 10 deletions
diff --git a/www/firefox/distinfo b/www/firefox/distinfo
index 32dc8fab471..bdbd4474eea 100644
--- a/www/firefox/distinfo
+++ b/www/firefox/distinfo
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.13 2004/08/24 14:28:33 aymeric Exp $
+$NetBSD: distinfo,v 1.14 2004/08/24 16:32:42 aymeric Exp $
SHA1 (firefox-0.9.3-source.tar.bz2) = db6290743d824559c5bb7b6bd060b65abcaea15b
Size (firefox-0.9.3-source.tar.bz2) = 33945173 bytes
SHA1 (patch-aa) = 9225a7a2c9b4545e800008169d4d88452c85d1a9
SHA1 (patch-ab) = 0c1f2d6cca09b4dd6b168ed29d84d245967a3369
-SHA1 (patch-ac) = e9bc27529cf595ab6f120d9021dd7d6c49112084
+SHA1 (patch-ac) = 32aa4b92eea19aca07077a292cb759d074026642
SHA1 (patch-ad) = 19afc8dfaf9f14439d747e42ee2f64a9c1a9dc3d
SHA1 (patch-ae) = 364b91f0bf51e49bb140e13dfb775a89ea38bb28
SHA1 (patch-af) = 6addfc2bd0b3e3aaefff6cce6836384ca44baf30
diff --git a/www/firefox/patches/patch-ac b/www/firefox/patches/patch-ac
index a0256bbbd36..adcc121c9b7 100644
--- a/www/firefox/patches/patch-ac
+++ b/www/firefox/patches/patch-ac
@@ -1,9 +1,8 @@
-$NetBSD: patch-ac,v 1.3 2004/06/23 16:47:12 taya Exp $
+$NetBSD: patch-ac,v 1.4 2004/08/24 16:32:42 aymeric Exp $
-diff -ru ../Orig/mozilla/xpcom/reflect/xptcall/src/md/unix/Makefile.in ./xpcom/reflect/xptcall/src/md/unix/Makefile.in
---- ../Orig/mozilla/xpcom/reflect/xptcall/src/md/unix/Makefile.in 2004-04-23 05:50:05.000000000 +0900
-+++ ./xpcom/reflect/xptcall/src/md/unix/Makefile.in 2004-06-15 23:55:43.000000000 +0900
-@@ -49,6 +49,9 @@
+--- xpcom/reflect/xptcall/src/md/unix/Makefile.in.orig 2004-04-22 22:50:05.000000000 +0200
++++ xpcom/reflect/xptcall/src/md/unix/Makefile.in
+@@ -49,6 +49,9 @@ ifneq (,$(filter FreeBSD NetBSD OpenBSD
ifeq (86,$(findstring 86,$(OS_TEST)))
CPPSRCS := xptcinvoke_unixish_x86.cpp xptcstubs_unixish_x86.cpp
endif
@@ -13,7 +12,7 @@ diff -ru ../Orig/mozilla/xpcom/reflect/xptcall/src/md/unix/Makefile.in ./xpcom/r
endif
#
# New code for Linux, et. al., with gcc
-@@ -140,7 +143,7 @@
+@@ -140,7 +143,7 @@ endif
# NetBSD/ARM
#
ifeq ($(OS_ARCH),NetBSD)
@@ -22,7 +21,7 @@ diff -ru ../Orig/mozilla/xpcom/reflect/xptcall/src/md/unix/Makefile.in ./xpcom/r
CPPSRCS := xptcinvoke_arm_netbsd.cpp xptcstubs_arm_netbsd.cpp
endif
endif
-@@ -174,7 +177,7 @@
+@@ -174,7 +177,7 @@ endif
# NetBSD/m68k
#
ifeq ($(OS_ARCH),NetBSD)
@@ -31,7 +30,15 @@ diff -ru ../Orig/mozilla/xpcom/reflect/xptcall/src/md/unix/Makefile.in ./xpcom/r
CPPSRCS := xptcinvoke_netbsd_m68k.cpp xptcstubs_netbsd_m68k.cpp
endif
endif
-@@ -305,6 +308,13 @@
+@@ -257,6 +260,7 @@ endif
+ ifneq (,$(filter NetBSDmacppc NetBSDbebox NetBSDofppc NetBSDprep NetBSDamigappc,$(OS_ARCH)$(OS_TEST)))
+ CPPSRCS := xptcinvoke_ppc_netbsd.cpp xptcstubs_ppc_netbsd.cpp
+ ASFILES := xptcinvoke_asm_ppc_netbsd.s xptcstubs_asm_ppc_netbsd.s
++AS := $(CC) -c -x assembler-with-cpp
+ endif
+
+ #
+@@ -305,6 +309,13 @@ ifeq ($(OS_ARCH)$(OS_TEST),NetBSDsparc)
CPPSRCS := xptcinvoke_sparc_netbsd.cpp xptcstubs_sparc_netbsd.cpp
ASFILES := xptcinvoke_asm_sparc_netbsd.s xptcstubs_asm_sparc_netbsd.s
endif