Content-Transfer-Encoding: 7bit
Content-Type: multipart/mixed; boundary="_----------=_159862947265210"
MIME-Version: 1.0
Date: Fri, 28 Aug 2020 15:44:32 +0000
From: "Benny Siegert" <bsiegert@netbsd.org>
Subject: CVS commit: [pkgsrc-2020Q2] pkgsrc/lang/mozjs60
To: pkgsrc-changes@NetBSD.org
Reply-To: bsiegert@netbsd.org
Message-Id: <20200828154432.D3B0FFB27@cvs.NetBSD.org>
Sender: pkgsrc-changes-owner@NetBSD.org
Precedence: bulk

This is a multi-part message in MIME format.

--_----------=_159862947265210
Content-Disposition: inline
Content-Transfer-Encoding: 8bit
Content-Type: text/plain; charset="US-ASCII"

Module Name:	pkgsrc
Committed By:	bsiegert
Date:		Fri Aug 28 15:44:32 UTC 2020

Modified Files:
	pkgsrc/lang/mozjs60 [pkgsrc-2020Q2]: Makefile distinfo
Added Files:
	pkgsrc/lang/mozjs60/patches [pkgsrc-2020Q2]:
	    patch-js_src_jit_AtomicOperations.h
	    patch-js_src_jit_none_AtomicOperations-feeling-lucky.h

Log Message:
Pullup ticket #6310 - requested by he
lang/mozjs60: PowerPC build fix

Revisions pulled up:
- lang/mozjs60/Makefile                                         1.10
- lang/mozjs60/distinfo                                         1.7
- lang/mozjs60/patches/patch-js_src_jit_AtomicOperations.h      1.1
- lang/mozjs60/patches/patch-js_src_jit_none_AtomicOperations-feeling-lucky.h 1.1

---
   Module Name:	pkgsrc
   Committed By:	he
   Date:		Sun Aug 23 22:29:47 UTC 2020

   Modified Files:
   	pkgsrc/lang/mozjs60: Makefile distinfo
   Added Files:
   	pkgsrc/lang/mozjs60/patches: patch-js_src_jit_AtomicOperations.h
   	    patch-js_src_jit_none_AtomicOperations-feeling-lucky.h

   Log Message:
   Make this build on NetBSD/powerpc:
    * c++ doesn't predefine __ppc__, only __powerpc__.  Compensate.
    * On NetBSD/powerpc, use libatomic for access to 64-bit atomics.
   PKGREVISION not bumped; build fix for NetBSD/powerpc, should not affect others.


To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.9.2.1 pkgsrc/lang/mozjs60/Makefile
cvs rdiff -u -r1.6 -r1.6.2.1 pkgsrc/lang/mozjs60/distinfo
cvs rdiff -u -r0 -r1.1.2.2 \
    pkgsrc/lang/mozjs60/patches/patch-js_src_jit_AtomicOperations.h \
    pkgsrc/lang/mozjs60/patches/patch-js_src_jit_none_AtomicOperations-feeling-lucky.h

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


--_----------=_159862947265210
Content-Disposition: inline
Content-Length: 4162
Content-Transfer-Encoding: binary
Content-Type: text/x-diff; charset=us-ascii

Modified files:

