diff options
author | Khem Raj <raj.khem@gmail.com> | 2019-02-25 22:48:55 -0800 |
---|---|---|
committer | Khem Raj <raj.khem@gmail.com> | 2019-02-26 10:16:24 -0800 |
commit | d06ded18033f15881a7a3ecfaf3799833a067d3b (patch) | |
tree | 23c35836c8350ba5e28bffd61b869a60a5857223 /meta-oe/recipes-extended/mozjs | |
parent | e42cc4a8e26aeb3f8aa9f87c25ff6742c04a7625 (diff) | |
download | meta-openembedded-d06ded18033f15881a7a3ecfaf3799833a067d3b.tar.gz |
mozjs: Fix cross-builds of nsinstall
nsinstall must be built for host, so we need to define HOST_* compiler
defines so, it gets built using native compiler correctly
Disable stripping, OE will do it
Disable optimizing, set BUILD_OPT
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Diffstat (limited to 'meta-oe/recipes-extended/mozjs')
-rw-r--r-- | meta-oe/recipes-extended/mozjs/mozjs_52.9.1.bb | 10 |
1 files changed, 8 insertions, 2 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 74dd15bfc..92d15724f 100644 --- a/meta-oe/recipes-extended/mozjs/mozjs_52.9.1.bb +++ b/meta-oe/recipes-extended/mozjs/mozjs_52.9.1.bb | |||
@@ -45,7 +45,7 @@ EXTRA_OECONF = " \ | |||
45 | --host=${BUILD_SYS} \ | 45 | --host=${BUILD_SYS} \ |
46 | --prefix=${prefix} \ | 46 | --prefix=${prefix} \ |
47 | --libdir=${libdir} \ | 47 | --libdir=${libdir} \ |
48 | --disable-tests \ | 48 | --disable-tests --disable-strip --disable-optimize \ |
49 | --with-nspr-libs='-lplds4 -lplc4 -lnspr4' \ | 49 | --with-nspr-libs='-lplds4 -lplc4 -lnspr4' \ |
50 | ${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', "--enable-gold", '--disable-gold', d)} \ | 50 | ${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', "--enable-gold", '--disable-gold', d)} \ |
51 | " | 51 | " |
@@ -53,9 +53,15 @@ EXTRA_OECONF = " \ | |||
53 | PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'x11', d)}" | 53 | PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'x11', d)}" |
54 | PACKAGECONFIG[x11] = "--x-includes=${STAGING_INCDIR} --x-libraries=${STAGING_LIBDIR},--x-includes=no --x-libraries=no,virtual/libx11" | 54 | PACKAGECONFIG[x11] = "--x-includes=${STAGING_INCDIR} --x-libraries=${STAGING_LIBDIR},--x-includes=no --x-libraries=no,virtual/libx11" |
55 | 55 | ||
56 | EXTRA_OEMAKE_task-compile += "OS_LDFLAGS='-Wl,-latomic ${LDFLAGS}'" | 56 | EXTRA_OEMAKE_task-compile += "BUILD_OPT=1 OS_LDFLAGS='-Wl,-latomic ${LDFLAGS}'" |
57 | EXTRA_OEMAKE_task-install += "STATIC_LIBRARY_NAME=js_static" | 57 | EXTRA_OEMAKE_task-install += "STATIC_LIBRARY_NAME=js_static" |
58 | 58 | ||
59 | export HOST_CC = "${BUILD_CC}" | ||
60 | export HOST_CXX = "${BUILD_CXX}" | ||
61 | export HOST_CFLAGS = "${BUILD_CFLAGS}" | ||
62 | export HOST_CPPFLAGS = "${BUILD_CPPFLAGS}" | ||
63 | export HOST_CXXFLAGS = "${BUILD_CXXFLAGS}" | ||
64 | |||
59 | do_configure() { | 65 | do_configure() { |
60 | export SHELL="/bin/sh" | 66 | export SHELL="/bin/sh" |
61 | export TMP="${B}" | 67 | export TMP="${B}" |