diff --git a/meta-citadel/recipes-desktop/mozjs/mozjs52.bb b/meta-citadel/recipes-desktop/mozjs/mozjs52.bb index f327f8f..748e91f 100644 --- a/meta-citadel/recipes-desktop/mozjs/mozjs52.bb +++ b/meta-citadel/recipes-desktop/mozjs/mozjs52.bb @@ -5,7 +5,9 @@ LIC_FILES_CHKSUM = "file://../../LICENSE;md5=815ca599c9df247a0c7f619bab123dad" RELEASE_VERSION = "mozjs-52.2.1gnome1" -SRC_URI = "https://download.gnome.org/teams/releng/tarballs-needing-help/mozjs/${RELEASE_VERSION}.tar.gz" +SRC_URI = "https://download.gnome.org/teams/releng/tarballs-needing-help/mozjs/${RELEASE_VERSION}.tar.gz \ + file://0001-do-not-include-RequiredDefines.patch \ + " SRC_URI[md5sum] = "72bd9a715ed1ab70b2aebe92969f6b63" SRC_URI[sha256sum] = "31697943b1dbbb51ba9aee35b8269a353c487d7af4d336010b90054dc4f9b0af" @@ -35,6 +37,7 @@ EXTRA_OECONF = " \ --with-intl-api \ --disable-jemalloc \ --disable-static \ + --without-x \ " diff --git a/meta-citadel/recipes-desktop/mozjs/mozjs52/0001-do-not-include-RequiredDefines.patch b/meta-citadel/recipes-desktop/mozjs/mozjs52/0001-do-not-include-RequiredDefines.patch new file mode 100644 index 0000000..5dad655 --- /dev/null +++ b/meta-citadel/recipes-desktop/mozjs/mozjs52/0001-do-not-include-RequiredDefines.patch @@ -0,0 +1,23 @@ +From 488c8ee5ff98a2d1fb40553ff1db8b452f88a735 Mon Sep 17 00:00:00 2001 +From: brl +Date: Tue, 23 Jan 2018 14:51:11 -0500 +Subject: [PATCH] do not include RequiredDefines + +pkg-config does not correctly prepend sysroot to this +--- + js/src/js.pc.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/js/src/js.pc.in b/js/src/js.pc.in +index 1efea33..f6614ff 100644 +--- a/js/src/js.pc.in ++++ b/js/src/js.pc.in +@@ -8,4 +8,4 @@ Description: The Mozilla library for JavaScript + Version: @MOZILLA_VERSION@ + Requires.private: @NSPR_PKGCONF_CHECK@ + Libs: -L${libdir} -l@JS_LIBRARY_NAME@ +-Cflags: -include ${includedir}/@JS_LIBRARY_NAME@/js/RequiredDefines.h -I${includedir}/@JS_LIBRARY_NAME@ ++Cflags: -I${includedir}/@JS_LIBRARY_NAME@ +-- +2.14.3 +