CVS commit: pkgsrc/lang/mozjs78

["Jonathan Perkin" <jperkin%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   jperkin
Date:           Mon Jun 10 12:22:09 UTC 2024

Modified Files:
        pkgsrc/lang/mozjs78: Makefile distinfo
Added Files:
        pkgsrc/lang/mozjs78/patches: patch-build_moz.configure_init.configure
            patch-js_src_old-configure.in

Log Message:
mozjs78: Switch SunOS over to illumos triple.

Required to ensure consistency with the rust target.


To generate a diff of this commit:
cvs rdiff -u -r1.35 -r1.36 pkgsrc/lang/mozjs78/Makefile
cvs rdiff -u -r1.16 -r1.17 pkgsrc/lang/mozjs78/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/lang/mozjs78/patches/patch-build_moz.configure_init.configure \
    pkgsrc/lang/mozjs78/patches/patch-js_src_old-configure.in

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.35 pkgsrc/lang/mozjs78/Makefile:1.36
--- pkgsrc/lang/mozjs78/Makefile:1.35   Wed May 29 16:33:14 2024
+++ pkgsrc/lang/mozjs78/Makefile        Mon Jun 10 12:22:09 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.35 2024/05/29 16:33:14 adam Exp $
+# $NetBSD: Makefile,v 1.36 2024/06/10 12:22:09 jperkin Exp $
 
 DISTNAME=      mozjs78_78.15.0.orig
 PKGNAME=       ${DISTNAME:S/_/-/:S/.orig//}
@@ -35,15 +35,23 @@ CONFIGURE_ARGS+=    --enable-strip
 CONFIGURE_ARGS+=       --with-intl-api
 # --disable-optimize
 
+OVERRIDE_GNU_CONFIG_SCRIPTS=   yes
+OVERRIDE_DIRDEPTH=             4
+
+CPPFLAGS.SunOS+=       -DSOLARIS
+
 # For rustc/cargo detection
 .include "../../mk/bsd.prefs.mk"
 
 # This is to work around build failures where an upstream configuration script
 # is confused by having more than one approximate match to MACHINE_GNU_PLATFORM
 # "i486" when attempting to select the Rust compiler target.
-.if !empty(MACHINE_PLATFORM:MNetBSD-*-i386)
+.if ${MACHINE_PLATFORM:MNetBSD-*-i386}
 CONFIGURE_ARGS+=       --target=i586-unknown-netbsd
 CONFIGURE_ARGS+=       --host=i586-unknown-netbsd
+.elif ${MACHINE_PLATFORM:MSunOS-*}
+CONFIGURE_ARGS+=       --target=x86_64-unknown-illumos
+CONFIGURE_ARGS+=       --host=x86_64-unknown-illumos
 .else
 CONFIGURE_ARGS+=       --target=${MACHINE_GNU_PLATFORM}
 CONFIGURE_ARGS+=       --host=${MACHINE_GNU_PLATFORM}

Index: pkgsrc/lang/mozjs78/distinfo
diff -u pkgsrc/lang/mozjs78/distinfo:1.16 pkgsrc/lang/mozjs78/distinfo:1.17
--- pkgsrc/lang/mozjs78/distinfo:1.16   Tue Oct 26 10:51:43 2021
+++ pkgsrc/lang/mozjs78/distinfo        Mon Jun 10 12:22:09 2024
@@ -1,8 +1,9 @@
-$NetBSD: distinfo,v 1.16 2021/10/26 10:51:43 nia Exp $
+$NetBSD: distinfo,v 1.17 2024/06/10 12:22:09 jperkin Exp $
 
 BLAKE2s (mozjs78_78.15.0.orig.tar.xz) = 43b4d26d730a5b83732d4fad782940f74fa15251aa9d60c39b56237134c95efe
 SHA512 (mozjs78_78.15.0.orig.tar.xz) = 709e60765b93db4ce8cd6fe21f7ed52d3a53806eb096a46dd42847014c56c0329a2a14a19bfe5ca989ccd6fd62992aee7232baaeca02cff4dafb46a9f33e041b
 Size (mozjs78_78.15.0.orig.tar.xz) = 60013324 bytes
+SHA1 (patch-build_moz.configure_init.configure) = ccb4d74547d509a00e4226adc609fe3b5b0a7558
 SHA1 (patch-build_moz.configure_rust.configure) = 149301b4a8fb81f6c64d90672b3137ae6d68461f
 SHA1 (patch-build_moz.configure_toolchain.configure) = 0a398dcd2855de94b25e5afd993c9f40cc323980
 SHA1 (patch-js_moz.configure) = f3d762b293761e359ac7c389059aa228949a6f0b
@@ -10,6 +11,7 @@ SHA1 (patch-js_src_jit_AtomicOperations.
 SHA1 (patch-js_src_jit_ProcessExecutableMemory.cpp) = 84d629df0e7963755aa38ff9a1e29d60ed3adb4c
 SHA1 (patch-js_src_jsapi-tests_moz.build) = 337c94d88bf5986136deeba1d45ccb933663a1a2
 SHA1 (patch-js_src_jsfriendapi.h) = f342a88182c1be0d3c0027c91ae94e1d4eac2542
+SHA1 (patch-js_src_old-configure.in) = 9f16919a36f21db120db48c8348cef7a46b37e91
 SHA1 (patch-js_src_tests_jstests.py) = f5387b5ee5f8f898e678494befbc00e21fbb7ebb
 SHA1 (patch-js_src_threading_posix_PosixThread.cpp) = f734abbd005d0353d4adfe865c215c2b86389bf6
 SHA1 (patch-js_src_util_NativeStack.cpp) = 3354064c4168711aa7f83d88336a902345239649

Added files:

Index: pkgsrc/lang/mozjs78/patches/patch-build_moz.configure_init.configure
diff -u /dev/null pkgsrc/lang/mozjs78/patches/patch-build_moz.configure_init.configure:1.1
--- /dev/null   Mon Jun 10 12:22:09 2024
+++ pkgsrc/lang/mozjs78/patches/patch-build_moz.configure_init.configure        Mon Jun 10 12:22:09 2024
@@ -0,0 +1,15 @@
+$NetBSD: patch-build_moz.configure_init.configure,v 1.1 2024/06/10 12:22:09 jperkin Exp $
+
+Support illumos triple.
+
+--- build/moz.configure/init.configure.orig    2024-06-10 11:30:43.622059403 +0000
++++ build/moz.configure/init.configure
+@@ -709,7 +709,7 @@ def split_triplet(triplet, allow_msvc=Fa
+         canonical_os = canonical_kernel = 'NetBSD'
+     elif os.startswith('openbsd'):
+         canonical_os = canonical_kernel = 'OpenBSD'
+-    elif os.startswith('solaris'):
++    elif os.startswith('solaris') or os.startswith('illumos'):
+         canonical_os = canonical_kernel = 'SunOS'
+     else:
+         raise ValueError('Unknown OS: %s' % os)
Index: pkgsrc/lang/mozjs78/patches/patch-js_src_old-configure.in
diff -u /dev/null pkgsrc/lang/mozjs78/patches/patch-js_src_old-configure.in:1.1
--- /dev/null   Mon Jun 10 12:22:09 2024
+++ pkgsrc/lang/mozjs78/patches/patch-js_src_old-configure.in   Mon Jun 10 12:22:09 2024
@@ -0,0 +1,15 @@
+$NetBSD: patch-js_src_old-configure.in,v 1.1 2024/06/10 12:22:09 jperkin Exp $
+
+Support illumos triple.
+
+--- js/src/old-configure.in.orig       2024-06-10 11:46:00.353580553 +0000
++++ js/src/old-configure.in
+@@ -711,7 +711,7 @@ case "$target" in
+     fi
+     ;;
+ 
+-*-solaris*)
++*-solaris*|*-illumos)
+     MOZ_FIX_LINK_PATHS="-L${DIST}/bin"
+     ;;
+