summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndré Draszik <git@andred.net>2019-10-29 16:42:24 +0000
committerKhem Raj <raj.khem@gmail.com>2019-11-01 17:22:52 -0700
commit76dd3dac1f1e67a5c44ad732b8e827cc36ded641 (patch)
tree388a93775ebb2bcdd1680b1ce39a6983f37aab5a
parentb70b263add2a2f1a4964bbc39400bccd13c4056d (diff)
downloadmeta-openembedded-76dd3dac1f1e67a5c44ad732b8e827cc36ded641.tar.gz
nodejs: allow use of system c-ares (and make default)
Use system c-ares via PACKAGECONFIG by default. So far, nodejs had been built using its embedded copy of c-ares, which we generally try to avoid, for the known reasons (independent updates, cve & license checks, etc). Notes: * otherwise nodejs uses its bundled version of c-ares * the PACKAGECONFIG variable is 'ares' so as to be in line with other uses of this (wget & curl recipes in OE core) Signed-off-by: André Draszik <git@andred.net> Signed-off-by: Khem Raj <raj.khem@gmail.com>
-rw-r--r--meta-oe/recipes-devtools/nodejs/nodejs_10.16.3.bb5
1 files changed, 3 insertions, 2 deletions
diff --git a/meta-oe/recipes-devtools/nodejs/nodejs_10.16.3.bb b/meta-oe/recipes-devtools/nodejs/nodejs_10.16.3.bb
index a978eebe47..97a1967cc2 100644
--- a/meta-oe/recipes-devtools/nodejs/nodejs_10.16.3.bb
+++ b/meta-oe/recipes-devtools/nodejs/nodejs_10.16.3.bb
@@ -52,9 +52,10 @@ ARCHFLAGS_arm = "${@bb.utils.contains('TUNE_FEATURES', 'callconvention-hard', '-
52GYP_DEFINES_append_mipsel = " mips_arch_variant='r1' " 52GYP_DEFINES_append_mipsel = " mips_arch_variant='r1' "
53ARCHFLAGS ?= "" 53ARCHFLAGS ?= ""
54 54
55PACKAGECONFIG ??= "zlib icu" 55PACKAGECONFIG ??= "ares icu zlib"
56PACKAGECONFIG[zlib] = "--shared-zlib,,zlib" 56PACKAGECONFIG[ares] = "--shared-cares,,c-ares"
57PACKAGECONFIG[icu] = "--with-intl=system-icu,--without-intl,icu" 57PACKAGECONFIG[icu] = "--with-intl=system-icu,--without-intl,icu"
58PACKAGECONFIG[zlib] = "--shared-zlib,,zlib"
58 59
59# Node is way too cool to use proper autotools, so we install two wrappers to forcefully inject proper arch cflags to workaround gypi 60# Node is way too cool to use proper autotools, so we install two wrappers to forcefully inject proper arch cflags to workaround gypi
60do_configure () { 61do_configure () {