pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/lang/mozjs78 mozjs78: further SunOS build fixes



details:   https://anonhg.NetBSD.org/pkgsrc/rev/d8e020cb7ee8
branches:  trunk
changeset: 443866:d8e020cb7ee8
user:      gutteridge <gutteridge%pkgsrc.org@localhost>
date:      Wed Dec 30 06:10:37 2020 +0000

description:
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.

diffstat:

 lang/mozjs78/Makefile                                         |   4 ++-
 lang/mozjs78/distinfo                                         |   3 +-
 lang/mozjs78/patches/patch-js_src_wasm_WasmSignalHandlers.cpp |  14 +++++++++++
 3 files changed, 19 insertions(+), 2 deletions(-)

diffs (51 lines):

diff -r ba586c71c5ef -r d8e020cb7ee8 lang/mozjs78/Makefile
--- a/lang/mozjs78/Makefile     Tue Dec 29 17:56:14 2020 +0000
+++ b/lang/mozjs78/Makefile     Wed Dec 30 06:10:37 2020 +0000
@@ -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+=       --target=${MACHINE_GNU_PLATFORM}
 CONFIGURE_ARGS+=       --host=${MACHINE_GNU_PLATFORM}
 
+BUILDLINK_TRANSFORM.SunOS+=    rm:-pie
+
 .include "../../mk/bsd.prefs.mk"
 
 .if ${MACHINE_ARCH} == "i386"
diff -r ba586c71c5ef -r d8e020cb7ee8 lang/mozjs78/distinfo
--- a/lang/mozjs78/distinfo     Tue Dec 29 17:56:14 2020 +0000
+++ b/lang/mozjs78/distinfo     Wed Dec 30 06:10:37 2020 +0000
@@ -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_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
diff -r ba586c71c5ef -r d8e020cb7ee8 lang/mozjs78/patches/patch-js_src_wasm_WasmSignalHandlers.cpp
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/lang/mozjs78/patches/patch-js_src_wasm_WasmSignalHandlers.cpp     Wed Dec 30 06:10:37 2020 +0000
@@ -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])



Home | Main Index | Thread Index | Old Index