aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOtavio Salvador <otavio@ossystems.com.br>2019-01-15 01:40:16 -0800
committerArmin Kuster <akuster808@gmail.com>2019-02-03 08:33:48 -0800
commit2154631d355c425a8e98b4a9d336bf2558ecfd1b (patch)
tree0184e88fdeae02efb6ddf6e6b0f5f042fea993e4
parentcca27b5ea7569d2730ee5da7ee7f47b39d775d89 (diff)
downloadmeta-openembedded-stable/thud-next.tar.gz
meta-openembedded-stable/thud-next.tar.bz2
meta-openembedded-stable/thud-next.zip
mozjs: Avoid use of X11 from host when X11 is disabledstable/thud-nmutstable/thud-next
The mozjs build system makes use of host headers and libraries if not passed an invalid path for `--x-includes` and `--x-libraries`. This fixes host contamination while building in a development host. Signed-off-by: Otavio Salvador <otavio@ossystems.com.br> Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Armin Kuster <akuster808@gmail.com>
-rw-r--r--meta-oe/recipes-extended/mozjs/mozjs_52.9.1.bb2
1 files changed, 1 insertions, 1 deletions
diff --git a/meta-oe/recipes-extended/mozjs/mozjs_52.9.1.bb b/meta-oe/recipes-extended/mozjs/mozjs_52.9.1.bb
index 0dfe2f848..440a25b74 100644
--- a/meta-oe/recipes-extended/mozjs/mozjs_52.9.1.bb
+++ b/meta-oe/recipes-extended/mozjs/mozjs_52.9.1.bb
@@ -49,7 +49,7 @@ EXTRA_OECONF = " \
"
PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'x11', d)}"
-PACKAGECONFIG[x11] = "--x-includes=${STAGING_INCDIR} --x-libraries=${STAGING_LIBDIR},,virtual/libx11"
+PACKAGECONFIG[x11] = "--x-includes=${STAGING_INCDIR} --x-libraries=${STAGING_LIBDIR},--x-includes=no --x-libraries=no,virtual/libx11"
EXTRA_OEMAKE_task-compile += "OS_LDFLAGS='-Wl,-latomic ${LDFLAGS}'"
EXTRA_OEMAKE_task-install += "STATIC_LIBRARY_NAME=js_static"