From 4b7c115404e4e18ca796c16a64c04ba299bf5cd0 Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Mon, 30 Nov 2020 19:55:29 -0600 Subject: meta-openembedded: subtree update:164a6030b0..f623d8b574 Adrian Freihofer (1): paho-mqtt-c: upgrade 1.3.6 -> 1.3.7 Alexander Kamensky (2): makedumpfile: add PACKAGECONFIG options for lzo and snappy compression makedumpfile: upgrade 1.6.7 -> 1.6.8 Alexander Kanavin (4): collect: do not build with -Werror libsigrokdecode: add python 3.9 support python3-mprpc: remove the recipe gnome-calendar: update to 3.38.1, add libhandy 1.x support Anatol Belski (1): chrony: Patch CVE-2020-14367 Bartosz Golaszewski (1): libgpiod: update v1.4.4 -> v1.4.5 Beni (1): unbound: upgrade to 1.12.0 Gregory Anders (5): Add suitesparse Add python3-transitions Add python3-dill Add python3-cerberus Add python3-cvxopt Hongxu Jia (1): lvm2.inc: switch branch master to main Jasper Orschulko (1): upgrade and de-blacklist nanopb recipe Jose Quaresma (3): spirv-tools: moved into OE-core, delete from meta-oe srt: add receipe opencv: Update 4.4.0 -> 4.5.0 Kai Kang (4): xfce4-cpufreq-plugin: 1.2.1 -> 1.2.2 xfce4-weather-plugin: 0.10.1 -> 0.10.2 xfce4-mailwatch-plugin: 1.2.0 -> 1.3.0 tumbler: 0.2.9 -> 0.3.1 Khem Raj (71): nodejs: Fix arm32/thumb builds with clang nodejs: Update to 12.19.0 redis: Fix build on 32bit targets and clang gperftools: Fix build with new musl updates minifi-cpp: Fix build with riscv64/clang graphviz: Upgrade to 2.44.1 release musl-nscd: Update to latest remmina: Update to 1.4.8 mdbus2: Fix build with vala 0.50 ibus: Update to 1.5.3 plus fix for vala 0.50 networkd-dispatcher: Upgrade to 2.1 geoclue: Use git fetcher kernel-selftest: Disable vm packageconfig for riscv layer.conf: Add hardknott to LAYERSERIES_COMPAT fmt: Upgrade to 7.1.2 lksctp-tools: Update to latest master fuse3: Upgrade to 3.10.0 rdma-core: Upgrade to 31.1 opengl-es-cts: Disable LTO fluentbit: Disable LTO traceroute: Fix build with LTO cmocka: Fix buils with LTO dovecot: Disable LTO redis-plus-plus: Upgrade to 1.2.1 suitesparse: Exclude from world python3-icu: Update to 2.6 meta-python: Drop RDEPEND'ing on python3-typing python3-cvxopt: Exclude from world builds packagegroup-meta-multimedia: Add srt gedit: Inherit python3targetconfig gmime: Fix append to do_configure dconf: Add leading whitespace for append operator kexec-tools-klibc: Add leading whitespace for append operator spice: Add leading whitespace for append operator meta-oe: Add leading whitespace for append operator libgusb: Update to 0.3.5 botan: Mark incompatible with riscv32 projucer: Link with libatomic on rv32 mariadb: Fix build on 32bit arches with 64bit time_t liburing: Fix build on 32-bit arches with 64-bit time_t librtorrent: Disable instrumentation on rv32 ntopng: Link with libatomic on rv32 poco: Add riscv32 support capnproto: Fix build on 32bit arches with 64bit time_t defaults directfb: Fix build on riscv32 opensaf: Fix build on 32bit arches with 64bit time_t e.g. RISCV-32 rocksdb: Update to 6.12.7 qpdf: Link with libatomic on rv32 libkcapi: Fix build on riscv32 jack: Upgrade to 1.19.16 vlc: Fix build on riscv32 fluentbit: Link with libatomic on riscv32 openipmi: Inherit python3targetconfig libplist: Inherit python3targetconfig postgresql: Inherit python3targetconfig python-grpcio-tools: Add missing space for append python3-pykwalify: Do not unset _PYTHON_SYSCONFIGDATA_NAME thingsboard-gateway: Move under dynamic layers musl-nscd: Replace -fcommon with code patch musl-nscd: Add missing deps on flex and bison during build python3-pytest: Upgrade to 6.1.2 python3-hypothesis: Add recipe python3-sortedcontainers: Add recipe heaptrack: Fix build on musl heaptrack: Mark RISCV host incompatible packagegroup-meta-oe: Exclude heaptrack for rv32/rv64 chrony: Upgrade to 4.0 canutils,can-utils: Add cansequence to u-a as well packagegroup-meta-python: Add newly added recipes to packagegroup-meta-python3 pipewire: Link with libatomic for riscv32 python3-matplotlib: Disable LTO for clang/riscv Kory Maincent (1): libftdi: add swig-native to dependencies Leon Anavi (37): python3-luma-oled: Upgrade 3.6.0 -> 3.7.0 python3-cryptography-vectors: Upgrade 3.1.1 -> 3.2 python3-pyexpect: Upgrade 1.0.20 -> 1.0.21 python3-markdown: Upgrade 3.3.2 -> 3.3.3 python3-sh: Upgrade 1.14.0 -> 1.14.1 python3-kiwisolver: Upgrade 1.2.0 -> 1.3.0 python3-aiohttp: Upgrade 3.7.1 -> 3.7.2 python3-aiofiles: Upgrade 0.5.0 -> 0.6.0 python3-regex: Upgrade 2020.10.23 -> 2020.10.28 python3-dateparser: Upgrade 0.7.6 -> 1.0.0 python3-langtable: Upgrade 0.0.53 -> 0.0.54 python3-kiwisolver: Upgrade 1.3.0 -> 1.3.1 python3-tornado: Upgrade 6.0.4 -> 6.1 python3-ipython: Upgrade 7.18.1 -> 7.19.0 python3-cmd2: Upgrade 1.3.11 -> 1.4.0 python3-dill: Upgrade 0.3.2 -> 0.3.3 python3-colorlog: Upgrade 4.4.0 -> 4.6.2 python3-pandas: Upgrade 1.1.3 -> 1.1.4 python3-attrs: 20.2.0 -> 20.3.0 python3-gmqtt: Upgrade 0.6.7 -> 0.6.8 python3-diskcache: Upgrade 5.0.3 -> 5.1.0 python3-croniter: Upgrade 0.3.35 -> 0.3.36 python3-bitarray: Upgrade 1.6.0 -> 1.6.1 python3-certifi: Upgrade 2020.6.20 -> 2020.11.8 python3-cantools: Upgrade 35.3.0 -> 35.5.0 python3-arpeggio: Upgrade 1.9.2 -> 1.10.1 python3-toml: Upgrade 0.10.1 -> 0.10.2 python3-pyrad: Upgrade 2.3 -> 2.4 python3-bitstruct: Upgrade 8.11.0 -> 8.11.1 python3-yarl: Upgrade 1.6.2 -> 1.6.3 python3-luma-core: Upgrade 1.17.3 -> 2.0.1 python3-luma-oled: Upgrade 3.7.0 -> 3.8.1 python3-fastnumbers: Upgrade 3.0.0 -> 3.1.0 python3-ansi2html: Upgrade 1.5.2 -> 1.6.0 python3-prettytable: Upgrade 1.0.1 -> 2.0.0 python3-urllib3: Upgrade 1.25.11 -> 1.26.2 python3-transitions: Upgrade 0.8.4 -> 0.8.5 Li Zhou (1): ptpd: Solve memory leak for function NTPDCrequest Maciej Pijanowski (2): cdrkit: add native to BBCLASSEXTEND cdrkit: split into more packages Mark Jonas (5): mbedtls: Fix typo in PACKAGECONFIG python3-pyinotify: Add missing ctypes dependency libsocketcan: Add PACKAGECONFIG options libsocketcan: Update to 0.0.12 imagemagick: Add NOTICE to collected license texts Max Kellermann (1): php: remove the failing ${D}/${TMPDIR} code Mingli Yu (6): ndpi: add new recipe libmaxminddb: add new recipe ntopng: add new recipe ntop: remove the recipe packagegroup-meta-networking.bb: add ntopng related recipes traceroute: set VPATH Nick Rosbrook (3): strongswan: add some PACKAGECONFIG options for EAP strongswan: do not use deprecated stroke and starter by default strongswan: remove ldap from default PACKAGECONFIG Pierre-Jean Texier (1): inotify-tools: upgrade 3.20.2.2 -> 3.20.11.0 Randy Witt (1): numactl: Remove the recipe Ricardo Salveti (3): wireguard-module: upgrade 1.0.20200712 -> 1.0.20200908 wireguard-tools: upgrade 1.0.20200513 -> 1.0.20200827 wireguard-module: upgrade 1.0.20200908 -> 1.0.20201112 Sakib Sajal (1): libssh2: fix ptest Sinan Kaya (3): collectd: fix the test condition for dash compatibility heaptrack: add bitbake recipe cpp-netlib: add bitbake recipe Tim Orling (16): python3-atomicwrites: drop (moved to oe-core) python3-attrs: drop (moved to oe-core) python3-iniconfig: drop (moved to oe-core) python3-more-itertools: drop (moved to oe-core) python3-pathlib2: drop (moved to oe-core) python3-toml: drop (moved to oe-core) python3-py: drop (moved to oe-core) python3-setuptools-scm: drop (moved to oe-core) python3-packaging: drop (moved to oe-core) python3-wcwidth: drop (moved to oe-core) python3-zipp: drop (moved to oe-core) python3-importlib-metadata: drop (moved to oe-core) python3-pluggy: drop (moved to oe-core) python3-pytest: drop (moved to oe-core) python3-hypothesis: drop (moved to oe-core) python3-sortedcontainers: drop (moved to oe-core) Trevor Gamblin (2): python3-jinja2: Fix ptest RDEPENDS and file installation python3-markupsafe: Fix ptest RDEPENDS and installation William A. Kennington III (1): span-lite: Bump e03d116..0.8.1 Yi Zhao (5): minifi-cpp: specify GCC_AR and GCC_RANLIB quagga: unify volatiles file name minifi-cpp: depend on nettle and lz4 nss: upgrade 3.57 -> 3.59 krb5: upgrade 1.17.1 -> 1.17.2 Zang Ruochen (19): libnftnl: upgrade 1.1.7 -> 1.1.8 xfsprogs: upgrade 5.8.0 -> 5.9.0 radvd: upgrade 2.18 -> 2.19 fmt: upgrade 7.0.3 -> 7.1.0 hidapi: upgrade 0.9.0 -> 0.10.0 libkcapi: upgrade 1.2.0 -> 1.2.1 modemmanager: upgrade 1.14.2 -> 1.14.6 nvme-cli: upgrade 1.12 -> 1.13 ostree: upgrade 2020.6 -> 2020.7 poppler-data: upgrade 0.4.9 -> 0.4.10 nftables: upgrade 0.9.6 -> 0.9.7 toybox: upgrade 0.8.3 -> 0.8.4 fbgrab: upgrade 1.3.3 -> 1.4 mraa: upgrade 2.1.0 -> 2.2.0 opensaf: upgrade 5.20.05 -> 5.20.08 openvpn: upgrade 2.4.9 -> 2.5.0 poppler: upgrade 20.10.0 -> 20.11.0 tmux: upgrade 3.1b -> 3.1c xmlsec1: upgrade 1.2.30 -> 1.2.31 changqing.li@windriver.com (1): thin-provisioning-tools: switch branch from master to main hasan.men (2): thingsboard-gateway: Add recipe for v2.5.2 python3-jsonpath-rw: Add recipe for v1.4.0 richard (1): poco: Upgrade 1.9.4 -> 1.10.1 viatsk (1): tcpdump: Patch for CVE-2020-8037 zangrc (27): sshfs-fuse: upgrade 3.7.0 -> 3.7.1 can-utils: upgrade 2020.02.04 -> 2020.11.0 hwdata: upgrade 0.340 -> 0.341 libio-pty-perl: upgrade 1.14 -> 1.15 live555: upgrade 20200819 -> 20201105 zile: upgrade 2.4.14 -> 2.4.15 rdma-core: upgrade 31.1 -> 32.0 strongswan: upgrade 5.8.4 -> 5.9.1 fio: upgrade 3.22 -> 3.24 libharu: Fix the packaging bug modemmanager: upgrade 1.14.6 -> 1.14.8 openldap: upgrade 2.4.51 -> 2.4.56 protobuf: upgrade 3.13.0.1 -> 3.14.0 nghttp2: upgrade 2.41.0 -> 2.42.0 nngpp: upgrade 1.2.4 -> 1.3.0 snort: upgrade 2.9.16.1 -> 2.9.17 weechat: upgrade 2.9 -> 3.0 cjson: upgrade 1.7.13 -> 1.7.14 cloc: upgrade 1.84 -> 1.88 jpnevulator: upgrade 2.3.5 -> 2.3.6 libjcat: upgrade 0.1.3 -> 0.1.4 libsigc++-3: upgrade 3.0.3 -> 3.0.6 ocl-icd: upgrade 2.2.12 -> 2.2.13 opencl-clhpp: upgrade 2.0.11 -> 2.0.12 ostree: upgrade 2020.7 -> 2020.8 pkcs11-helper: upgrade 1.26 -> 1.27 netplan: upgrade 0.99 -> 0.100 zhengruoqin (1): dnf-plugin-tui: Update to the latest version Signed-off-by: Andrew Geissler Change-Id: I286bb6d58bf30588516b35ec06ddfd0bedee2e64 --- ...of-register-r7-because-llvm-now-issues-an.patch | 53 +++++++ .../recipes-devtools/nodejs/nodejs_12.18.3.bb | 160 -------------------- .../recipes-devtools/nodejs/nodejs_12.19.0.bb | 161 +++++++++++++++++++++ 3 files changed, 214 insertions(+), 160 deletions(-) create mode 100644 meta-openembedded/meta-oe/recipes-devtools/nodejs/nodejs/0001-Remove-use-of-register-r7-because-llvm-now-issues-an.patch delete mode 100644 meta-openembedded/meta-oe/recipes-devtools/nodejs/nodejs_12.18.3.bb create mode 100644 meta-openembedded/meta-oe/recipes-devtools/nodejs/nodejs_12.19.0.bb (limited to 'meta-openembedded/meta-oe/recipes-devtools/nodejs') diff --git a/meta-openembedded/meta-oe/recipes-devtools/nodejs/nodejs/0001-Remove-use-of-register-r7-because-llvm-now-issues-an.patch b/meta-openembedded/meta-oe/recipes-devtools/nodejs/nodejs/0001-Remove-use-of-register-r7-because-llvm-now-issues-an.patch new file mode 100644 index 000000000..a23f1c243 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-devtools/nodejs/nodejs/0001-Remove-use-of-register-r7-because-llvm-now-issues-an.patch @@ -0,0 +1,53 @@ +From be8d3cd6eab4b8f9849133060abb1aba4400276b Mon Sep 17 00:00:00 2001 +From: Amy Huang +Date: Thu, 23 Apr 2020 11:25:53 -0700 +Subject: [PATCH] Remove use of register r7 because llvm now issues an error + when "r7" is used (starting in commit d85b3877) + +Bug: chromium:1073270 +Change-Id: I7ec8112f170b98d2edaf92bc9341e738f8de07a3 +Reviewed-on: https://chromium-review.googlesource.com/c/v8/v8/+/2163435 +Reviewed-by: Nico Weber +Reviewed-by: Ross McIlroy +Commit-Queue: Nico Weber +Cr-Commit-Position: refs/heads/master@{#67371} +Signed-off-by: Khem Raj +--- +Upstream-Status: Backport [https://chromium.googlesource.com/v8/v8/+/00604cd2806b5d26bef592dd19989a234bd07a4b%5E%21/] + deps/v8/src/codegen/arm/cpu-arm.cc | 13 ------------- + 1 file changed, 13 deletions(-) + +diff --git a/deps/v8/src/codegen/arm/cpu-arm.cc b/deps/v8/src/codegen/arm/cpu-arm.cc +index 868f360..654d68f 100644 +--- a/deps/v8/src/codegen/arm/cpu-arm.cc ++++ b/deps/v8/src/codegen/arm/cpu-arm.cc +@@ -30,18 +30,6 @@ V8_NOINLINE void CpuFeatures::FlushICache(void* start, size_t size) { + register uint32_t end asm("r1") = beg + size; + register uint32_t flg asm("r2") = 0; + +-#ifdef __clang__ +- // This variant of the asm avoids a constant pool entry, which can be +- // problematic when LTO'ing. It is also slightly shorter. +- register uint32_t scno asm("r7") = __ARM_NR_cacheflush; +- +- asm volatile("svc 0\n" +- : +- : "r"(beg), "r"(end), "r"(flg), "r"(scno) +- : "memory"); +-#else +- // Use a different variant of the asm with GCC because some versions doesn't +- // support r7 as an asm input. + asm volatile( + // This assembly works for both ARM and Thumb targets. + +@@ -59,7 +47,6 @@ V8_NOINLINE void CpuFeatures::FlushICache(void* start, size_t size) { + : "r"(beg), "r"(end), "r"(flg), [scno] "i"(__ARM_NR_cacheflush) + : "memory"); + #endif +-#endif + #endif // !USE_SIMULATOR + } + +-- +2.29.2 + diff --git a/meta-openembedded/meta-oe/recipes-devtools/nodejs/nodejs_12.18.3.bb b/meta-openembedded/meta-oe/recipes-devtools/nodejs/nodejs_12.18.3.bb deleted file mode 100644 index 8a9f32bce..000000000 --- a/meta-openembedded/meta-oe/recipes-devtools/nodejs/nodejs_12.18.3.bb +++ /dev/null @@ -1,160 +0,0 @@ -DESCRIPTION = "nodeJS Evented I/O for V8 JavaScript" -HOMEPAGE = "http://nodejs.org" -LICENSE = "MIT & BSD & Artistic-2.0" -LIC_FILES_CHKSUM = "file://LICENSE;md5=30e27bd6830002d9415e4a5da7901f03" - -DEPENDS = "openssl" -DEPENDS_append_class-target = " nodejs-native" - -inherit pkgconfig python3native - -COMPATIBLE_MACHINE_armv4 = "(!.*armv4).*" -COMPATIBLE_MACHINE_armv5 = "(!.*armv5).*" -COMPATIBLE_MACHINE_mips64 = "(!.*mips64).*" - -COMPATIBLE_HOST_riscv64 = "null" -COMPATIBLE_HOST_riscv32 = "null" - -SRC_URI = "http://nodejs.org/dist/v${PV}/node-v${PV}.tar.xz \ - file://0001-Disable-running-gyp-files-for-bundled-deps.patch \ - file://0003-Install-both-binaries-and-use-libdir.patch \ - file://0004-v8-don-t-override-ARM-CFLAGS.patch \ - file://big-endian.patch \ - file://mips-warnings.patch \ - " -SRC_URI_append_class-target = " \ - file://0002-Using-native-binaries.patch \ - " -SRC_URI[sha256sum] = "71158026579487422fd13cc2553b34cddb76519098aa6030faab52f88c6e0d0e" - -S = "${WORKDIR}/node-v${PV}" - -# v8 errors out if you have set CCACHE -CCACHE = "" - -def map_nodejs_arch(a, d): - import re - - if re.match('i.86$', a): return 'ia32' - elif re.match('x86_64$', a): return 'x64' - elif re.match('aarch64$', a): return 'arm64' - elif re.match('(powerpc64|ppc64le)$', a): return 'ppc64' - elif re.match('powerpc$', a): return 'ppc' - return a - -ARCHFLAGS_arm = "${@bb.utils.contains('TUNE_FEATURES', 'callconvention-hard', '--with-arm-float-abi=hard', '--with-arm-float-abi=softfp', d)} \ - ${@bb.utils.contains('TUNE_FEATURES', 'neon', '--with-arm-fpu=neon', \ - bb.utils.contains('TUNE_FEATURES', 'vfpv3d16', '--with-arm-fpu=vfpv3-d16', \ - bb.utils.contains('TUNE_FEATURES', 'vfpv3', '--with-arm-fpu=vfpv3', \ - '--with-arm-fpu=vfp', d), d), d)}" -GYP_DEFINES_append_mipsel = " mips_arch_variant='r1' " -ARCHFLAGS ?= "" - -PACKAGECONFIG ??= "ares brotli icu zlib" - -PACKAGECONFIG[ares] = "--shared-cares,,c-ares" -PACKAGECONFIG[brotli] = "--shared-brotli,,brotli" -PACKAGECONFIG[icu] = "--with-intl=system-icu,--without-intl,icu" -PACKAGECONFIG[libuv] = "--shared-libuv,,libuv" -PACKAGECONFIG[nghttp2] = "--shared-nghttp2,,nghttp2" -PACKAGECONFIG[shared] = "--shared" -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 'brotli' in d.getVar('PACKAGECONFIG'): - shutil.rmtree(d.getVar('S') + '/deps/brotli', 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 () { - export LD="${CXX}" - GYP_DEFINES="${GYP_DEFINES}" export GYP_DEFINES - # $TARGET_ARCH settings don't match --dest-cpu settings - python3 configure.py --prefix=${prefix} --cross-compiling --without-snapshot --shared-openssl \ - --without-dtrace \ - --without-etw \ - --dest-cpu="${@map_nodejs_arch(d.getVar('TARGET_ARCH'), d)}" \ - --dest-os=linux \ - --libdir=${D}${libdir} \ - ${ARCHFLAGS} \ - ${PACKAGECONFIG_CONFARGS} -} - -do_compile () { - export LD="${CXX}" - oe_runmake BUILDTYPE=Release -} - -do_install () { - oe_runmake install DESTDIR=${D} - - # wasn't updated since 2009 and is the only thing requiring python2 in runtime - # ERROR: nodejs-12.14.1-r0 do_package_qa: QA Issue: /usr/lib/node_modules/npm/node_modules/node-gyp/gyp/samples/samples contained in package nodejs-npm requires /usr/bin/python, but no providers found in RDEPENDS_nodejs-npm? [file-rdeps] - rm -f ${D}${exec_prefix}/lib/node_modules/npm/node_modules/node-gyp/gyp/samples/samples -} - -do_install_append_class-native() { - # use node from PATH instead of absolute path to sysroot - # node-v0.10.25/tools/install.py is using: - # shebang = os.path.join(node_prefix, 'bin/node') - # update_shebang(link_path, shebang) - # and node_prefix can be very long path to bindir in native sysroot and - # when it exceeds 128 character shebang limit it's stripped to incorrect path - # and npm fails to execute like in this case with 133 characters show in log.do_install: - # updating shebang of /home/jenkins/workspace/build-webos-nightly/device/qemux86/label/open-webos-builder/BUILD-qemux86/work/x86_64-linux/nodejs-native/0.10.15-r0/image/home/jenkins/workspace/build-webos-nightly/device/qemux86/label/open-webos-builder/BUILD-qemux86/sysroots/x86_64-linux/usr/bin/npm to /home/jenkins/workspace/build-webos-nightly/device/qemux86/label/open-webos-builder/BUILD-qemux86/sysroots/x86_64-linux/usr/bin/node - # /usr/bin/npm is symlink to /usr/lib/node_modules/npm/bin/npm-cli.js - # use sed on npm-cli.js because otherwise symlink is replaced with normal file and - # npm-cli.js continues to use old shebang - sed "1s^.*^#\!/usr/bin/env node^g" -i ${D}${exec_prefix}/lib/node_modules/npm/bin/npm-cli.js - - # Install the native binaries to provide it within sysroot for the target compilation - install -d ${D}${bindir} - install -m 0755 ${S}/out/Release/torque ${D}${bindir}/torque - install -m 0755 ${S}/out/Release/bytecode_builtins_list_generator ${D}${bindir}/bytecode_builtins_list_generator - if ${@bb.utils.contains('PACKAGECONFIG','icu','true','false',d)}; then - install -m 0755 ${S}/out/Release/gen-regexp-special-case ${D}${bindir}/gen-regexp-special-case - fi - install -m 0755 ${S}/out/Release/mkcodecache ${D}${bindir}/mkcodecache - install -m 0755 ${S}/out/Release/node_mksnapshot ${D}${bindir}/node_mksnapshot -} - -do_install_append_class-target() { - sed "1s^.*^#\!${bindir}/env node^g" -i ${D}${exec_prefix}/lib/node_modules/npm/bin/npm-cli.js -} - -PACKAGES =+ "${PN}-npm" -FILES_${PN}-npm = "${exec_prefix}/lib/node_modules ${bindir}/npm ${bindir}/npx" -RDEPENDS_${PN}-npm = "bash python3-core python3-shell python3-datetime \ - python3-misc python3-multiprocessing" - -PACKAGES =+ "${PN}-systemtap" -FILES_${PN}-systemtap = "${datadir}/systemtap" - -BBCLASSEXTEND = "native" diff --git a/meta-openembedded/meta-oe/recipes-devtools/nodejs/nodejs_12.19.0.bb b/meta-openembedded/meta-oe/recipes-devtools/nodejs/nodejs_12.19.0.bb new file mode 100644 index 000000000..9d1558623 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-devtools/nodejs/nodejs_12.19.0.bb @@ -0,0 +1,161 @@ +DESCRIPTION = "nodeJS Evented I/O for V8 JavaScript" +HOMEPAGE = "http://nodejs.org" +LICENSE = "MIT & BSD & Artistic-2.0" +LIC_FILES_CHKSUM = "file://LICENSE;md5=30e27bd6830002d9415e4a5da7901f03" + +DEPENDS = "openssl" +DEPENDS_append_class-target = " nodejs-native" + +inherit pkgconfig python3native + +COMPATIBLE_MACHINE_armv4 = "(!.*armv4).*" +COMPATIBLE_MACHINE_armv5 = "(!.*armv5).*" +COMPATIBLE_MACHINE_mips64 = "(!.*mips64).*" + +COMPATIBLE_HOST_riscv64 = "null" +COMPATIBLE_HOST_riscv32 = "null" + +SRC_URI = "http://nodejs.org/dist/v${PV}/node-v${PV}.tar.xz \ + file://0001-Disable-running-gyp-files-for-bundled-deps.patch \ + file://0003-Install-both-binaries-and-use-libdir.patch \ + file://0004-v8-don-t-override-ARM-CFLAGS.patch \ + file://big-endian.patch \ + file://mips-warnings.patch \ + file://0001-Remove-use-of-register-r7-because-llvm-now-issues-an.patch \ + " +SRC_URI_append_class-target = " \ + file://0002-Using-native-binaries.patch \ + " +SRC_URI[sha256sum] = "3b671c45c493f96d7e018c15110cdbafa4478e5e5cfc9e6eec83cea9e6b551e1" + +S = "${WORKDIR}/node-v${PV}" + +# v8 errors out if you have set CCACHE +CCACHE = "" + +def map_nodejs_arch(a, d): + import re + + if re.match('i.86$', a): return 'ia32' + elif re.match('x86_64$', a): return 'x64' + elif re.match('aarch64$', a): return 'arm64' + elif re.match('(powerpc64|ppc64le)$', a): return 'ppc64' + elif re.match('powerpc$', a): return 'ppc' + return a + +ARCHFLAGS_arm = "${@bb.utils.contains('TUNE_FEATURES', 'callconvention-hard', '--with-arm-float-abi=hard', '--with-arm-float-abi=softfp', d)} \ + ${@bb.utils.contains('TUNE_FEATURES', 'neon', '--with-arm-fpu=neon', \ + bb.utils.contains('TUNE_FEATURES', 'vfpv3d16', '--with-arm-fpu=vfpv3-d16', \ + bb.utils.contains('TUNE_FEATURES', 'vfpv3', '--with-arm-fpu=vfpv3', \ + '--with-arm-fpu=vfp', d), d), d)}" +GYP_DEFINES_append_mipsel = " mips_arch_variant='r1' " +ARCHFLAGS ?= "" + +PACKAGECONFIG ??= "ares brotli icu zlib" + +PACKAGECONFIG[ares] = "--shared-cares,,c-ares" +PACKAGECONFIG[brotli] = "--shared-brotli,,brotli" +PACKAGECONFIG[icu] = "--with-intl=system-icu,--without-intl,icu" +PACKAGECONFIG[libuv] = "--shared-libuv,,libuv" +PACKAGECONFIG[nghttp2] = "--shared-nghttp2,,nghttp2" +PACKAGECONFIG[shared] = "--shared" +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 'brotli' in d.getVar('PACKAGECONFIG'): + shutil.rmtree(d.getVar('S') + '/deps/brotli', 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 () { + export LD="${CXX}" + GYP_DEFINES="${GYP_DEFINES}" export GYP_DEFINES + # $TARGET_ARCH settings don't match --dest-cpu settings + python3 configure.py --prefix=${prefix} --cross-compiling --without-snapshot --shared-openssl \ + --without-dtrace \ + --without-etw \ + --dest-cpu="${@map_nodejs_arch(d.getVar('TARGET_ARCH'), d)}" \ + --dest-os=linux \ + --libdir=${D}${libdir} \ + ${ARCHFLAGS} \ + ${PACKAGECONFIG_CONFARGS} +} + +do_compile () { + export LD="${CXX}" + oe_runmake BUILDTYPE=Release +} + +do_install () { + oe_runmake install DESTDIR=${D} + + # wasn't updated since 2009 and is the only thing requiring python2 in runtime + # ERROR: nodejs-12.14.1-r0 do_package_qa: QA Issue: /usr/lib/node_modules/npm/node_modules/node-gyp/gyp/samples/samples contained in package nodejs-npm requires /usr/bin/python, but no providers found in RDEPENDS_nodejs-npm? [file-rdeps] + rm -f ${D}${exec_prefix}/lib/node_modules/npm/node_modules/node-gyp/gyp/samples/samples +} + +do_install_append_class-native() { + # use node from PATH instead of absolute path to sysroot + # node-v0.10.25/tools/install.py is using: + # shebang = os.path.join(node_prefix, 'bin/node') + # update_shebang(link_path, shebang) + # and node_prefix can be very long path to bindir in native sysroot and + # when it exceeds 128 character shebang limit it's stripped to incorrect path + # and npm fails to execute like in this case with 133 characters show in log.do_install: + # updating shebang of /home/jenkins/workspace/build-webos-nightly/device/qemux86/label/open-webos-builder/BUILD-qemux86/work/x86_64-linux/nodejs-native/0.10.15-r0/image/home/jenkins/workspace/build-webos-nightly/device/qemux86/label/open-webos-builder/BUILD-qemux86/sysroots/x86_64-linux/usr/bin/npm to /home/jenkins/workspace/build-webos-nightly/device/qemux86/label/open-webos-builder/BUILD-qemux86/sysroots/x86_64-linux/usr/bin/node + # /usr/bin/npm is symlink to /usr/lib/node_modules/npm/bin/npm-cli.js + # use sed on npm-cli.js because otherwise symlink is replaced with normal file and + # npm-cli.js continues to use old shebang + sed "1s^.*^#\!/usr/bin/env node^g" -i ${D}${exec_prefix}/lib/node_modules/npm/bin/npm-cli.js + + # Install the native binaries to provide it within sysroot for the target compilation + install -d ${D}${bindir} + install -m 0755 ${S}/out/Release/torque ${D}${bindir}/torque + install -m 0755 ${S}/out/Release/bytecode_builtins_list_generator ${D}${bindir}/bytecode_builtins_list_generator + if ${@bb.utils.contains('PACKAGECONFIG','icu','true','false',d)}; then + install -m 0755 ${S}/out/Release/gen-regexp-special-case ${D}${bindir}/gen-regexp-special-case + fi + install -m 0755 ${S}/out/Release/mkcodecache ${D}${bindir}/mkcodecache + install -m 0755 ${S}/out/Release/node_mksnapshot ${D}${bindir}/node_mksnapshot +} + +do_install_append_class-target() { + sed "1s^.*^#\!${bindir}/env node^g" -i ${D}${exec_prefix}/lib/node_modules/npm/bin/npm-cli.js +} + +PACKAGES =+ "${PN}-npm" +FILES_${PN}-npm = "${exec_prefix}/lib/node_modules ${bindir}/npm ${bindir}/npx" +RDEPENDS_${PN}-npm = "bash python3-core python3-shell python3-datetime \ + python3-misc python3-multiprocessing" + +PACKAGES =+ "${PN}-systemtap" +FILES_${PN}-systemtap = "${datadir}/systemtap" + +BBCLASSEXTEND = "native" -- cgit v1.2.3