Re: [PATCH 1/2] nodejs: add version 4.2.3

[Denys Dmytriyenko <denys@ti.com>]

Please specify that this is copied from meta-oe/master with or w/o 
modifications. Plus mention when this can be dropped locally (i.e. when 
migrated to jethro or newer release).

-- 
Denys


On Thu, Jan 21, 2016 at 04:00:13PM -0500, Hongmei Gou wrote:
> Signed-off-by: Hongmei Gou <h-gou@ti.com>
> ---
>  .../nodejs/nodejs/no-registry.patch                | 59 +++++++++++++++
>  .../recipes-devtools/nodejs/nodejs_4.2.3.bb        | 84 ++++++++++++++++++++++
>  2 files changed, 143 insertions(+)
>  create mode 100644 meta-arago-extras/recipes-devtools/nodejs/nodejs/no-registry.patch
>  create mode 100644 meta-arago-extras/recipes-devtools/nodejs/nodejs_4.2.3.bb
> 
> diff --git a/meta-arago-extras/recipes-devtools/nodejs/nodejs/no-registry.patch b/meta-arago-extras/recipes-devtools/nodejs/nodejs/no-registry.patch
> new file mode 100644
> index 0000000..ed24738
> --- /dev/null
> +++ b/meta-arago-extras/recipes-devtools/nodejs/nodejs/no-registry.patch
> @@ -0,0 +1,59 @@
> +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/meta-arago-extras/recipes-devtools/nodejs/nodejs_4.2.3.bb b/meta-arago-extras/recipes-devtools/nodejs/nodejs_4.2.3.bb
> new file mode 100644
> index 0000000..66a3c11
> --- /dev/null
> +++ b/meta-arago-extras/recipes-devtools/nodejs/nodejs_4.2.3.bb
> @@ -0,0 +1,84 @@
> +DESCRIPTION = "nodeJS Evented I/O for V8 JavaScript"
> +HOMEPAGE = "http://nodejs.org"
> +LICENSE = "MIT & BSD & Artistic-2.0"
> +LIC_FILES_CHKSUM = "file://LICENSE;md5=ee90ba97d933fc8d56e97812b7dd62e9"
> +
> +DEPENDS = "openssl"
> +
> +COMPATIBLE_MACHINE_armv4 = "(!.*armv4).*"
> +COMPATIBLE_MACHINE_armv5 = "(!.*armv5).*"
> +COMPATIBLE_MACHINE_mips64 = "(!.*mips64).*"
> +
> +SRC_URI = "http://nodejs.org/dist/v${PV}/node-v${PV}.tar.gz \
> +    file://no-registry.patch \
> +"
> +SRC_URI[md5sum] = "529a8abd4ca5a2225636767d3f14c382"
> +SRC_URI[sha256sum] = "5008ade5feb4b089f59163f66bffddc113f27de5d78edf203e39435c2c5d554f"
> +
> +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$', 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)}"
> +GYP_DEFINES_append_mipsel = " mips_arch_variant='r1' "
> +ARCHFLAGS ?= ""
> +
> +# 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
> +   ./configure --prefix=${prefix} --without-snapshot --shared-openssl \
> +               --dest-cpu="${@map_nodejs_arch(d.getVar('TARGET_ARCH', True), d)}" \
> +               --dest-os=linux \
> +               ${ARCHFLAGS}
> +}
> +
> +do_compile () {
> +    export LD="${CXX}"
> +    oe_runmake BUILDTYPE=Release
> +}
> +
> +do_install () {
> +    oe_runmake install DESTDIR=${D}
> +}
> +
> +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
> +}
> +
> +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"
> +RDEPENDS_${PN}-npm = "bash python-shell python-datetime python-subprocess python-textutils"
> +
> +PACKAGES =+ "${PN}-systemtap"
> +FILES_${PN}-systemtap = "${datadir}/systemtap"
> +
> +
> +BBCLASSEXTEND = "native"
> -- 
> 1.9.1
> 
> _______________________________________________
> meta-arago mailing list
> meta-arago@arago-project.org
> http://arago-project.org/cgi-bin/mailman/listinfo/meta-arago