Index: pkgsrc/lang/mozjs60/Makefile
diff -u pkgsrc/lang/mozjs60/Makefile:1.9 pkgsrc/lang/mozjs60/Makefile:1.9.2.1
--- pkgsrc/lang/mozjs60/Makefile:1.9	Tue Jun  2 08:22:45 2020
+++ pkgsrc/lang/mozjs60/Makefile	Fri Aug 28 15:44:32 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2020/06/02 08:22:45 adam Exp $
+# $NetBSD: Makefile,v 1.9.2.1 2020/08/28 15:44:32 bsiegert Exp $
 
 DISTNAME=	mozjs60_60.8.0.orig
 PKGNAME=	${DISTNAME:S/_/-/:S/.orig//}
@@ -56,6 +56,12 @@ post-install:
 	${CHMOD} -x ${DESTDIR}${PREFIX}/include/mozjs-60/js-config.h
 	${CHMOD} -x ${DESTDIR}${PREFIX}/lib/pkgconfig/mozjs-60.pc
 
+.include "../../mk/bsd.prefs.mk"
+
+.if !empty(MACHINE_PLATFORM:MNetBSD-*-powerpc)
+# 64 bit atomics
+.include "../../devel/libatomic/buildlink3.mk"
+.endif
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../lang/python/tool.mk"
 .include "../../textproc/icu/buildlink3.mk"

Index: pkgsrc/lang/mozjs60/distinfo
diff -u pkgsrc/lang/mozjs60/distinfo:1.6 pkgsrc/lang/mozjs60/distinfo:1.6.2.1
--- pkgsrc/lang/mozjs60/distinfo:1.6	Thu May 28 15:26:23 2020
+++ pkgsrc/lang/mozjs60/distinfo	Fri Aug 28 15:44:32 2020
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.6 2020/05/28 15:26:23 triaxx Exp $
+$NetBSD: distinfo,v 1.6.2.1 2020/08/28 15:44:32 bsiegert Exp $
 
 SHA1 (mozjs60_60.8.0.orig.tar.xz) = b66207ee477c110995029f173e6b026f2e013591
 RMD160 (mozjs60_60.8.0.orig.tar.xz) = fef033969a51dc56c84669d33401f60bd499de6d
@@ -9,6 +9,8 @@ SHA1 (patch-.._.._python_mozbuild_mozbui
 SHA1 (patch-.._.._python_mozbuild_mozbuild_virtualenv.py) = 231d96ae8f66da1db36a4371c28d97a4db4c0f5c
 SHA1 (patch-.._public_TypeDecls.h) = 846e0707755cbe7e97cc380f66bfe6da0daf996e
 SHA1 (patch-gc_Memory.cpp) = ba865bee4b99ce6298404b41b465b281fd23555f
+SHA1 (patch-js_src_jit_AtomicOperations.h) = fc9ff5be98f045500675a73c34eaa9855cea2bec
+SHA1 (patch-js_src_jit_none_AtomicOperations-feeling-lucky.h) = 06108aad94437a12b2b80491dab917fe4bb0de37
 SHA1 (patch-jsdate.cpp) = f9314460476ffbc00fe85a75bddc964807d0153f
 SHA1 (patch-threading_posix_Thread.cpp) = c48a642fa98d8112c149142a4af4ac633d3ae332
 SHA1 (patch-util_NativeStack.cpp) = 68d2d80291a856c74bac2e6870317f143bb61355

Added files:

Index: pkgsrc/lang/mozjs60/patches/patch-js_src_jit_AtomicOperations.h
diff -u /dev/null pkgsrc/lang/mozjs60/patches/patch-js_src_jit_AtomicOperations.h:1.1.2.2
--- /dev/null	Fri Aug 28 15:44:32 2020
+++ pkgsrc/lang/mozjs60/patches/patch-js_src_jit_AtomicOperations.h	Fri Aug 28 15:44:32 2020
@@ -0,0 +1,15 @@
+$NetBSD: patch-js_src_jit_AtomicOperations.h,v 1.1.2.2 2020/08/28 15:44:32 bsiegert Exp $
+
+Oddly, C++ on NetBSD/powerpc doesn't predefine __ppc__, only __powerpc__.
+
+--- jit/AtomicOperations.h.orig	2019-07-01 09:07:41.000000000 +0000
++++ jit/AtomicOperations.h
+@@ -378,7 +378,7 @@ inline bool AtomicOperations::isLockfree
+ #else
+ #error "No AtomicOperations support for this platform+compiler combination"
+ #endif
+-#elif defined(__ppc__) || defined(__PPC__)
++#elif defined(__ppc__) || defined(__PPC__) || defined(__powerpc__)
+ #include "jit/none/AtomicOperations-feeling-lucky.h"
+ #elif defined(__sparc__)
+ #include "jit/none/AtomicOperations-feeling-lucky.h"
Index: pkgsrc/lang/mozjs60/patches/patch-js_src_jit_none_AtomicOperations-feeling-lucky.h
diff -u /dev/null pkgsrc/lang/mozjs60/patches/patch-js_src_jit_none_AtomicOperations-feeling-lucky.h:1.1.2.2
--- /dev/null	Fri Aug 28 15:44:32 2020
+++ pkgsrc/lang/mozjs60/patches/patch-js_src_jit_none_AtomicOperations-feeling-lucky.h	Fri Aug 28 15:44:32 2020
@@ -0,0 +1,15 @@
+$NetBSD: patch-js_src_jit_none_AtomicOperations-feeling-lucky.h,v 1.1.2.2 2020/08/28 15:44:32 bsiegert Exp $
+
+C++ on NetBSD/powerpc doesn't predefine __ppc__, only __powerpc__.  Compensate.
+
+--- jit/none/AtomicOperations-feeling-lucky.h.orig	2019-07-01 09:07:41.000000000 +0000
++++ jit/none/AtomicOperations-feeling-lucky.h
+@@ -39,7 +39,7 @@
+ // want WebAssembly support you can always just lie about the lock-freedom.
+ // After all, you're already feeling lucky.
+ 
+-#if defined(__ppc__) || defined(__PPC__)
++#if defined(__ppc__) || defined(__PPC__) || defined(__powerpc__)
+ #define GNUC_COMPATIBLE
+ #endif
+ 


--_----------=_159862947265210--