| 1 |
commit: ce404768408c6b49b6e1a7281a894fceeac8372c |
| 2 |
Author: WANG Xuerui <xen0n <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Thu Aug 18 15:13:00 2022 +0000 |
| 4 |
Commit: William Hubbs <williamh <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Aug 18 15:21:32 2022 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ce404768 |
| 7 |
|
| 8 |
net-libs/nodejs: fix ABI to nodejs arch mapping for loong |
| 9 |
|
| 10 |
The 64-bit ABI for loong starts with "lp64", like riscv, so we need |
| 11 |
to consider ARCH too when determining the nodejs arch. |
| 12 |
|
| 13 |
Bug: https://github.com/gentoo/gentoo/pull/25655 |
| 14 |
Signed-off-by: WANG Xuerui <xen0n <AT> gentoo.org> |
| 15 |
Signed-off-by: William Hubbs <williamh <AT> gentoo.org> |
| 16 |
|
| 17 |
net-libs/nodejs/nodejs-18.7.0.ebuild | 17 +++++++++-------- |
| 18 |
1 file changed, 9 insertions(+), 8 deletions(-) |
| 19 |
|
| 20 |
diff --git a/net-libs/nodejs/nodejs-18.7.0.ebuild b/net-libs/nodejs/nodejs-18.7.0.ebuild |
| 21 |
index 0fe9e8106d3c..6b031ed0b96c 100644 |
| 22 |
--- a/net-libs/nodejs/nodejs-18.7.0.ebuild |
| 23 |
+++ b/net-libs/nodejs/nodejs-18.7.0.ebuild |
| 24 |
@@ -135,14 +135,15 @@ src_configure() { |
| 25 |
fi |
| 26 |
|
| 27 |
local myarch="" |
| 28 |
- case ${ABI} in |
| 29 |
- amd64) myarch="x64";; |
| 30 |
- arm) myarch="arm";; |
| 31 |
- arm64) myarch="arm64";; |
| 32 |
- lp64*) myarch="riscv64";; |
| 33 |
- ppc64) myarch="ppc64";; |
| 34 |
- x32) myarch="x32";; |
| 35 |
- x86) myarch="ia32";; |
| 36 |
+ case "${ARCH}:${ABI}" in |
| 37 |
+ *:amd64) myarch="x64";; |
| 38 |
+ *:arm) myarch="arm";; |
| 39 |
+ *:arm64) myarch="arm64";; |
| 40 |
+ loong:lp64*) myarch="loong64";; |
| 41 |
+ riscv:lp64*) myarch="riscv64";; |
| 42 |
+ *:ppc64) myarch="ppc64";; |
| 43 |
+ *:x32) myarch="x32";; |
| 44 |
+ *:x86) myarch="ia32";; |
| 45 |
*) myarch="${ABI}";; |
| 46 |
esac |
Archives