diff options
Diffstat (limited to 'import-layers/meta-openembedded/meta-oe/recipes-devtools/nodejs')
-rw-r--r-- | import-layers/meta-openembedded/meta-oe/recipes-devtools/nodejs/0001-Disable-running-gyp-files-for-bundled-deps.patch | 29 | ||||
-rw-r--r-- | import-layers/meta-openembedded/meta-oe/recipes-devtools/nodejs/nodejs/no-registry.patch | 59 | ||||
-rw-r--r-- | import-layers/meta-openembedded/meta-oe/recipes-devtools/nodejs/nodejs_8.9.4.bb (renamed from import-layers/meta-openembedded/meta-oe/recipes-devtools/nodejs/nodejs_8.4.0.bb) | 11 |
3 files changed, 6 insertions, 93 deletions
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-devtools/nodejs/0001-Disable-running-gyp-files-for-bundled-deps.patch b/import-layers/meta-openembedded/meta-oe/recipes-devtools/nodejs/0001-Disable-running-gyp-files-for-bundled-deps.patch deleted file mode 100644 index 324a4683d..000000000 --- a/import-layers/meta-openembedded/meta-oe/recipes-devtools/nodejs/0001-Disable-running-gyp-files-for-bundled-deps.patch +++ /dev/null @@ -1,29 +0,0 @@ -From c2aff16cc196a61f4ab1cdae4a91c7926123c239 Mon Sep 17 00:00:00 2001 -From: Zuzana Svetlikova <zsvetlik@redhat.com> -Date: Thu, 27 Apr 2017 14:25:42 +0200 -Subject: [PATCH] Disable running gyp on shared deps - ---- - Makefile | 7 +++---- - 1 file changed, 3 insertions(+), 4 deletions(-) - -diff --git a/Makefile b/Makefile -index 0a217bd893..e1229ad07f 100644 ---- a/Makefile -+++ b/Makefile -@@ -79,10 +79,9 @@ $(NODE_G_EXE): config.gypi out/Makefile - $(MAKE) -C out BUILDTYPE=Debug V=$(V) - if [ ! -r $@ -o ! -L $@ ]; then ln -fs out/Debug/$(NODE_EXE) $@; fi - --out/Makefile: common.gypi deps/uv/uv.gyp deps/http_parser/http_parser.gyp \ -- deps/zlib/zlib.gyp deps/v8/gypfiles/toolchain.gypi \ -- deps/v8/gypfiles/features.gypi deps/v8/src/v8.gyp node.gyp \ -- config.gypi -+out/Makefile: common.gypi deps/http_parser/http_parser.gyp \ -+ deps/v8/gypfiles/toolchain.gypi deps/v8/gypfiles/features.gypi \ -+ deps/v8/src/v8.gyp node.gyp config.gypi - $(PYTHON) tools/gyp_node.py -f make - - config.gypi: configure --- -2.12.2 diff --git a/import-layers/meta-openembedded/meta-oe/recipes-devtools/nodejs/nodejs/no-registry.patch b/import-layers/meta-openembedded/meta-oe/recipes-devtools/nodejs/nodejs/no-registry.patch deleted file mode 100644 index ed2473897..000000000 --- a/import-layers/meta-openembedded/meta-oe/recipes-devtools/nodejs/nodejs/no-registry.patch +++ /dev/null @@ -1,59 +0,0 @@ -Bugfix for --no-registry in nodejs-v0.12.2 - -diff -u -r node-v0.12.2_def/deps/npm/lib/cache/caching-client.js node-v0.12.2/deps/npm/lib/cache/caching-client.js ---- node-v0.12.2_def/deps/npm/lib/cache/caching-client.js 2015-04-01 01:13:01.000000000 +0300 -+++ node-v0.12.2/deps/npm/lib/cache/caching-client.js 2015-05-18 00:47:10.738599686 +0300 -@@ -67,6 +67,22 @@ - var cacheBase = cacheFile(npm.config.get("cache"))(uri) - var cachePath = path.join(cacheBase, ".cache.json") - -+ if (parsed.host === "noregistry") (function() { -+ var stat = null -+ var file = npm.config.get("cache") + parsed.pathname + "/.cache.json" -+ try { -+ stat = fs.statSync(cachePath) -+ } catch (ex) {} -+ if (!stat) try { -+ stat = fs.statSync(file) -+ cachePath = file -+ } catch (ex) { -+ stat = "Registry not defined and registry files not found: \"" + -+ cachePath + "\", \"" + file + "\"." -+ throw new Error(stat) -+ } -+ })() -+ - // If the GET is part of a write operation (PUT or DELETE), then - // skip past the cache entirely, but still save the results. - if (uri.match(/\?write=true$/)) { -@@ -83,12 +99,17 @@ - } - catch (ex) { - data = null -+ if (parsed.host === "noregistry") -+ throw new Error("File \"" + cachePath+"\"" + " corrupted.") - } - - params.stat = stat - params.data = data - -- get_.call(client, uri, cachePath, params, cb) -+ if (parsed.host === "noregistry") -+ cb(null, data, JSON.stringify(data), { statusCode : 304 }) -+ else -+ get_.call(client, uri, cachePath, params, cb) - }) - } - else { -diff -u -r node-v0.12.2_def/deps/npm/lib/utils/map-to-registry.js node-v0.12.2/deps/npm/lib/utils/map-to-registry.js ---- node-v0.12.2_def/deps/npm/lib/utils/map-to-registry.js 2015-04-01 01:13:01.000000000 +0300 -+++ node-v0.12.2/deps/npm/lib/utils/map-to-registry.js 2015-05-18 01:15:10.030569613 +0300 -@@ -45,6 +45,8 @@ - - log.silly("mapToRegistry", "registry", registry) - -+ if (!registry) return cb(null, "http://noregistry/" + name, {}) -+ - var auth = config.getCredentialsByURI(registry) - - // normalize registry URL so resolution doesn't drop a piece of registry URL diff --git a/import-layers/meta-openembedded/meta-oe/recipes-devtools/nodejs/nodejs_8.4.0.bb b/import-layers/meta-openembedded/meta-oe/recipes-devtools/nodejs/nodejs_8.9.4.bb index 5bcbc0007..8930cd902 100644 --- a/import-layers/meta-openembedded/meta-oe/recipes-devtools/nodejs/nodejs_8.4.0.bb +++ b/import-layers/meta-openembedded/meta-oe/recipes-devtools/nodejs/nodejs_8.9.4.bb @@ -1,7 +1,7 @@ DESCRIPTION = "nodeJS Evented I/O for V8 JavaScript" HOMEPAGE = "http://nodejs.org" LICENSE = "MIT & BSD & Artistic-2.0" -LIC_FILES_CHKSUM = "file://LICENSE;md5=e4d35c6120f175e1fbe5ff908b1cf2d6" +LIC_FILES_CHKSUM = "file://LICENSE;md5=270f7477a1705f7cd3e29d3d4512915d" DEPENDS = "openssl10 zlib" @@ -12,8 +12,8 @@ COMPATIBLE_MACHINE_mips64 = "(!.*mips64).*" SRC_URI = "http://nodejs.org/dist/v${PV}/node-v${PV}.tar.xz \ file://0001-Disable-running-gyp-files-for-bundled-deps.patch \ " -SRC_URI[md5sum] = "e6c85c83001340b30671e9432e1bd337" -SRC_URI[sha256sum] = "5d5aa2a101dcc617231a475812eb8ed87cac21491f1dcc7997b9dd463563f361" +SRC_URI[md5sum] = "631ed102fe58c13cf63bc92a68cf4759" +SRC_URI[sha256sum] = "6cdcde9c9c1ca9f450a0b24eafa229ca759e576daa0fae892ce74d541ecdc86f" S = "${WORKDIR}/node-v${PV}" @@ -26,7 +26,7 @@ def map_nodejs_arch(a, d): 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$', a): return 'ppc64' + elif re.match('(powerpc64|ppc64le)$', a): return 'ppc64' elif re.match('powerpc$', a): return 'ppc' return a @@ -80,7 +80,8 @@ do_install_append_class-target() { PACKAGES =+ "${PN}-npm" FILES_${PN}-npm = "${exec_prefix}/lib/node_modules ${bindir}/npm ${bindir}/npx" -RDEPENDS_${PN}-npm = "bash python-shell python-datetime python-subprocess python-textutils" +RDEPENDS_${PN}-npm = "bash python-shell python-datetime python-subprocess python-textutils \ + python-compiler python-misc python-multiprocessing" PACKAGES =+ "${PN}-systemtap" FILES_${PN}-systemtap = "${datadir}/systemtap" |