mirror of
git://git.openembedded.org/meta-openembedded
synced 2026-04-02 02:49:12 +00:00
dca3efef19
License checksum change due to whitespace changes.
https://github.com/nodejs/node/commit/1dfd238781
libatomic.patch change due to changes in node.gyp
25c788009f
Changelog :
https://github.com/nodejs/node/blob/main/doc/changelogs/CHANGELOG_V20.md#20.18.0
Signed-off-by: Jason Schonberg <schonm@gmail.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
(cherry picked from commit 410a442f89ea394710d20d337b9da397b537cc25)
Signed-off-by: Armin Kuster <akuster808@gmail.com>
78 lines
2.6 KiB
Diff
78 lines
2.6 KiB
Diff
From 15e751e4b79475fb34e4b32a3ca54119b20c564a Mon Sep 17 00:00:00 2001
|
|
From: Hongxu Jia <hongxu.jia@windriver.com>
|
|
Date: Sat, 17 Aug 2024 21:33:18 +0800
|
|
Subject: [PATCH] link libatomic for clang conditionally
|
|
|
|
Clang emits atomic builtin, explicitly link libatomic conditionally:
|
|
- For target build, always link -latomic for clang as usual
|
|
- For host build, if host and target have same bit width, cross compiling
|
|
is enabled, and host toolchain is gcc which does not link -latomic;
|
|
if host and target have different bit width, no cross compiling,
|
|
host build is the same with target build that requires to link
|
|
-latomic;
|
|
|
|
Fix:
|
|
|tmp-glibc/work/core2-64-wrs-linux/nodejs/20.13.0/node-v20.13.0/out/Release/node_js2c: error while loading shared libraries: libatomic.so.1: cannot open shared object file: No such file or directory
|
|
|
|
Upstream-Status: Inappropriate [OE specific]
|
|
|
|
Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
|
|
---
|
|
node.gyp | 13 ++++++++++++-
|
|
tools/v8_gypfiles/v8.gyp | 15 ++++++++++++---
|
|
2 files changed, 24 insertions(+), 4 deletions(-)
|
|
|
|
diff --git a/node.gyp b/node.gyp
|
|
index b425f443..f296f35c 100644
|
|
--- a/node.gyp
|
|
+++ b/node.gyp
|
|
@@ -487,7 +487,18 @@
|
|
],
|
|
}],
|
|
['OS=="linux" and clang==1', {
|
|
- 'libraries': ['-latomic'],
|
|
+ 'target_conditions': [
|
|
+ ['_toolset=="host"', {
|
|
+ 'conditions': [
|
|
+ ['"<!(echo $HOST_AND_TARGET_SAME_WIDTH)"=="0"', {
|
|
+ 'libraries': ['-latomic'],
|
|
+ }],
|
|
+ ],
|
|
+ }],
|
|
+ ['_toolset=="target"', {
|
|
+ 'libraries': ['-latomic'],
|
|
+ }],
|
|
+ ],
|
|
}],
|
|
],
|
|
},
|
|
diff --git a/tools/v8_gypfiles/v8.gyp b/tools/v8_gypfiles/v8.gyp
|
|
index b23263cf..dcabf4ca 100644
|
|
--- a/tools/v8_gypfiles/v8.gyp
|
|
+++ b/tools/v8_gypfiles/v8.gyp
|
|
@@ -1100,9 +1100,18 @@
|
|
# Platforms that don't have Compare-And-Swap (CAS) support need to link atomic library
|
|
# to implement atomic memory access
|
|
['v8_current_cpu in ["mips64", "mips64el", "ppc", "arm", "riscv64", "loong64"]', {
|
|
- 'link_settings': {
|
|
- 'libraries': ['-latomic', ],
|
|
- },
|
|
+ 'target_conditions': [
|
|
+ ['_toolset=="host"', {
|
|
+ 'conditions': [
|
|
+ ['"<!(echo $HOST_AND_TARGET_SAME_WIDTH)"=="0"', {
|
|
+ 'libraries': ['-latomic'],
|
|
+ }],
|
|
+ ],
|
|
+ }],
|
|
+ ['_toolset=="target"', {
|
|
+ 'libraries': ['-latomic', ],
|
|
+ }],
|
|
+ ],
|
|
}],
|
|
],
|
|
}, # v8_base_without_compiler
|
|
--
|
|
2.35.5
|
|
|