From 5281f518fa06adc8019201ec3f5ccb998f4e34e7 Mon Sep 17 00:00:00 2001 From: Rasmus Thomsen Date: Thu, 13 Sep 2018 20:20:21 +0200 Subject: [PATCH] mozjs60: compile correctly on x86_64-musl resolves #2598 --- srcpkgs/mozjs60/patches/fix-musl-build.patch | 16 ++++++++++++++++ srcpkgs/mozjs60/template | 2 +- 2 files changed, 17 insertions(+), 1 deletion(-) create mode 100644 srcpkgs/mozjs60/patches/fix-musl-build.patch diff --git a/srcpkgs/mozjs60/patches/fix-musl-build.patch b/srcpkgs/mozjs60/patches/fix-musl-build.patch new file mode 100644 index 0000000000..af39467399 --- /dev/null +++ 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) + ;; diff --git a/srcpkgs/mozjs60/template b/srcpkgs/mozjs60/template index 2b038fde60..9f3bfadc2a 100644 --- 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