diff options
Diffstat (limited to 'mail/thunderbird/patches/patch-mb')
| -rw-r--r-- | mail/thunderbird/patches/patch-mb | 51 |
1 files changed, 15 insertions, 36 deletions
diff --git a/mail/thunderbird/patches/patch-mb b/mail/thunderbird/patches/patch-mb index 38fb6256386..6e6d6c8c586 100644 --- a/mail/thunderbird/patches/patch-mb +++ b/mail/thunderbird/patches/patch-mb @@ -1,26 +1,26 @@ -$NetBSD: patch-mb,v 1.2 2010/07/12 16:49:22 tnn Exp $ +$NetBSD: patch-mb,v 1.3 2011/08/19 14:39:10 tnn Exp $ ---- mozilla/xpcom/reflect/xptcall/src/md/unix/Makefile.in.orig 2010-03-16 05:57:24.000000000 -0400 -+++ mozilla/xpcom/reflect/xptcall/src/md/unix/Makefile.in 2010-03-31 05:09:52.000000000 -0400 -@@ -76,7 +76,7 @@ endif +--- mozilla/xpcom/reflect/xptcall/src/md/unix/Makefile.in.orig 2011-06-15 21:58:01.000000000 +0000 ++++ mozilla/xpcom/reflect/xptcall/src/md/unix/Makefile.in +@@ -97,7 +97,7 @@ endif endif endif --ifneq (,$(filter FreeBSD NetBSD OpenBSD BSD_OS,$(OS_ARCH))) -+ifneq (,$(filter BSD_OS,$(OS_ARCH))) +-ifneq (,$(filter NetBSD OpenBSD BSD_OS GNU,$(OS_ARCH))) ++ifneq (,$(filter BSD_OS GNU,$(OS_ARCH))) ifeq (86,$(findstring 86,$(OS_TEST))) CPPSRCS := xptcinvoke_unixish_x86.cpp xptcstubs_unixish_x86.cpp endif -@@ -85,7 +85,7 @@ endif +@@ -106,7 +106,7 @@ endif # New code for Linux, et. al., with gcc # Migrate other platforms here after testing # --ifneq (,$(filter Linux GNU_%,$(OS_ARCH))) +-ifneq (,$(filter Linux FreeBSD GNU_%,$(OS_ARCH))) +ifneq (,$(filter Linux NetBSD DragonFly FreeBSD OpenBSD GNU_%,$(OS_ARCH))) # Linux/x86-64 ifeq (x86_64,$(OS_TEST)) CPPSRCS := xptcinvoke_x86_64_unix.cpp xptcstubs_x86_64_linux.cpp -@@ -103,18 +103,6 @@ ASFILES := xptcstubs_asm_ipf64.s xptcin +@@ -124,12 +124,6 @@ ASFILES := xptcstubs_asm_ipf64.s xptcin endif endif # @@ -30,16 +30,10 @@ $NetBSD: patch-mb,v 1.2 2010/07/12 16:49:22 tnn Exp $ -CPPSRCS := xptcinvoke_amd64_openbsd.cpp xptcstubs_amd64_openbsd.cpp -endif -# --# FreeBSD/amd64 --# --ifeq ($(OS_ARCH)$(OS_TEST),FreeBSDx86_64) --CPPSRCS := xptcinvoke_amd64_linux.cpp xptcstubs_amd64_linux.cpp --endif --# - # BeOS/Intel (uses the same unixish_x86 code) + # Neutrino/Intel (uses the same unixish_x86 code) # - ifeq ($(OS_ARCH)$(OS_TEST),BeOSBePC) -@@ -200,7 +188,7 @@ endif + ifeq ($(OS_TARGET),NTO) +@@ -212,7 +206,7 @@ endif # NetBSD/ARM # ifeq ($(OS_ARCH),NetBSD) @@ -48,7 +42,7 @@ $NetBSD: patch-mb,v 1.2 2010/07/12 16:49:22 tnn Exp $ CPPSRCS := xptcinvoke_arm_netbsd.cpp xptcstubs_arm_netbsd.cpp endif endif -@@ -255,7 +243,7 @@ endif +@@ -269,7 +263,7 @@ endif # NetBSD/m68k # ifeq ($(OS_ARCH),NetBSD) @@ -57,22 +51,7 @@ $NetBSD: patch-mb,v 1.2 2010/07/12 16:49:22 tnn Exp $ CPPSRCS := xptcinvoke_netbsd_m68k.cpp xptcstubs_netbsd_m68k.cpp endif endif -@@ -295,6 +283,14 @@ ASFLAGS += -I$(DIST)/include -x assembl - endif - endif - -+ifeq ($(OS_ARCH),NetBSD) -+ifneq (,$(findstring mips, $(OS_TEST))) -+CPPSRCS := xptcinvoke_mips.cpp xptcstubs_mips.cpp -+ASFILES := xptcinvoke_asm_mips.s xptcstubs_asm_mips.s -+ASFLAGS += -I$(DIST)/include -x assembler-with-cpp -+endif -+endif -+ - ###################################################################### - # PowerPC - ###################################################################### -@@ -340,9 +336,10 @@ endif +@@ -359,9 +353,10 @@ endif # # NetBSD/PPC # @@ -84,7 +63,7 @@ $NetBSD: patch-mb,v 1.2 2010/07/12 16:49:22 tnn Exp $ endif # -@@ -414,6 +411,13 @@ CPPSRCS := xptcinvoke_sparc64_openbsd.c +@@ -433,6 +428,13 @@ CPPSRCS := xptcinvoke_sparc64_openbsd.c ASFILES := xptcinvoke_asm_sparc64_openbsd.s xptcstubs_asm_sparc64_openbsd.s endif # |