diff options
author | André Draszik <git@andred.net> | 2019-11-10 22:05:07 +0000 |
---|---|---|
committer | Khem Raj <raj.khem@gmail.com> | 2019-11-13 07:17:03 -0800 |
commit | 0c6cdbe3dbe95ae1f4654c13583020ae55a6c0af (patch) | |
tree | 8a03d52e7f55e129acb7926269a23706e53b157b | |
parent | 08956bdd8962ca44eeea3772ea6be8061d1f5735 (diff) | |
download | meta-openembedded-0c6cdbe3dbe95ae1f4654c13583020ae55a6c0af.tar.gz |
nodejs: delete all bundled deps in do_unpack() if needed
We can delete bundled deps where system-provided counterparts
should be used instead.
Amongst others, this ensures they are not used accidentally.
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.17.0.bb | 17 |
1 files changed, 16 insertions, 1 deletions
diff --git a/meta-oe/recipes-devtools/nodejs/nodejs_10.17.0.bb b/meta-oe/recipes-devtools/nodejs/nodejs_10.17.0.bb index 9af0d998c2..4342693b34 100644 --- a/meta-oe/recipes-devtools/nodejs/nodejs_10.17.0.bb +++ b/meta-oe/recipes-devtools/nodejs/nodejs_10.17.0.bb | |||
@@ -69,9 +69,24 @@ EXTRA_OEMAKE = "\ | |||
69 | AR.host='${AR}' \ | 69 | AR.host='${AR}' \ |
70 | " | 70 | " |
71 | 71 | ||
72 | python do_unpack() { | ||
73 | import shutil | ||
74 | |||
75 | bb.build.exec_func('base_do_unpack', d) | ||
76 | |||
77 | shutil.rmtree(d.getVar('S') + '/deps/openssl', True) | ||
78 | if 'ares' in d.getVar('PACKAGECONFIG'): | ||
79 | shutil.rmtree(d.getVar('S') + '/deps/cares', True) | ||
80 | if 'libuv' in d.getVar('PACKAGECONFIG'): | ||
81 | shutil.rmtree(d.getVar('S') + '/deps/uv', True) | ||
82 | if 'nghttp2' in d.getVar('PACKAGECONFIG'): | ||
83 | shutil.rmtree(d.getVar('S') + '/deps/nghttp2', True) | ||
84 | if 'zlib' in d.getVar('PACKAGECONFIG'): | ||
85 | shutil.rmtree(d.getVar('S') + '/deps/zlib', True) | ||
86 | } | ||
87 | |||
72 | # Node is way too cool to use proper autotools, so we install two wrappers to forcefully inject proper arch cflags to workaround gypi | 88 | # Node is way too cool to use proper autotools, so we install two wrappers to forcefully inject proper arch cflags to workaround gypi |
73 | do_configure () { | 89 | do_configure () { |
74 | rm -rf ${S}/deps/openssl | ||
75 | export LD="${CXX}" | 90 | export LD="${CXX}" |
76 | GYP_DEFINES="${GYP_DEFINES}" export GYP_DEFINES | 91 | GYP_DEFINES="${GYP_DEFINES}" export GYP_DEFINES |
77 | # $TARGET_ARCH settings don't match --dest-cpu settings | 92 | # $TARGET_ARCH settings don't match --dest-cpu settings |