CVS commit: pkgsrc/www/firefox

["Martin Husemann" <martin%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   martin
Date:           Wed Nov  7 12:55:11 UTC 2018

Modified Files:
        pkgsrc/www/firefox: distinfo mozilla-common.mk
Added Files:
        pkgsrc/www/firefox/patches: patch-js_xpconnect_src_XPCMaps.cpp
            patch-xpcom_reflect_xptcall_md_unix_moz.build
            patch-xpcom_reflect_xptcall_md_unix_xptcinvoke__sparc64__openbsd.cpp
Removed Files:
        pkgsrc/www/firefox/patches:
            patch-xpcom_reflect_xptcall_md_unix_xptcinvoke__sparc64__netbsd.cpp

Log Message:
Make the pkg at least build on sparc64 (nowhere near working yet)


To generate a diff of this commit:
cvs rdiff -u -r1.329 -r1.330 pkgsrc/www/firefox/distinfo
cvs rdiff -u -r1.118 -r1.119 pkgsrc/www/firefox/mozilla-common.mk
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/www/firefox/patches/patch-js_xpconnect_src_XPCMaps.cpp \
    pkgsrc/www/firefox/patches/patch-xpcom_reflect_xptcall_md_unix_xptcinvoke__sparc64__openbsd.cpp
cvs rdiff -u -r0 -r1.11 \
    pkgsrc/www/firefox/patches/patch-xpcom_reflect_xptcall_md_unix_moz.build
cvs rdiff -u -r1.1 -r0 \
    pkgsrc/www/firefox/patches/patch-xpcom_reflect_xptcall_md_unix_xptcinvoke__sparc64__netbsd.cpp

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/www/firefox/distinfo
diff -u pkgsrc/www/firefox/distinfo:1.329 pkgsrc/www/firefox/distinfo:1.330
--- pkgsrc/www/firefox/distinfo:1.329   Sun Nov  4 09:10:40 2018
+++ pkgsrc/www/firefox/distinfo Wed Nov  7 12:55:11 2018
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.329 2018/11/04 09:10:40 maya Exp $
+$NetBSD: distinfo,v 1.330 2018/11/07 12:55:11 martin Exp $
 
 SHA1 (firefox-63.0.1.source.tar.xz) = d62a85ce78904171e9f863154fb8cd031cdbe4ee
 RMD160 (firefox-63.0.1.source.tar.xz) = 28f6431150deb10b967e4181ebfb5c332deedbd2
@@ -21,6 +21,7 @@ SHA1 (patch-js_src_gc_Memory.cpp) = 40d8
 SHA1 (patch-js_src_threading_posix_Thread.cpp) = 47e612a676e614fd6dd43b8a3140218a3fbdc7fa
 SHA1 (patch-js_src_util_NativeStack.cpp) = 31541b96f763024f78fb6b4ef69e0d8806b224fa
 SHA1 (patch-js_src_wasm_WasmSignalHandlers.cpp) = 1c665a9383638774c00f6c5fead5d786b6c7944a
+SHA1 (patch-js_xpconnect_src_XPCMaps.cpp) = ff27c30fb34e0f1dcaade9a1163cb3407f01edef
 SHA1 (patch-media_libcubeb_gtest_moz.build) = ea6dcc7ceeb76ce1fb9d508cf43080a2eef3a9e4
 SHA1 (patch-media_libcubeb_src_cubeb.c) = 4fe5512c89fa9e0dd64573d2784e5e0f7fd4d866
 SHA1 (patch-media_libcubeb_src_cubeb__alsa.c) = f359a66a22f11142d05746e15894d998d3e3bf5a
@@ -37,4 +38,5 @@ SHA1 (patch-toolkit_mozapps_installer_pa
 SHA1 (patch-toolkit_xre_glxtest.cpp) = cf048491778610454b914400e53072afedd96e7b
 SHA1 (patch-xpcom_base_nscore.h) = d7c96eda884d7f370442749c43caba50da61bbe4
 SHA1 (patch-xpcom_build_BinaryPath.h) = 9ec4b740388a4a887401efbb89810e96336576f7
-SHA1 (patch-xpcom_reflect_xptcall_md_unix_xptcinvoke__sparc64__netbsd.cpp) = 0792c2c626d906e71c5183994cb32bf8cdb3e239
+SHA1 (patch-xpcom_reflect_xptcall_md_unix_moz.build) = 412da80be2aa43852e08ad35e6523ae0842167ab
+SHA1 (patch-xpcom_reflect_xptcall_md_unix_xptcinvoke__sparc64__openbsd.cpp) = 569f10c29da6e8d30ee6b8568c85a629557a3943

Index: pkgsrc/www/firefox/mozilla-common.mk
diff -u pkgsrc/www/firefox/mozilla-common.mk:1.118 pkgsrc/www/firefox/mozilla-common.mk:1.119
--- pkgsrc/www/firefox/mozilla-common.mk:1.118  Sun Nov  4 09:10:40 2018
+++ pkgsrc/www/firefox/mozilla-common.mk        Wed Nov  7 12:55:11 2018
@@ -1,4 +1,4 @@
-# $NetBSD: mozilla-common.mk,v 1.118 2018/11/04 09:10:40 maya Exp $
+# $NetBSD: mozilla-common.mk,v 1.119 2018/11/07 12:55:11 martin Exp $
 #
 # common Makefile fragment for mozilla packages based on gecko 2.0.
 #
@@ -26,7 +26,11 @@ UNLIMIT_RESOURCES+=  datasize
 .include "../../mk/bsd.prefs.mk"
 
 TOOL_DEPENDS+=         cbindgen-[0-9]*:../../devel/cbindgen
+.if ${MACHINE_ARCH} == "sparc64"
+CONFIGURE_ARGS+=       --disable-nodejs
+.else
 TOOL_DEPENDS+=         nodejs-[0-9]*:../../lang/nodejs
+.endif
 
 .if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64"
 BUILD_DEPENDS+=                yasm>=1.1:../../devel/yasm

Added files:

Index: pkgsrc/www/firefox/patches/patch-js_xpconnect_src_XPCMaps.cpp
diff -u /dev/null pkgsrc/www/firefox/patches/patch-js_xpconnect_src_XPCMaps.cpp:1.1
--- /dev/null   Wed Nov  7 12:55:11 2018
+++ pkgsrc/www/firefox/patches/patch-js_xpconnect_src_XPCMaps.cpp       Wed Nov  7 12:55:11 2018
@@ -0,0 +1,21 @@
+$NetBSD: patch-js_xpconnect_src_XPCMaps.cpp,v 1.1 2018/11/07 12:55:11 martin Exp $
+
+Avoid alignement issues, see bugzilla
+see https://bugzilla.mozilla.org/show_bug.cgi?id=1434726
+
+--- js/xpconnect/src/XPCMaps.cpp.orig  2018-10-31 01:08:09.000000000 +0100
++++ js/xpconnect/src/XPCMaps.cpp       2018-11-07 13:03:15.754241064 +0100
+@@ -23,7 +23,13 @@ using namespace mozilla;
+ static PLDHashNumber
+ HashIIDPtrKey(const void* key)
+ {
++#ifdef __sparc__
++    uintptr_t v;
++    memcpy(&v, key, sizeof(v));
++    return HashGeneric(&v);
++#else
+     return HashGeneric(*((uintptr_t*)key));
++#endif
+ }
+ 
+ static bool
Index: pkgsrc/www/firefox/patches/patch-xpcom_reflect_xptcall_md_unix_xptcinvoke__sparc64__openbsd.cpp
diff -u /dev/null pkgsrc/www/firefox/patches/patch-xpcom_reflect_xptcall_md_unix_xptcinvoke__sparc64__openbsd.cpp:1.1
--- /dev/null   Wed Nov  7 12:55:11 2018
+++ pkgsrc/www/firefox/patches/patch-xpcom_reflect_xptcall_md_unix_xptcinvoke__sparc64__openbsd.cpp     Wed Nov  7 12:55:11 2018
@@ -0,0 +1,18 @@
+$NetBSD: patch-xpcom_reflect_xptcall_md_unix_xptcinvoke__sparc64__openbsd.cpp,v 1.1 2018/11/07 12:55:11 martin Exp $
+
+Fix compile: adapt to recent changes
+
+--- xpcom/reflect/xptcall/md/unix/xptcinvoke_sparc64_openbsd.cpp.orig  2018-10-31 01:08:15.000000000 +0100
++++ xpcom/reflect/xptcall/md/unix/xptcinvoke_sparc64_openbsd.cpp       2018-11-07 12:19:50.595159109 +0100
+@@ -30,9 +30,9 @@
+   {
+     if (regCount < 5) regCount++;
+ 
+-    if (l_s->IsPtrData())
++    if (l_s->IsIndirect())
+     {
+-      *l_d = (uint64_t)l_s->ptr;
++      *l_d = (uint64_t)&l_s->val;
+       continue;
+     }
+     switch (l_s->type)

Index: pkgsrc/www/firefox/patches/patch-xpcom_reflect_xptcall_md_unix_moz.build
diff -u /dev/null pkgsrc/www/firefox/patches/patch-xpcom_reflect_xptcall_md_unix_moz.build:1.11
--- /dev/null   Wed Nov  7 12:55:11 2018
+++ pkgsrc/www/firefox/patches/patch-xpcom_reflect_xptcall_md_unix_moz.build    Wed Nov  7 12:55:11 2018
@@ -0,0 +1,15 @@
+$NetBSD: patch-xpcom_reflect_xptcall_md_unix_moz.build,v 1.11 2018/11/07 12:55:11 martin Exp $
+
+Make NetBSD/sparc64 use the same xptcall bindings as all other sparc64 ports
+
+--- ./xpcom/reflect/xptcall/md/unix/moz.build.orig     2018-10-31 01:08:15.000000000 +0100
++++ ./xpcom/reflect/xptcall/md/unix/moz.build  2018-11-07 10:29:36.234212381 +0100
+@@ -240,7 +240,7 @@
+         'xptcstubs_sparc_openbsd.cpp',
+     ]
+ 
+-if CONFIG['OS_ARCH'] in ('OpenBSD', 'FreeBSD', 'Linux') and CONFIG['CPU_ARCH'] == 'sparc64':
++if CONFIG['OS_ARCH'] in ('OpenBSD', 'FreeBSD', 'NetBSD', 'Linux') and CONFIG['CPU_ARCH'] == 'sparc64':
+     SOURCES += [
+         'xptcinvoke_asm_sparc64_openbsd.s',
+         'xptcinvoke_sparc64_openbsd.cpp',