diff options
Diffstat (limited to 'meta-oe/recipes-devtools/nodejs/nodejs_14.17.1.bb')
| -rw-r--r-- | meta-oe/recipes-devtools/nodejs/nodejs_14.17.1.bb | 36 |
1 files changed, 18 insertions, 18 deletions
diff --git a/meta-oe/recipes-devtools/nodejs/nodejs_14.17.1.bb b/meta-oe/recipes-devtools/nodejs/nodejs_14.17.1.bb index 5ac4f9dc7d..4715019798 100644 --- a/meta-oe/recipes-devtools/nodejs/nodejs_14.17.1.bb +++ b/meta-oe/recipes-devtools/nodejs/nodejs_14.17.1.bb @@ -4,16 +4,16 @@ LICENSE = "MIT & BSD & Artistic-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=a1016f9b7979cfe6fc3466a9bba60b1e" DEPENDS = "openssl" -DEPENDS_append_class-target = " qemu-native" +DEPENDS:append:class-target = " qemu-native" inherit pkgconfig python3native qemu -COMPATIBLE_MACHINE_armv4 = "(!.*armv4).*" -COMPATIBLE_MACHINE_armv5 = "(!.*armv5).*" -COMPATIBLE_MACHINE_mips64 = "(!.*mips64).*" +COMPATIBLE_MACHINE:armv4 = "(!.*armv4).*" +COMPATIBLE_MACHINE:armv5 = "(!.*armv5).*" +COMPATIBLE_MACHINE:mips64 = "(!.*mips64).*" -COMPATIBLE_HOST_riscv64 = "null" -COMPATIBLE_HOST_riscv32 = "null" +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 \ @@ -23,13 +23,13 @@ SRC_URI = "http://nodejs.org/dist/v${PV}/node-v${PV}.tar.xz \ file://mips-warnings.patch \ file://mips-less-memory.patch \ " -SRC_URI_append_class-target = " \ +SRC_URI:append:class-target = " \ file://0002-Using-native-binaries.patch \ " -SRC_URI_append_toolchain-clang_x86 = " \ +SRC_URI:append:toolchain-clang:x86 = " \ file://libatomic.patch \ " -SRC_URI_append_toolchain-clang_powerpc64le = " \ +SRC_URI:append:toolchain-clang:powerpc64le = " \ file://0001-ppc64-Do-not-use-mminimal-toc-with-clang.patch \ " SRC_URI[sha256sum] = "ddf1d2d56ddf35ecd98c5ea5ddcd690b245899f289559b4330c921255f5a247f" @@ -49,12 +49,12 @@ def map_nodejs_arch(a, d): 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)} \ +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' " +GYP_DEFINES:append:mipsel = " mips_arch_variant='r1' " ARCHFLAGS ?= "" PACKAGECONFIG ??= "ares brotli icu zlib" @@ -128,7 +128,7 @@ python do_create_v8_qemu_wrapper () { do_create_v8_qemu_wrapper[dirs] = "${B}" addtask create_v8_qemu_wrapper after do_configure before do_compile -LDFLAGS_append_x86 = " -latomic" +LDFLAGS:append:x86 = " -latomic" # 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 () { @@ -155,11 +155,11 @@ 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] + # 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() { +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') @@ -184,16 +184,16 @@ do_install_append_class-native() { install -m 0755 ${S}/out/Release/node_mksnapshot ${D}${bindir}/node_mksnapshot } -do_install_append_class-target() { +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 \ +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" +FILES:${PN}-systemtap = "${datadir}/systemtap" BBCLASSEXTEND = "native" |