wallenstein/void-packages
1
0
Fork 0
mirror of https://github.com/void-linux/void-packages.git synced 2025-07-31 18:02:57 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

mozjs60: honors sysroot when used in cross-compile

Browse source 
Preparing for cross-compiling gnome stuffs.
This commit is contained in:
Đoàn Trần Công Danh 2020-02-12 12:16:04 +07:00 • committed by Juan RP
parent 90fb4b504b
commit e693140f5a
3 changed files with 18 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
srcpkgs/mozjs60/patches/0002-save-and-restore-non-volatile-x28-on-arm64.patch
View file

@ -13,7 +13,7 @@ Applied-upstream: 61, commit: https://hg.mozilla.org/mozilla-central/rev/800abe6
diff --git a/js/src/vm/UnboxedObject.cpp b/js/src/vm/UnboxedObject.cpp diff --git a/js/src/vm/UnboxedObject.cpp b/js/src/vm/UnboxedObject.cpp
index 35ca20d7405f..1c20a1093d13 100644 index 35ca20d7405f..1c20a1093d13 100644
--- ajs/src/vm/UnboxedObject.cpp --- a/js/src/vm/UnboxedObject.cpp
+++ b/js/src/vm/UnboxedObject.cpp +++ b/js/src/vm/UnboxedObject.cpp
@@ -86,9 +86,16 @@ static const uintptr_t CLEAR_CONSTRUCTOR_CODE_TOKEN = 0x1; @@ -86,9 +86,16 @@ static const uintptr_t CLEAR_CONSTRUCTOR_CODE_TOKEN = 0x1;
#endif #endif

13
srcpkgs/mozjs60/patches/0012-mozjs60.pc-honor-sysroot.patch Normal file
View file

@ -0,0 +1,13 @@
js/src/build/js.pc.in | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/js/src/build/js.pc.in b/js/src/build/js.pc.in
index 2eae393..0a6fd5c 100644
--- a/js/src/build/js.pc.in
+++ b/js/src/build/js.pc.in
@@ -8,4 +8,4 @@ Description: The Mozilla library for JavaScript
Version: @MOZILLA_VERSION@
@PKGCONF_REQUIRES_PRIVATE@
Libs: -L${libdir} -l@JS_LIBRARY_NAME@
-Cflags: -include ${includedir}/@JS_LIBRARY_NAME@/js/RequiredDefines.h -I${includedir}/@JS_LIBRARY_NAME@
+Cflags: -include ${pc_sysrootdir}${includedir}/@JS_LIBRARY_NAME@/js/RequiredDefines.h -I${includedir}/@JS_LIBRARY_NAME@

6
srcpkgs/mozjs60/template
View file

@ -1,12 +1,14 @@
# Template file for 'mozjs60' # Template file for 'mozjs60'
pkgname=mozjs60 pkgname=mozjs60
version=60.8.0 version=60.8.0
revision=2 revision=3
wrksrc="firefox-${version}" wrksrc="firefox-${version}"
build_wrksrc=js/src build_wrksrc=js/src
build_style=gnu-configure build_style=gnu-configure
hostmakedepends="perl python pkg-config automake autoconf213 autoconf-archive" hostmakedepends="perl python pkg-config automake autoconf213 autoconf-archive
which"
makedepends="icu-devel libffi-devel nspr-devel python-devel readline-devel zlib-devel" makedepends="icu-devel libffi-devel nspr-devel python-devel readline-devel zlib-devel"
depends="nspr>=4.19"
short_desc="Mozilla JavaScript interpreter and library (60.x series)" short_desc="Mozilla JavaScript interpreter and library (60.x series)"
maintainer="Enno Boland <gottox@voidlinux.org>" maintainer="Enno Boland <gottox@voidlinux.org>"
license="MPL-2.0" license="MPL-2.0"