CVS commit: pkgsrc/lang/mozjs78

["David H. Gutteridge" <gutteridge%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   gutteridge
Date:           Wed Dec 30 06:10:37 UTC 2020

Modified Files:
        pkgsrc/lang/mozjs78: Makefile distinfo
Added Files:
        pkgsrc/lang/mozjs78/patches: patch-js_src_wasm_WasmSignalHandlers.cpp

Log Message:
mozjs78: further SunOS build fixes

This results in a successful build and a js78 executable that runs in
my test environment (the most recent OmniOS release). However, test
suite execution yields an immediate failure with the message "too much
recursion", so it seems more work is still required here.


To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 pkgsrc/lang/mozjs78/Makefile
cvs rdiff -u -r1.8 -r1.9 pkgsrc/lang/mozjs78/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/lang/mozjs78/patches/patch-js_src_wasm_WasmSignalHandlers.cpp

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

Modified files:

Index: pkgsrc/lang/mozjs78/Makefile
diff -u pkgsrc/lang/mozjs78/Makefile:1.14 pkgsrc/lang/mozjs78/Makefile:1.15
--- pkgsrc/lang/mozjs78/Makefile:1.14   Mon Dec 14 23:02:53 2020
+++ pkgsrc/lang/mozjs78/Makefile        Wed Dec 30 06:10:37 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2020/12/14 23:02:53 gutteridge Exp $
+# $NetBSD: Makefile,v 1.15 2020/12/30 06:10:37 gutteridge Exp $
 
 DISTNAME=      mozjs78_78.4.0.orig
 PKGNAME=       ${DISTNAME:S/_/-/:S/.orig//}
@@ -37,6 +37,8 @@ CONFIGURE_ARGS+=      --with-intl-api
 CONFIGURE_ARGS+=       --target=${MACHINE_GNU_PLATFORM}
 CONFIGURE_ARGS+=       --host=${MACHINE_GNU_PLATFORM}
 
+BUILDLINK_TRANSFORM.SunOS+=    rm:-pie
+
 .include "../../mk/bsd.prefs.mk"
 
 .if ${MACHINE_ARCH} == "i386"

Index: pkgsrc/lang/mozjs78/distinfo
diff -u pkgsrc/lang/mozjs78/distinfo:1.8 pkgsrc/lang/mozjs78/distinfo:1.9
--- pkgsrc/lang/mozjs78/distinfo:1.8    Tue Dec 29 02:04:47 2020
+++ pkgsrc/lang/mozjs78/distinfo        Wed Dec 30 06:10:37 2020
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.8 2020/12/29 02:04:47 gutteridge Exp $
+$NetBSD: distinfo,v 1.9 2020/12/30 06:10:37 gutteridge Exp $
 
 SHA1 (mozjs78_78.4.0.orig.tar.xz) = b2c1c241f70310d545f8a3c05b9c8c11676e56a8
 RMD160 (mozjs78_78.4.0.orig.tar.xz) = cef93b6116eff9f04beeaf3dda0a42cd811d0b18
@@ -17,4 +17,5 @@ SHA1 (patch-js_src_util_NativeStack.cpp)
 SHA1 (patch-js_src_vm_ArrayBufferObject.cpp) = 155f042eee3a8ff903622860e0a99af1ed776ad5
 SHA1 (patch-js_src_vm_JSONPrinter.cpp) = ff89dfe4e73223dda3d5d33e90e8c7bb3ffa3e0e
 SHA1 (patch-js_src_vm_JSONPrinter.h) = b9f67b29b16d7163aecc0ce9b6939c1308878a44
+SHA1 (patch-js_src_wasm_WasmSignalHandlers.cpp) = 3517e5da142355f1cbe89facaad47953f1985800
 SHA1 (patch-mfbt_tests_TestVariant.cpp) = 586fb67335b497ccadd3960025c44f8630f5476a

Added files:

Index: pkgsrc/lang/mozjs78/patches/patch-js_src_wasm_WasmSignalHandlers.cpp
diff -u /dev/null pkgsrc/lang/mozjs78/patches/patch-js_src_wasm_WasmSignalHandlers.cpp:1.1
--- /dev/null   Wed Dec 30 06:10:37 2020
+++ pkgsrc/lang/mozjs78/patches/patch-js_src_wasm_WasmSignalHandlers.cpp        Wed Dec 30 06:10:37 2020
@@ -0,0 +1,14 @@
+$NetBSD: patch-js_src_wasm_WasmSignalHandlers.cpp,v 1.1 2020/12/30 06:10:37 gutteridge Exp $
+
+Fix SunOS/x86_64 build.
+
+--- js/src/wasm/WasmSignalHandlers.cpp.orig    2020-11-04 10:52:03.000000000 +0000
++++ js/src/wasm/WasmSignalHandlers.cpp
+@@ -115,6 +115,7 @@ using mozilla::DebugOnly;
+ #    define EBP_sig(p) ((p)->uc_mcontext.gregs[REG_EBP])
+ #    define ESP_sig(p) ((p)->uc_mcontext.gregs[REG_ESP])
+ #  else
++#    include<sys/regset.h>
+ #    define EIP_sig(p) ((p)->uc_mcontext.gregs[REG_PC])
+ #    define EBP_sig(p) ((p)->uc_mcontext.gregs[REG_EBP])
+ #    define ESP_sig(p) ((p)->uc_mcontext.gregs[REG_ESP])