meta-openembedded: subtree update:3a9262866d..55de2d06ad
Adrian Bunk (1):
python-more-itertools: Add PE
Andreas Müller (1):
Add gnome help packages to image according to IMAGE_LINGUAS
Andreas Oberritter (2):
live555: Move test progams out of main package
pugixml: Update to version 1.10
André Draszik (7):
gyp: update to fcd686f1880f
gyp: provide a python2 version of gyp as gyp-py2
nodejs: ensure to use correct compiler & flags always
nodejs: delete all bundled deps in do_unpack() if needed
nodejs: allow use of system gyp
nodejs: use OE-provided compiler flags (arm)
nodejs: support long directory names for ${B} / ${S}
Denys Dmytriyenko (1):
mbedtls: upgrade 2.16.2 -> 2.16.3
Fabio Berton (5):
python-importlib-metadata: Add native and nativesdk to BBCLASSEXTEND
python-more-itertools: Add native and nativesdk to BBCLASSEXTEND
python-pathlib2: Add native and nativesdk to BBCLASSEXTEND
python-zipp: Add native and nativesdk to BBCLASSEXTEND
python3-importlib-metadata: RDEPEND python3-misc only for target and nativesdk
Khem Raj (13):
sip: Upgrade to 4.19.19
cherokee: Update to latest
cherokee: Fix build when time_t is 64bit
tvheadend: Update to tip of master
lowpan-tools: Blacklist as its deprecated use wpan-tools instead
pidgin-sipe: Fix build when time_t is 64bit
open-vm-tools: Enable tirpc explicitly, fix build with 64bit time_t
python-systemd: Include endian.h for htobe16
tvheadend: Fix build with 64bit time_t
tvheadend: Set CLEANBROKEN
layer.conf: Add ttf-roboto->fontconfig to SIGGEN_EXCLUDE_SAFE_RECIPE_DEPS
layer.conf: Add phpmyadmin->php dep to SIGGEN_EXCLUDE_SAFE_RECIPE_DEPS
python-six: Update to 1.13.0
Michael Scott (1):
modemmanager: Upgrade 1.10.6 -> 1.10.8
Nicola Lunghi (5):
python3-gmqtt: add recipe
python-backports-abc: update to 0.5.0
python-rfc3339-validator: add recipe
python-rfc3986-validator: add recipe
python-dbus-next: fix recipe position
Peace Lee (1):
guider: upgrade 3.9.4 -> 3.9.6
Trevor Gamblin (4):
python3-werkzeug: upgrade from 0.14.1 to 0.16.0
python3-flask: upgrade from 1.0.2 to 1.1.1
python3-itsdangerous: upgrade from 0.24 to 1.1.0
zabbix: upgrade 4.2.8 -> 4.4.1
Yi Zhao (1):
python-ipy: add recipes
Zang Ruochen (15):
fuse3: upgrade 3.7.0 -> 3.8.0
python-alembic: upgrade 1.2.1 -> 1.3.0
python-astroid: upgrade 2.3.2 -> 2.3.3
python-bitarray: upgrade 1.0.1 -> 1.1.0
python-cffi: upgrade 1.13.1 -> 1.13.2
python-dateutil: upgrade 2.8.0 -> 2.8.1
python-psutil: upgrade 5.6.3 -> 5.6.5
python-pycryptodome: upgrade 3.9.0 -> 3.9.3
python-pyparsing: upgrade 2.4.2 -> 2.4.5
python-pytest-helpers-namespace: upgrade 2016.7.10 -> 2019.1.8
python-pytest-runner: upgrade 5.1 -> 5.2
python-pytest-tempdir: upgrade 2016.8.20 -> 2019.10.12
python-requests-oauthlib: upgrade 0.8.0 -> 1.3.0
python-tornado: upgrade 5.1 -> 6.0.3
python-tqdm: upgrade 4.31.1 -> 4.38.0
Zheng Ruoqin (1):
f2fs-tools: Update Homepage
Change-Id: Ifc2d7bac36a719f2a4ead82b491d9817f212c56f
Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
diff --git a/meta-openembedded/meta-oe/recipes-devtools/nodejs/nodejs_10.17.0.bb b/meta-openembedded/meta-oe/recipes-devtools/nodejs/nodejs_10.17.0.bb
index 4013c69..8c690ae 100644
--- a/meta-openembedded/meta-oe/recipes-devtools/nodejs/nodejs_10.17.0.bb
+++ b/meta-openembedded/meta-oe/recipes-devtools/nodejs/nodejs_10.17.0.bb
@@ -6,7 +6,7 @@
DEPENDS = "openssl"
DEPENDS_append_class-target = " nodejs-native"
-inherit pkgconfig
+inherit pkgconfig pythonnative
COMPATIBLE_MACHINE_armv4 = "(!.*armv4).*"
COMPATIBLE_MACHINE_armv5 = "(!.*armv5).*"
@@ -19,7 +19,7 @@
file://0001-Disable-running-gyp-files-for-bundled-deps.patch \
file://0004-Make-compatibility-with-gcc-4.8.patch \
file://0005-Link-atomic-library.patch \
- file://0006-Use-target-ldflags.patch \
+ file://0007-v8-don-t-override-ARM-CFLAGS.patch \
"
SRC_URI_append_class-target = " \
file://0002-Using-native-torque.patch \
@@ -53,14 +53,46 @@
PACKAGECONFIG ??= "ares icu libuv zlib"
PACKAGECONFIG[ares] = "--shared-cares,,c-ares"
+PACKAGECONFIG[gyp] = ",,gyp-py2-native"
PACKAGECONFIG[icu] = "--with-intl=system-icu,--without-intl,icu"
PACKAGECONFIG[libuv] = "--shared-libuv,,libuv"
PACKAGECONFIG[nghttp2] = "--shared-nghttp2,,nghttp2"
PACKAGECONFIG[zlib] = "--shared-zlib,,zlib"
+# We don't want to cross-compile during target compile,
+# and we need to use the right flags during host compile,
+# too.
+EXTRA_OEMAKE = "\
+ CC.host='${CC}' \
+ CFLAGS.host='${CPPFLAGS} ${CFLAGS}' \
+ CXX.host='${CXX}' \
+ CXXFLAGS.host='${CPPFLAGS} ${CXXFLAGS}' \
+ LDFLAGS.host='${LDFLAGS}' \
+ AR.host='${AR}' \
+ \
+ builddir_name=./ \
+"
+
+python do_unpack() {
+ import shutil
+
+ bb.build.exec_func('base_do_unpack', d)
+
+ shutil.rmtree(d.getVar('S') + '/deps/openssl', True)
+ if 'ares' in d.getVar('PACKAGECONFIG'):
+ shutil.rmtree(d.getVar('S') + '/deps/cares', True)
+ if 'gyp' in d.getVar('PACKAGECONFIG'):
+ shutil.rmtree(d.getVar('S') + '/tools/gyp', True)
+ if 'libuv' in d.getVar('PACKAGECONFIG'):
+ shutil.rmtree(d.getVar('S') + '/deps/uv', True)
+ if 'nghttp2' in d.getVar('PACKAGECONFIG'):
+ shutil.rmtree(d.getVar('S') + '/deps/nghttp2', True)
+ if 'zlib' in d.getVar('PACKAGECONFIG'):
+ shutil.rmtree(d.getVar('S') + '/deps/zlib', True)
+}
+
# Node is way too cool to use proper autotools, so we install two wrappers to forcefully inject proper arch cflags to workaround gypi
do_configure () {
- rm -rf ${S}/deps/openssl
export LD="${CXX}"
GYP_DEFINES="${GYP_DEFINES}" export GYP_DEFINES
# $TARGET_ARCH settings don't match --dest-cpu settings