[oe-commits] [meta-openembedded] 11/82: nodejs: allow use of system c-ares (and make default)

git at git.openembedded.org git at git.openembedded.org
Sat Nov 2 00:24:01 UTC 2019


This is an automated email from the git hooks/post-receive script.

khem pushed a commit to branch master-next
in repository meta-openembedded.

commit 76dd3dac1f1e67a5c44ad732b8e827cc36ded641
Author: André Draszik <git at andred.net>
AuthorDate: Tue Oct 29 16:42:24 2019 +0000

    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 at andred.net>
    Signed-off-by: Khem Raj <raj.khem at gmail.com>
---
 meta-oe/recipes-devtools/nodejs/nodejs_10.16.3.bb | 5 +++--
 1 file 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 a978eeb..97a1967 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', '-
 GYP_DEFINES_append_mipsel = " mips_arch_variant='r1' "
 ARCHFLAGS ?= ""
 
-PACKAGECONFIG ??= "zlib icu"
-PACKAGECONFIG[zlib] = "--shared-zlib,,zlib"
+PACKAGECONFIG ??= "ares icu zlib"
+PACKAGECONFIG[ares] = "--shared-cares,,c-ares"
 PACKAGECONFIG[icu] = "--with-intl=system-icu,--without-intl,icu"
+PACKAGECONFIG[zlib] = "--shared-zlib,,zlib"
 
 # 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 () {

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.


More information about the Openembedded-commits mailing list