Skip to content

Commit

Permalink
Another minor mishap from the sparc64 patches (now the package actually
Browse files Browse the repository at this point in the history
builds on sparc64)
  • Loading branch information
martin committed Jul 2, 2013
1 parent 9d4065c commit 66a784d
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 130 deletions.
5 changes: 2 additions & 3 deletions www/firefox/distinfo
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
$NetBSD: distinfo,v 1.105 2013/07/01 13:53:27 martin Exp $
$NetBSD: distinfo,v 1.106 2013/07/02 07:18:18 martin Exp $

SHA1 (firefox-22.0.source.tar.bz2) = db2d5b028b6ea95b5f006b46e153f50f7a52bf80
RMD160 (firefox-22.0.source.tar.bz2) = 9f206a786fcc366cb0ea03c4a5140809d1402272
Expand Down Expand Up @@ -53,7 +53,7 @@ SHA1 (patch-js_src_jscompartment.h) = 33708bc67f1c05f776dbb9c048ddf91f0eea25ca
SHA1 (patch-js_src_jstypedarray.cpp) = 520d085871dfd640bbd693f59424612d3f0f539e
SHA1 (patch-js_src_methodjit_MethodJIT.cpp) = 77685fc735bde4e592a3ddc29fa05b13a694fa8a
SHA1 (patch-js_src_vm_ObjectImpl-inl.h) = e6dda53d189c1e2e24735ea17d6b779d933342d7
SHA1 (patch-mb) = 4e268868b6a526a0911d677875bda7ef975afc1c
SHA1 (patch-mb) = 43500266e3a918ee311396c20e7edf1e2efafd94
SHA1 (patch-md) = 7fd607a3edd2ea5f7a5671fc6d06fba69c46c36f
SHA1 (patch-me) = 2ff755782bd35caded8934000d039976dad44103
SHA1 (patch-media_libsoundtouch_src_cpu__detect__x86.cpp) = 061b46d1ee33c055a5b39e6b20f47b80bcde0c86
Expand Down Expand Up @@ -116,7 +116,6 @@ SHA1 (patch-rc) = 2733724442a2cb49c5091146fd7e6001af686121
SHA1 (patch-security_manager_ssl_src_nsNSSComponent.cpp) = 15e9466d60e60f93a27fe23aadfea6e1d59ad0bc
SHA1 (patch-toolkit_library_Makefile.in) = 0c91d647f0f3a4653d39f11c9d8fd63611235932
SHA1 (patch-toolkit_toolkit.mozbuild) = 07e87d977cee59c0f5a5d14a8d41dc2a4230c01e
SHA1 (patch-xa) = 9182485283599a96663358bdc680c5cdb1d94a78
SHA1 (patch-xb) = 30eea880b40cee45d1235d3292fead4b5a54bbaa
SHA1 (patch-xc) = 8575fdac2b47966ccfb5e1cc7ca8505163e358c9
SHA1 (patch-xe) = ca4c87dbf9bb09e0e6c270d0fa76fc69a7d6df7f
Expand Down
16 changes: 8 additions & 8 deletions www/firefox/patches/patch-mb
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
$NetBSD: patch-mb,v 1.4 2013/06/21 23:11:42 ryoon Exp $
$NetBSD: patch-mb,v 1.5 2013/07/02 07:18:18 martin Exp $

--- xpcom/reflect/xptcall/src/md/unix/Makefile.in.orig 2013-02-15 21:15:14.000000000 +0000
+++ xpcom/reflect/xptcall/src/md/unix/Makefile.in
@@ -50,7 +50,7 @@ endif
@@ -49,7 +49,7 @@ endif
endif
endif

Expand All @@ -11,7 +11,7 @@ $NetBSD: patch-mb,v 1.4 2013/06/21 23:11:42 ryoon Exp $
ifeq (86,$(findstring 86,$(OS_TEST)))
CPPSRCS := xptcinvoke_gcc_x86_unix.cpp xptcstubs_gcc_x86_unix.cpp
endif
@@ -59,7 +59,7 @@ endif
@@ -58,7 +58,7 @@ endif
# New code for Linux, et. al., with gcc
# Migrate other platforms here after testing
#
Expand All @@ -20,7 +20,7 @@ $NetBSD: patch-mb,v 1.4 2013/06/21 23:11:42 ryoon Exp $
# Linux/x86-64
ifeq (x86_64,$(OS_TEST))
CPPSRCS := xptcinvoke_x86_64_unix.cpp xptcstubs_x86_64_linux.cpp
@@ -158,7 +158,7 @@ endif
@@ -157,7 +157,7 @@ endif
# NetBSD/ARM
#
ifeq ($(OS_ARCH),NetBSD)
Expand All @@ -29,7 +29,7 @@ $NetBSD: patch-mb,v 1.4 2013/06/21 23:11:42 ryoon Exp $
CPPSRCS := xptcinvoke_arm_netbsd.cpp xptcstubs_arm_netbsd.cpp
endif
endif
@@ -215,7 +215,7 @@ endif
@@ -214,7 +214,7 @@ endif
# NetBSD/m68k
#
ifeq ($(OS_ARCH),NetBSD)
Expand All @@ -38,7 +38,7 @@ $NetBSD: patch-mb,v 1.4 2013/06/21 23:11:42 ryoon Exp $
CPPSRCS := xptcinvoke_netbsd_m68k.cpp xptcstubs_netbsd_m68k.cpp
endif
endif
@@ -287,7 +287,7 @@ endif
@@ -286,7 +286,7 @@ endif
#
# NetBSD/PPC
#
Expand All @@ -47,15 +47,15 @@ $NetBSD: patch-mb,v 1.4 2013/06/21 23:11:42 ryoon Exp $
CPPSRCS := xptcinvoke_ppc_netbsd.cpp xptcstubs_ppc_netbsd.cpp
ASFILES := xptcinvoke_asm_ppc_netbsd.s xptcstubs_asm_ppc_netbsd.s
endif
@@ -346,6 +346,13 @@ CPPSRCS := xptcinvoke_sparc64_openbsd.c
@@ -345,6 +345,13 @@ CPPSRCS := xptcinvoke_sparc64_openbsd.c
ASFILES := xptcinvoke_asm_sparc64_openbsd.s xptcstubs_asm_sparc64_openbsd.s
endif
#
+# NetBSD/SPARC64
+#
+ifeq ($(OS_ARCH)$(OS_TEST),NetBSDsparc64)
+CPPSRCS := xptcinvoke_sparc64_netbsd.cpp xptcstubs_sparc64_openbsd.cpp
+ASFILES := xptcinvoke_asm_sparc64_netbsd.s xptcstubs_asm_sparc64_netbsd.s
+ASFILES := xptcinvoke_asm_sparc64_openbsd.s xptcstubs_asm_sparc64_netbsd.s
+endif
+#
# Solaris/SPARC
Expand Down
119 changes: 0 additions & 119 deletions www/firefox/patches/patch-xa

This file was deleted.

0 comments on commit 66a784d

Please sign in to comment.