commit:     ce404768408c6b49b6e1a7281a894fceeac8372c
Author:     WANG Xuerui <xen0n <AT> gentoo <DOT> org>
AuthorDate: Thu Aug 18 15:13:00 2022 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Thu Aug 18 15:21:32 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ce404768

net-libs/nodejs: fix ABI to nodejs arch mapping for loong

The 64-bit ABI for loong starts with "lp64", like riscv, so we need
to consider ARCH too when determining the nodejs arch.

Bug: https://github.com/gentoo/gentoo/pull/25655
Signed-off-by: WANG Xuerui <xen0n <AT> gentoo.org>
Signed-off-by: William Hubbs <williamh <AT> gentoo.org>

 net-libs/nodejs/nodejs-18.7.0.ebuild | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/net-libs/nodejs/nodejs-18.7.0.ebuild 
b/net-libs/nodejs/nodejs-18.7.0.ebuild
index 0fe9e8106d3c..6b031ed0b96c 100644
--- a/net-libs/nodejs/nodejs-18.7.0.ebuild
+++ b/net-libs/nodejs/nodejs-18.7.0.ebuild
@@ -135,14 +135,15 @@ src_configure() {
        fi
 
        local myarch=""
-       case ${ABI} in
-               amd64) myarch="x64";;
-               arm) myarch="arm";;
-               arm64) myarch="arm64";;
-               lp64*) myarch="riscv64";;
-               ppc64) myarch="ppc64";;
-               x32) myarch="x32";;
-               x86) myarch="ia32";;
+       case "${ARCH}:${ABI}" in
+               *:amd64) myarch="x64";;
+               *:arm) myarch="arm";;
+               *:arm64) myarch="arm64";;
+               loong:lp64*) myarch="loong64";;
+               riscv:lp64*) myarch="riscv64";;
+               *:ppc64) myarch="ppc64";;
+               *:x32) myarch="x32";;
+               *:x86) myarch="ia32";;
                *) myarch="${ABI}";;
        esac
 

Reply via email to