mozjs60: compile correctly on x86_64-musl

resolves #2598
2018-09-13 20:20:21 +02:00 · 2018-09-13 20:20:21 +02:00 · 5281f518fa
parent e3a882ddea
commit 5281f518fa
2 changed files with 17 additions and 1 deletions
--- a/srcpkgs/mozjs60/patches/fix-musl-build.patch
+++ b/srcpkgs/mozjs60/patches/fix-musl-build.patch
@ -0,0 +1,16 @@
+Upstream: No
+Reason: mozjs60 miscompiles on musl if built with HAVE_THREAD_TLS_KEYWORD:
+https://github.com/void-linux/void-packages/issues/2598
+diff --git a/js/src/old-configure.in b/js/src/old-configure.in
+--- a/js/src/old-configure.in
+++ b/js/src/old-configure.in
+@@ -1272,6 +1272,9 @@
+     *-android*|*-linuxandroid*)
+       :
+       ;;
+    *-musl*)
+      :
+      ;;
+     *)
+       AC_DEFINE(HAVE_THREAD_TLS_KEYWORD)
+       ;;
--- a/srcpkgs/mozjs60/template
+++ b/srcpkgs/mozjs60/template
@ -1,7 +1,7 @@
 # Template file for 'mozjs60'
 pkgname=mozjs60
 version=60.0.2
-revision=1
+revision=2
 wrksrc="firefox-${version}"
 build_wrksrc=js/src
 build_style=gnu-configure