Attachment 234997 Details for Bug 263590 – fix armv6/armv7 patch (take 2 and apply unconditionally)

[patch] fix armv6/armv7 patch (take 2 and apply unconditionally)

node_patch_fix.diff (text/plain), 2.02 KB, created by Joseph Mingrone on 2022-06-29 20:12:57 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Joseph Mingrone

Created: 2022-06-29 20:12:57 UTC

Size: 2.02 KB

patch

obsolete

>diff --git a/www/node/Makefile b/www/node/Makefile
>index af0e0319b3c8..2a38cb1efc17 100644
>--- a/www/node/Makefile
>+++ b/www/node/Makefile
>@@ -79,14 +79,6 @@ LIB_DEPENDS+=	libbrotlidec.so:archivers/brotli \
> 
> .include <bsd.port.options.mk>
> 
>-.if (defined(PPC_ABI) && ${PPC_ABI} == ELFv2) || ${ARCH} == powerpc64le
>-EXTRA_PATCHES=		${PATCHDIR}/extra-patch-common.gypi
>-.endif
>-
>-.if ${ARCH} == armv6 || ${ARCH} == armv7
>-EXTRA_PATCHES=	${PATCHDIR}/extra-patch-tools_v8__gypfiles_v8.gyp
>-.endif
>-
> .if ${PORT_OPTIONS:MBUNDLED_SSL} && ${ARCH} != amd64
> CONFIGURE_ARGS+=--openssl-no-asm
> .endif
>diff --git a/www/node/files/extra-patch-common.gypi b/www/node/files/patch-common.gypi
>similarity index 100%
>rename from www/node/files/extra-patch-common.gypi
>rename to www/node/files/patch-common.gypi
>diff --git a/www/node/files/extra-patch-tools_v8__gypfiles_v8.gyp b/www/node/files/patch-tools_v8__gypfiles_v8.gyp
>similarity index 70%
>rename from www/node/files/extra-patch-tools_v8__gypfiles_v8.gyp
>rename to www/node/files/patch-tools_v8__gypfiles_v8.gyp
>index 9749a96d68e5..374f77039af4 100644
>--- a/www/node/files/extra-patch-tools_v8__gypfiles_v8.gyp
>+++ b/www/node/files/patch-tools_v8__gypfiles_v8.gyp
>@@ -1,11 +1,11 @@
>---- tools/v8_gypfiles/v8.gyp.orig	2021-04-20 11:30:16 UTC
>+--- tools/v8_gypfiles/v8.gyp.orig	2022-05-17 11:37:47 UTC
> +++ tools/v8_gypfiles/v8.gyp
>-@@ -774,7 +774,7 @@
>+@@ -977,7 +977,7 @@
>          }],
>          # Platforms that don't have Compare-And-Swap (CAS) support need to link atomic library
>          # to implement atomic memory access
>--        ['v8_current_cpu in ["mips", "mipsel", "mips64", "mips64el", "ppc", "arm", "riscv64"]', {
>-+        ['v8_current_cpu in ["mips", "mipsel", "mips64", "mips64el", "ppc", "riscv64"]', {
>+-        ['v8_current_cpu in ["mips", "mipsel", "mips64", "mips64el", "ppc", "arm", "riscv64", "loong64"]', {
>++        ['v8_current_cpu in ["mips", "mipsel", "mips64", "mips64el", "ppc", "riscv64", "loong64"]', {
>            'link_settings': {
>              'libraries': ['-latomic', ],
>            },

Actions: View | Diff

Attachments on bug 263590: 234996 | 234997 | 234998