From 2154631d355c425a8e98b4a9d336bf2558ecfd1b Mon Sep 17 00:00:00 2001 From: Otavio Salvador Date: Tue, 15 Jan 2019 01:40:16 -0800 Subject: mozjs: Avoid use of X11 from host when X11 is disabled 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 Signed-off-by: Khem Raj Signed-off-by: Armin Kuster --- meta-oe/recipes-extended/mozjs/mozjs_52.9.1.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 0dfe2f8484..440a25b74e 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" -- cgit 1.2.3-korg