734349b51e
- Update www/libxul to 10.0.7 - Update all dependent ports to use www/libxul19 (no functional changes) - Bump PORTREVISION on ports where libxul is a run dependency as the resulting package will change. Submitted by: Jan Beich <jbeich@tormail.org> With hat: gecko
110 lines
4.3 KiB
Text
110 lines
4.3 KiB
Text
diff --git xpcom/reflect/xptcall/public/genstubs.pl xpcom/reflect/xptcall/public/genstubs.pl
|
|
index b8a87a5..918c4cf 100644
|
|
--- xpcom/reflect/xptcall/public/genstubs.pl
|
|
+++ xpcom/reflect/xptcall/public/genstubs.pl
|
|
@@ -44,7 +44,7 @@ print OUTFILE "* 0 is QueryInterface\n";
|
|
print OUTFILE "* 1 is AddRef\n";
|
|
print OUTFILE "* 2 is Release\n";
|
|
print OUTFILE "*/\n";
|
|
-print OUTFILE "#if !defined(__ia64) || (!defined(__hpux) && !defined(__linux__))\n";
|
|
+print OUTFILE "#if !defined(__ia64) || (!defined(__hpux) && !defined(__linux__) && !defined(__FreeBSD__))\n";
|
|
for($i = 0; $i < $entry_count; $i++) {
|
|
print OUTFILE "NS_IMETHOD Stub",$i+3,"();\n";
|
|
}
|
|
diff --git xpcom/reflect/xptcall/public/xptcstubsdecl.inc xpcom/reflect/xptcall/public/xptcstubsdecl.inc
|
|
index eb66761..807db26 100644
|
|
--- xpcom/reflect/xptcall/public/xptcstubsdecl.inc
|
|
+++ xpcom/reflect/xptcall/public/xptcstubsdecl.inc
|
|
@@ -8,7 +8,7 @@
|
|
* 1 is AddRef
|
|
* 2 is Release
|
|
*/
|
|
-#if !defined(__ia64) || (!defined(__hpux) && !defined(__linux__))
|
|
+#if !defined(__ia64) || (!defined(__hpux) && !defined(__linux__) && !defined(__FreeBSD__))
|
|
NS_IMETHOD Stub3();
|
|
NS_IMETHOD Stub4();
|
|
NS_IMETHOD Stub5();
|
|
diff --git xpcom/reflect/xptcall/src/md/unix/Makefile.in xpcom/reflect/xptcall/src/md/unix/Makefile.in
|
|
index ae6ed66..2783957 100644
|
|
--- xpcom/reflect/xptcall/src/md/unix/Makefile.in
|
|
+++ xpcom/reflect/xptcall/src/md/unix/Makefile.in
|
|
@@ -85,7 +85,7 @@
|
|
# 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)))
|
|
# Linux/x86-64
|
|
ifeq (x86_64,$(OS_TEST))
|
|
CPPSRCS := xptcinvoke_x86_64_unix.cpp xptcstubs_x86_64_linux.cpp
|
|
@@ -70,7 +70,7 @@ endif
|
|
endif
|
|
endif
|
|
# IA64 Linux
|
|
-ifneq (,$(filter Linux,$(OS_ARCH)))
|
|
+ifneq (,$(filter Linux FreeBSD,$(OS_ARCH)))
|
|
ifneq (,$(findstring ia64,$(OS_TEST)))
|
|
CPPSRCS := xptcinvoke_ipf64.cpp xptcstubs_ipf64.cpp
|
|
ASFILES := xptcstubs_asm_ipf64.s xptcinvoke_asm_ipf64.s
|
|
@@ -109,12 +109,6 @@ ifeq ($(OS_ARCH)$(OS_TEST),OpenBSDx86_64
|
|
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)
|
|
#
|
|
ifeq ($(OS_ARCH)$(OS_TEST),BeOSBePC)
|
|
@@ -341,7 +356,7 @@
|
|
#
|
|
# Linux/PPC
|
|
#
|
|
-ifeq ($(OS_ARCH)$(OS_TEST),Linuxpowerpc)
|
|
+ifneq (,$(filter Linuxpowerpc FreeBSDpowerpc,$(OS_ARCH)$(OS_TEST)))
|
|
CPPSRCS := xptcinvoke_ppc_linux.cpp xptcstubs_ppc_linux.cpp
|
|
ASFILES := xptcinvoke_asm_ppc_linux.s xptcstubs_asm_ppc_linux.s
|
|
AS := $(CC) -c -x assembler-with-cpp
|
|
@@ -350,7 +365,7 @@
|
|
#
|
|
# Linux/PPC64
|
|
#
|
|
-ifeq ($(OS_ARCH)$(OS_TEST),Linuxpowerpc64)
|
|
+ifneq (,$(filter Linuxpowerpc64 FreeBSDpowerpc64,$(OS_ARCH)$(OS_TEST)))
|
|
CPPSRCS := xptcinvoke_ppc64_linux.cpp xptcstubs_ppc64_linux.cpp
|
|
ASFILES := xptcinvoke_asm_ppc64_linux.s xptcstubs_asm_ppc64_linux.s
|
|
AS := $(CC) -c -x assembler-with-cpp
|
|
@@ -350,7 +350,7 @@ endif
|
|
#
|
|
# OpenBSD/SPARC64
|
|
#
|
|
-ifeq ($(OS_ARCH)$(OS_TEST),OpenBSDsparc64)
|
|
+ifneq (,$(filter OpenBSDsparc64 FreeBSDsparc64,$(OS_ARCH)$(OS_TEST)))
|
|
CPPSRCS := xptcinvoke_sparc64_openbsd.cpp xptcstubs_sparc64_openbsd.cpp
|
|
ASFILES := xptcinvoke_asm_sparc64_openbsd.s xptcstubs_asm_sparc64_openbsd.s
|
|
endif
|
|
diff --git xpcom/reflect/xptcall/src/xptcprivate.h xpcom/reflect/xptcall/src/xptcprivate.h
|
|
index d903ced..e4ec832 100644
|
|
--- xpcom/reflect/xptcall/src/xptcprivate.h
|
|
+++ xpcom/reflect/xptcall/src/xptcprivate.h
|
|
@@ -14,7 +14,7 @@
|
|
|
|
class xptiInterfaceEntry;
|
|
|
|
-#if !defined(__ia64) || (!defined(__hpux) && !defined(__linux__))
|
|
+#if !defined(__ia64) || (!defined(__hpux) && !defined(__linux__) && !defined(__FreeBSD__))
|
|
#define STUB_ENTRY(n) NS_IMETHOD Stub##n() = 0;
|
|
#else
|
|
#define STUB_ENTRY(n) NS_IMETHOD Stub##n(PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64) = 0;
|
|
@@ -31,7 +31,7 @@ public:
|
|
#undef STUB_ENTRY
|
|
#undef SENTINEL_ENTRY
|
|
|
|
-#if !defined(__ia64) || (!defined(__hpux) && !defined(__linux__))
|
|
+#if !defined(__ia64) || (!defined(__hpux) && !defined(__linux__) && !defined(__FreeBSD__))
|
|
#define STUB_ENTRY(n) NS_IMETHOD Stub##n();
|
|
#else
|
|
#define STUB_ENTRY(n) NS_IMETHOD Stub##n(PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64);
|