diff options
| author |   Andrej Valek <andrej.valek@siemens.com> | 2019-03-19 08:05:47 +0100 |
|---|---|---|
| committer |   Khem Raj <raj.khem@gmail.com> | 2019-03-19 21:00:06 -0700 |
| commit | f0c1ee77d98e679e1c9211c2a91fc315491232b4 (patch) | |
| tree | 633eaaa7593eb68d7cb5cca922d29518dd1d3ab9 | |
| parent | 6cb4e90fcde2d383ebcf656e489ac84d1db422f1 (diff) | |
| download | meta-openembedded-f0c1ee77d98e679e1c9211c2a91fc315491232b4.tar.gz | |
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 <andrej.valek@siemens.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
| -rw-r--r-- | meta-oe/recipes-devtools/nodejs/nodejs/0006-Use-target-ldflags.patch | 24 | ||||
| -rw-r--r-- | meta-oe/recipes-devtools/nodejs/nodejs_10.15.1.bb | 1 |
2 files changed, 25 insertions, 0 deletions
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 0000000000..f6569cd57a --- /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 <andrej.valek@siemens.com> + +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 17c9bb0c4e..672cd84401 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 \ |