CVS commit: pkgsrc/lang/mozjs78

["Nia Alarie" <nia%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   nia
Date:           Sat Nov 28 10:54:55 UTC 2020

Modified Files:
        pkgsrc/lang/mozjs78: Makefile distinfo
Added Files:
        pkgsrc/lang/mozjs78/patches: patch-jit_AtomicOperations.h

Log Message:
mozjs78: Adapt he@'s mozjs60 powerpc patches


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 pkgsrc/lang/mozjs78/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/lang/mozjs78/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/lang/mozjs78/patches/patch-jit_AtomicOperations.h

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.5 pkgsrc/lang/mozjs78/Makefile:1.6
--- pkgsrc/lang/mozjs78/Makefile:1.5    Wed Nov 25 00:40:16 2020
+++ pkgsrc/lang/mozjs78/Makefile        Sat Nov 28 10:54:55 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2020/11/25 00:40:16 gutteridge Exp $
+# $NetBSD: Makefile,v 1.6 2020/11/28 10:54:55 nia Exp $
 
 DISTNAME=      mozjs78_78.4.0.orig
 PKGNAME=       ${DISTNAME:S/_/-/:S/.orig//}
@@ -40,6 +40,11 @@ CONFIGURE_ARGS+=     --host=${MACHINE_GNU_PL
 CXXFLAGS+=             -march=i586
 .endif
 
+.if !empty(MACHINE_PLATFORM:MNetBSD-*-powerpc)
+# 64 bit atomics
+.include "../../devel/libatomic/buildlink3.mk"
+.endif
+
 PKGCONFIG_OVERRIDE+=   build/js.pc.in
 PKGCONFIG_OVERRIDE+=   ctypes/libffi/libffi.pc.in
 

Index: pkgsrc/lang/mozjs78/distinfo
diff -u pkgsrc/lang/mozjs78/distinfo:1.2 pkgsrc/lang/mozjs78/distinfo:1.3
--- pkgsrc/lang/mozjs78/distinfo:1.2    Wed Nov 25 00:40:16 2020
+++ pkgsrc/lang/mozjs78/distinfo        Sat Nov 28 10:54:55 2020
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.2 2020/11/25 00:40:16 gutteridge Exp $
+$NetBSD: distinfo,v 1.3 2020/11/28 10:54:55 nia Exp $
 
 SHA1 (mozjs78_78.4.0.orig.tar.xz) = b2c1c241f70310d545f8a3c05b9c8c11676e56a8
 RMD160 (mozjs78_78.4.0.orig.tar.xz) = cef93b6116eff9f04beeaf3dda0a42cd811d0b18
@@ -8,6 +8,7 @@ SHA1 (patch-.._.._build_moz.configure_ru
 SHA1 (patch-.._.._build_moz.configure_toolchain.configure) = 055312319a6a4e2916263baf318585b943c1ca20
 SHA1 (patch-.._.._mfbt_tests_TestVariant.cpp) = e2b1aa54059a8a64ecef2bcf2807f5d8d85a89d2
 SHA1 (patch-configure.in) = e8dab4a549e5cdf2e97d65b258970f9f6cc9c72c
+SHA1 (patch-jit_AtomicOperations.h) = 5e3d51f209f94e9c1b33abe965cdf4289aab65d5
 SHA1 (patch-jit_ProcessExecutableMemory.cpp) = d65001c07cc9393db2dce6ff291e94d5dd76b86e
 SHA1 (patch-jsfriendapi.h) = c6eea8b37d44a4b0f9ca0a325e482d01ef2c6e0f
 SHA1 (patch-vm_ArrayBufferObject.cpp) = 931695e3e02ec1d6ed0f722be1059c48878cd117

Added files:

Index: pkgsrc/lang/mozjs78/patches/patch-jit_AtomicOperations.h
diff -u /dev/null pkgsrc/lang/mozjs78/patches/patch-jit_AtomicOperations.h:1.1
--- /dev/null   Sat Nov 28 10:54:55 2020
+++ pkgsrc/lang/mozjs78/patches/patch-jit_AtomicOperations.h    Sat Nov 28 10:54:55 2020
@@ -0,0 +1,16 @@
+$NetBSD: patch-jit_AtomicOperations.h,v 1.1 2020/11/28 10:54:55 nia Exp $
+
+C++ on NetBSD/powerpc doesn't predefine __ppc__, only __powerpc__.  Compensate.
+
+--- jit/AtomicOperations.h.orig        2020-11-04 10:51:58.000000000 +0000
++++ jit/AtomicOperations.h
+@@ -391,7 +391,8 @@ inline bool AtomicOperations::isLockfree
+ #elif defined(__ppc__) || defined(__PPC__) || defined(__sparc__) ||     \
+     defined(__ppc64__) || defined(__PPC64__) || defined(__ppc64le__) || \
+     defined(__PPC64LE__) || defined(__alpha__) || defined(__hppa__) ||  \
+-    defined(__sh__) || defined(__s390__) || defined(__s390x__)
++    defined(__sh__) || defined(__s390__) || defined(__s390x__) ||       \
++    defined(__powerpc__)
+ #  include "jit/shared/AtomicOperations-feeling-lucky.h"
+ #else
+ #  error "No AtomicOperations support provided for this platform"