commit: da1119fa36aa12fbb367ea13b618c8f2102b750b Author: Jakov Smolić <jsmolic <AT> gentoo <DOT> org> AuthorDate: Fri Jun 7 10:00:09 2024 +0000 Commit: Jakov Smolić <jsmolic <AT> gentoo <DOT> org> CommitDate: Tue Jun 25 16:44:57 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=da1119fa
net-libs/nodejs: Fix building on riscv Closes: https://bugs.gentoo.org/931256 Signed-off-by: Jakov Smolić <jsmolic <AT> gentoo.org> Closes: https://github.com/gentoo/gentoo/pull/37068 Signed-off-by: Jakov Smolić <jsmolic <AT> gentoo.org> net-libs/nodejs/files/nodejs-22.2.0-riscv.patch | 37 +++++++++++++++++++++++++ net-libs/nodejs/nodejs-22.3.0.ebuild | 3 ++ 2 files changed, 40 insertions(+) diff --git a/net-libs/nodejs/files/nodejs-22.2.0-riscv.patch b/net-libs/nodejs/files/nodejs-22.2.0-riscv.patch new file mode 100644 index 000000000000..44c696307240 --- /dev/null +++ b/net-libs/nodejs/files/nodejs-22.2.0-riscv.patch @@ -0,0 +1,37 @@ +From 2674676fe3b01cc9652a5922badc9b044080fce7 Mon Sep 17 00:00:00 2001 +From: Lu Yahan <[email protected]> +Date: Wed, 8 May 2024 16:34:24 +0800 +Subject: [PATCH] tools: fix riscv64 build failed + +--- + tools/v8_gypfiles/v8.gyp | 17 +++++++++++++++++ + 1 file changed, 17 insertions(+) + +diff --git a/tools/v8_gypfiles/v8.gyp b/tools/v8_gypfiles/v8.gyp +index 1e2b3645132aab..ab96e0c7d2c1f2 100644 +--- a/tools/v8_gypfiles/v8.gyp ++++ b/tools/v8_gypfiles/v8.gyp +@@ -1150,6 +1150,23 @@ + 'sources': [ + '<!@pymod_do_main(GN-scraper "<(V8_ROOT)/BUILD.gn" "\\"v8_base_without_compiler.*?v8_enable_wasm_gdb_remote_debugging.*?v8_current_cpu == \\"riscv64\\".*?sources \\+= ")', + ], ++ 'conditions': [ ++ ['v8_enable_webassembly==1', { ++ 'conditions': [ ++ ['(_toolset=="host" and host_arch=="arm64" or _toolset=="target" and target_arch=="arm64") or (_toolset=="host" and host_arch=="riscv64" or _toolset=="target" and target_arch=="riscv64") or (_toolset=="host" and host_arch=="x64" or _toolset=="target" and target_arch=="x64")', { ++ 'sources': [ ++ '<(V8_ROOT)/src/trap-handler/handler-inside-posix.cc', ++ '<(V8_ROOT)/src/trap-handler/handler-outside-posix.cc', ++ ], ++ }], ++ ['(_toolset=="host" and host_arch=="x64" or _toolset=="target" and target_arch=="x64") and (OS=="linux" or OS=="mac" or OS=="win")', { ++ 'sources': [ ++ '<(V8_ROOT)/src/trap-handler/handler-outside-simulator.cc', ++ ], ++ }], ++ ], ++ }], ++ ], + }], + ['v8_target_arch=="loong64"', { + 'sources': [ diff --git a/net-libs/nodejs/nodejs-22.3.0.ebuild b/net-libs/nodejs/nodejs-22.3.0.ebuild index 37c99da5a59e..ee0eb0823bd1 100644 --- a/net-libs/nodejs/nodejs-22.3.0.ebuild +++ b/net-libs/nodejs/nodejs-22.3.0.ebuild @@ -104,6 +104,9 @@ src_prepare() { # We need to disable mprotect on two files when it builds Bug 694100. use pax-kernel && PATCHES+=( "${FILESDIR}"/${PN}-20.6.0-paxmarking.patch ) + # bug 931256 + use riscv && PATCHES+=( "${FILESDIR}"/${P}-riscv.patch ) + default }
