From f0c1ee77d98e679e1c9211c2a91fc315491232b4 Mon Sep 17 00:00:00 2001 From: Andrej Valek Date: Tue, 19 Mar 2019 08:05:47 +0100 Subject: nodejs: fix target ldflags using - do not drop target LDFLAGS - even if the target LDFLAGS have been specified, tools like torque was linked with system libraries Signed-off-by: Andrej Valek Signed-off-by: Khem Raj --- .../nodejs/nodejs/0006-Use-target-ldflags.patch | 24 ++++++++++++++++++++++ meta-oe/recipes-devtools/nodejs/nodejs_10.15.1.bb | 1 + 2 files changed, 25 insertions(+) create mode 100644 meta-oe/recipes-devtools/nodejs/nodejs/0006-Use-target-ldflags.patch (limited to 'meta-oe/recipes-devtools') diff --git a/meta-oe/recipes-devtools/nodejs/nodejs/0006-Use-target-ldflags.patch b/meta-oe/recipes-devtools/nodejs/nodejs/0006-Use-target-ldflags.patch new file mode 100644 index 000000000..f6569cd57 --- /dev/null +++ b/meta-oe/recipes-devtools/nodejs/nodejs/0006-Use-target-ldflags.patch @@ -0,0 +1,24 @@ +The target LDFLAGS have been ignored. Tools like torque +have been loaded from system libraries, even if a native +one was the target. +|$ ldd torque +| libz.so.1 => /lib/x86_64-linux-gnu/libz.so.1 +| libcrypto.so.1.1 => /usr/lib/x86_64-linux-gnu/libcrypto.so.1.1 +| libssl.so.1.1 => /usr/lib/x86_64-linux-gnu/libssl.so.1.1 +| libicui18n.so.63 => not found +| libicuuc.so.63 => not found +... + +Signed-off-by: Andrej Valek + +diff -Naur node-v10.15.1/deps/v8/gypfiles/toolchain.gypi node-v10.15.1/deps/v8/gypfiles/toolchain.gypi +--- node-v10.15.1/deps/v8/gypfiles/toolchain.gypi 2019-03-18 15:01:39.000000000 +0100 ++++ node-v10.15.1/deps/v8/gypfiles/toolchain.gypi 2019-03-18 15:04:08.628361308 +0100 +@@ -1106,6 +1106,7 @@ + 'cflags': [ '-fno-strict-aliasing' ], + }], + ], # conditions ++ 'ldflags+': [ '$(LDFLAGS)' ], + }], + ['OS=="solaris"', { + 'defines': [ '__C99FEATURES__=1' ], # isinf() etc. diff --git a/meta-oe/recipes-devtools/nodejs/nodejs_10.15.1.bb b/meta-oe/recipes-devtools/nodejs/nodejs_10.15.1.bb index 17c9bb0c4..672cd8440 100644 --- a/meta-oe/recipes-devtools/nodejs/nodejs_10.15.1.bb +++ b/meta-oe/recipes-devtools/nodejs/nodejs_10.15.1.bb @@ -17,6 +17,7 @@ SRC_URI = "http://nodejs.org/dist/v${PV}/node-v${PV}.tar.xz \ file://0003-Crypto-reduce-memory-usage-of-SignFinal.patch \ file://0004-Make-compatibility-with-gcc-4.8.patch \ file://0005-Link-atomic-library.patch \ + file://0006-Use-target-ldflags.patch \ " SRC_URI_append_class-target = " \ file://0002-Using-native-torque.patch \ -- cgit v1.2.3-54-g00ecf