aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNatanael Copa <ncopa@alpinelinux.org>2020-03-30 16:04:21 +0000
committerNatanael Copa <ncopa@alpinelinux.org>2020-03-30 16:04:21 +0000
commit95ac4424d573ac6c5ee8f336cc7a9f68457de021 (patch)
tree2440ec38f08e013a2c5a2868958bb0cc8df146a1
parent7b84f27eefb1d94833f5776e801e681d6d87a199 (diff)
downloadaports-95ac4424d573ac6c5ee8f336cc7a9f68457de021.tar.bz2
aports-95ac4424d573ac6c5ee8f336cc7a9f68457de021.tar.xz
community/mozjs68: rebuild with llvm10
add check for clang/llvm mismatch
-rw-r--r--community/mozjs68/APKBUILD11
1 files changed, 9 insertions, 2 deletions
diff --git a/community/mozjs68/APKBUILD b/community/mozjs68/APKBUILD
index ae4b6f116b..ab1590002c 100644
--- a/community/mozjs68/APKBUILD
+++ b/community/mozjs68/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer: Rasmus Thomsen <oss@cogitri.dev>
pkgname=mozjs68
pkgver=68.6.0
-pkgrel=1
+pkgrel=2
pkgdesc="Standalone Mozilla JavaScript engine"
url="https://developer.mozilla.org/en-US/docs/Mozilla/Projects/SpiderMonkey"
arch="x86_64 armv7 armhf aarch64 x86 ppc64le" # limited by rust and cargo
@@ -13,6 +13,7 @@ depends_dev="
libffi-dev
readline-dev
"
+_llvmver=10
makedepends="
$depends_dev
zlib-dev
@@ -24,7 +25,7 @@ makedepends="
linux-headers
rust
cargo
- llvm9
+ llvm$_llvmver
clang-dev
"
subpackages="$pkgname-dev"
@@ -52,6 +53,12 @@ _builddir="$builddir/js/src"
# - CVE-2019-11707
build() {
+ local _clangver=$(clang --version | awk '$3 == "version" {print $4}')
+ if [ "${_clangver#$_llvmver}" = "$_clangver" ]; then
+ error "clang version $_clangver does not match llvm version $_llvmver"
+ return 1
+ fi
+
cd "$_builddir"
export LDFLAGS="$LDFLAGS -Wl,-z,stack-size=1048576"