From 49f74e4323386e3bd8f35666e9b686fa78804ffb Mon Sep 17 00:00:00 2001 From: Rasmus Thomsen Date: Sun, 10 Mar 2019 15:22:11 +0100 Subject: [PATCH] mozjs60: update to 60.5.2. Also fixes cross compilation of application which depend on mozjs60 via pkg-config [ci skip] --- srcpkgs/mozjs60/template | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/srcpkgs/mozjs60/template b/srcpkgs/mozjs60/template index fcd4801cf3b..aca91d22aca 100644 --- a/srcpkgs/mozjs60/template +++ b/srcpkgs/mozjs60/template @@ -1,6 +1,6 @@ # Template file for 'mozjs60' pkgname=mozjs60 -version=60.5.0 +version=60.5.2 revision=1 wrksrc="firefox-${version}" build_wrksrc=js/src @@ -8,11 +8,11 @@ build_style=gnu-configure hostmakedepends="perl python pkg-config automake autoconf213 autoconf-archive" makedepends="icu-devel libffi-devel nspr-devel python-devel readline-devel zlib-devel" short_desc="Mozilla JavaScript interpreter and library (60.x series)" -maintainer="Rasmus Thomsen " +maintainer="Rasmus Thomsen " license="MPL-2.0" homepage="https://www.mozilla.org/js/" distfiles="${MOZILLA_SITE}/firefox/releases/${version}esr/source/firefox-${version}esr.source.tar.xz" -checksum=1a1f69ee87092637f75aef7f3fa588b0eef0b2c8bcc160094a036450c49c4025 +checksum=b95585982225a5246b663298de2fed275179d9299c46790468c49b6eee08cea4 patch_args="-Np1" LDFLAGS+=" -Wl,-z,stack-size=1048576" @@ -46,6 +46,12 @@ do_check() { dist/bin/jsapi-tests } +post_install() { + # Fix the '-include' directive, otherwise it tries to use the hosts' header + vsed 's|^Cflags:.*|Cflags: -include ${pc_sysrootdir}/${includedir}/mozjs-60/js/RequiredDefines.h -I${includedir}/mozjs-60|' \ + -i ${DESTDIR}/usr/lib/pkgconfig/mozjs-60.pc +} + mozjs60-devel_package() { depends="nspr-devel ${sourcepkg}>=${version}_${revision}" short_desc+=" - development files"