From fc936a84e482cec92bf1a5ed526bc8bdfbd740f5 Mon Sep 17 00:00:00 2001 From: RafaelGSS Date: Fri, 8 Jul 2022 13:33:30 -0300 Subject: [PATCH] deps: remove not used architectures PR-URL: https://github.com/nodejs/node/pull/43735 Fixes: https://github.com/nodejs/node/issues/43667 Reviewed-By: Richard Lau --- deps/openssl/openssl-cl_asm.gypi | 8 +------- deps/openssl/openssl-cl_asm_avx2.gypi | 8 +------- deps/openssl/openssl-cl_no_asm.gypi | 8 +------- deps/openssl/openssl-fips_asm.gypi | 8 +------- deps/openssl/openssl-fips_asm_avx2.gypi | 8 +------- deps/openssl/openssl-fips_no_asm.gypi | 8 +------- deps/openssl/openssl_asm.gypi | 8 +------- deps/openssl/openssl_asm_avx2.gypi | 8 +------- deps/openssl/openssl_no_asm.gypi | 8 +------- 9 files changed, 9 insertions(+), 63 deletions(-) diff --git a/deps/openssl/openssl-cl_asm.gypi b/deps/openssl/openssl-cl_asm.gypi index ec87aaad76ed16..8791e005bf0f41 100644 --- a/deps/openssl/openssl-cl_asm.gypi +++ b/deps/openssl/openssl-cl_asm.gypi @@ -1,15 +1,9 @@ { 'conditions': [ - ['target_arch=="ppc" and OS=="aix"', { - 'includes': ['config/archs/aix-gcc/asm/openssl-cl.gypi'], - }, 'target_arch=="ppc" and OS=="linux"', { - 'includes': ['config/archs/linux-ppc/asm/openssl-cl.gypi'], - }, 'target_arch=="ppc64" and OS=="aix"', { + ['target_arch=="ppc64" and OS=="aix"', { 'includes': ['config/archs/aix64-gcc-as/asm/openssl-cl.gypi'], }, 'target_arch=="ppc64" and OS=="linux" and node_byteorder =="little"', { 'includes': ['config/archs/linux-ppc64le/asm/openssl-cl.gypi'], - }, 'target_arch=="ppc64" and OS=="linux"', { - 'includes': ['config/archs/linux-ppc64/asm/openssl-cl.gypi'], }, 'target_arch=="s390x" and OS=="linux"', { 'includes': ['config/archs/linux64-s390x/asm/openssl-cl.gypi'], }, 'target_arch=="arm" and OS=="linux"', { diff --git a/deps/openssl/openssl-cl_asm_avx2.gypi b/deps/openssl/openssl-cl_asm_avx2.gypi index 6507c938ba9c7d..815598676770c6 100644 --- a/deps/openssl/openssl-cl_asm_avx2.gypi +++ b/deps/openssl/openssl-cl_asm_avx2.gypi @@ -1,15 +1,9 @@ { 'conditions': [ - ['target_arch=="ppc" and OS=="aix"', { - 'includes': ['config/archs/aix-gcc/asm_avx2/openssl-cl.gypi'], - }, 'target_arch=="ppc" and OS=="linux"', { - 'includes': ['config/archs/linux-ppc/asm_avx2/openssl-cl.gypi'], - }, 'target_arch=="ppc64" and OS=="aix"', { + ['target_arch=="ppc64" and OS=="aix"', { 'includes': ['config/archs/aix64-gcc-as/asm_avx2/openssl-cl.gypi'], }, 'target_arch=="ppc64" and OS=="linux" and node_byteorder =="little"', { 'includes': ['config/archs/linux-ppc64le/asm_avx2/openssl-cl.gypi'], - }, 'target_arch=="ppc64" and OS=="linux"', { - 'includes': ['config/archs/linux-ppc64/asm_avx2/openssl-cl.gypi'], }, 'target_arch=="s390x" and OS=="linux"', { 'includes': ['config/archs/linux64-s390x/asm_avx2/openssl-cl.gypi'], }, 'target_arch=="arm" and OS=="linux"', { diff --git a/deps/openssl/openssl-cl_no_asm.gypi b/deps/openssl/openssl-cl_no_asm.gypi index 8dd423600da696..5f11b23624437f 100644 --- a/deps/openssl/openssl-cl_no_asm.gypi +++ b/deps/openssl/openssl-cl_no_asm.gypi @@ -1,15 +1,9 @@ { 'conditions': [ - ['target_arch=="ppc" and OS=="aix"', { - 'includes': ['config/archs/aix-gcc/no-asm/openssl-cl.gypi'], - }, 'target_arch=="ppc" and OS=="linux"', { - 'includes': ['config/archs/linux-ppc/no-asm/openssl-cl.gypi'], - }, 'target_arch=="ppc64" and OS=="aix"', { + ['target_arch=="ppc64" and OS=="aix"', { 'includes': ['config/archs/aix64-gcc-as/no-asm/openssl-cl.gypi'], }, 'target_arch=="ppc64" and OS=="linux" and node_byteorder =="little"', { 'includes': ['config/archs/linux-ppc64le/no-asm/openssl-cl.gypi'], - }, 'target_arch=="ppc64" and OS=="linux"', { - 'includes': ['config/archs/linux-ppc64/no-asm/openssl-cl.gypi'], }, 'target_arch=="s390x" and OS=="linux"', { 'includes': ['config/archs/linux64-s390x/no-asm/openssl-cl.gypi'], }, 'target_arch=="arm" and OS in ("linux", "android")', { diff --git a/deps/openssl/openssl-fips_asm.gypi b/deps/openssl/openssl-fips_asm.gypi index f6e567328ad20f..d0717df2a5094f 100644 --- a/deps/openssl/openssl-fips_asm.gypi +++ b/deps/openssl/openssl-fips_asm.gypi @@ -1,15 +1,9 @@ { 'conditions': [ - ['target_arch=="ppc" and OS=="aix"', { - 'includes': ['config/archs/aix-gcc/asm/openssl-fips.gypi'], - }, 'target_arch=="ppc" and OS=="linux"', { - 'includes': ['config/archs/linux-ppc/asm/openssl-fips.gypi'], - }, 'target_arch=="ppc64" and OS=="aix"', { + ['target_arch=="ppc64" and OS=="aix"', { 'includes': ['config/archs/aix64-gcc-as/asm/openssl-fips.gypi'], }, 'target_arch=="ppc64" and OS=="linux" and node_byteorder =="little"', { 'includes': ['config/archs/linux-ppc64le/asm/openssl-fips.gypi'], - }, 'target_arch=="ppc64" and OS=="linux"', { - 'includes': ['config/archs/linux-ppc64/asm/openssl-fips.gypi'], }, 'target_arch=="s390x" and OS=="linux"', { 'includes': ['config/archs/linux64-s390x/asm/openssl-fips.gypi'], }, 'target_arch=="arm" and OS=="linux"', { diff --git a/deps/openssl/openssl-fips_asm_avx2.gypi b/deps/openssl/openssl-fips_asm_avx2.gypi index 61fe996cd57d16..d2a2a4bc11413f 100644 --- a/deps/openssl/openssl-fips_asm_avx2.gypi +++ b/deps/openssl/openssl-fips_asm_avx2.gypi @@ -1,15 +1,9 @@ { 'conditions': [ - ['target_arch=="ppc" and OS=="aix"', { - 'includes': ['config/archs/aix-gcc/asm_avx2/openssl-fips.gypi'], - }, 'target_arch=="ppc" and OS=="linux"', { - 'includes': ['config/archs/linux-ppc/asm_avx2/openssl-fips.gypi'], - }, 'target_arch=="ppc64" and OS=="aix"', { + ['target_arch=="ppc64" and OS=="aix"', { 'includes': ['config/archs/aix64-gcc-as/asm_avx2/openssl-fips.gypi'], }, 'target_arch=="ppc64" and OS=="linux" and node_byteorder =="little"', { 'includes': ['config/archs/linux-ppc64le/asm_avx2/openssl-fips.gypi'], - }, 'target_arch=="ppc64" and OS=="linux"', { - 'includes': ['config/archs/linux-ppc64/asm_avx2/openssl-fips.gypi'], }, 'target_arch=="s390x" and OS=="linux"', { 'includes': ['config/archs/linux64-s390x/asm_avx2/openssl-fips.gypi'], }, 'target_arch=="arm" and OS=="linux"', { diff --git a/deps/openssl/openssl-fips_no_asm.gypi b/deps/openssl/openssl-fips_no_asm.gypi index c56024c1f6111b..6db998bd1f89f6 100644 --- a/deps/openssl/openssl-fips_no_asm.gypi +++ b/deps/openssl/openssl-fips_no_asm.gypi @@ -1,16 +1,10 @@ { 'defines': ['OPENSSL_NO_ASM'], 'conditions': [ - ['target_arch=="ppc" and OS=="aix"', { - 'includes': ['config/archs/aix-gcc/no-asm/openssl-fips.gypi'], - }, 'target_arch=="ppc" and OS=="linux"', { - 'includes': ['config/archs/linux-ppc/no-asm/openssl-fips.gypi'], - }, 'target_arch=="ppc64" and OS=="aix"', { + ['target_arch=="ppc64" and OS=="aix"', { 'includes': ['config/archs/aix64-gcc-as/no-asm/openssl-fips.gypi'], }, 'target_arch=="ppc64" and OS=="linux" and node_byteorder =="little"', { 'includes': ['config/archs/linux-ppc64le/no-asm/openssl-fips.gypi'], - }, 'target_arch=="ppc64" and OS=="linux"', { - 'includes': ['config/archs/linux-ppc64/no-asm/openssl-fips.gypi'], }, 'target_arch=="s390x" and OS=="linux"', { 'includes': ['config/archs/linux64-s390x/no-asm/openssl-fips.gypi'], }, 'target_arch=="arm" and OS in ("linux", "android")', { diff --git a/deps/openssl/openssl_asm.gypi b/deps/openssl/openssl_asm.gypi index 00676d7d5e8424..dbd5a5f69ff8d9 100644 --- a/deps/openssl/openssl_asm.gypi +++ b/deps/openssl/openssl_asm.gypi @@ -1,15 +1,9 @@ { 'conditions': [ - ['target_arch=="ppc" and OS=="aix"', { - 'includes': ['config/archs/aix-gcc/asm/openssl.gypi'], - }, 'target_arch=="ppc" and OS=="linux"', { - 'includes': ['config/archs/linux-ppc/asm/openssl.gypi'], - }, 'target_arch=="ppc64" and OS=="aix"', { + ['target_arch=="ppc64" and OS=="aix"', { 'includes': ['config/archs/aix64-gcc-as/asm/openssl.gypi'], }, 'target_arch=="ppc64" and OS=="linux" and node_byteorder =="little"', { 'includes': ['config/archs/linux-ppc64le/asm/openssl.gypi'], - }, 'target_arch=="ppc64" and OS=="linux"', { - 'includes': ['config/archs/linux-ppc64/asm/openssl.gypi'], }, 'target_arch=="s390x" and OS=="linux"', { 'includes': ['config/archs/linux64-s390x/asm/openssl.gypi'], }, 'target_arch=="arm" and OS=="linux"', { diff --git a/deps/openssl/openssl_asm_avx2.gypi b/deps/openssl/openssl_asm_avx2.gypi index e2b8eedaaccc7e..2883f83d694394 100644 --- a/deps/openssl/openssl_asm_avx2.gypi +++ b/deps/openssl/openssl_asm_avx2.gypi @@ -1,15 +1,9 @@ { 'conditions': [ - ['target_arch=="ppc" and OS=="aix"', { - 'includes': ['config/archs/aix-gcc/asm_avx2/openssl.gypi'], - }, 'target_arch=="ppc" and OS=="linux"', { - 'includes': ['config/archs/linux-ppc/asm_avx2/openssl.gypi'], - }, 'target_arch=="ppc64" and OS=="aix"', { + ['target_arch=="ppc64" and OS=="aix"', { 'includes': ['config/archs/aix64-gcc-as/asm_avx2/openssl.gypi'], }, 'target_arch=="ppc64" and OS=="linux" and node_byteorder =="little"', { 'includes': ['config/archs/linux-ppc64le/asm_avx2/openssl.gypi'], - }, 'target_arch=="ppc64" and OS=="linux"', { - 'includes': ['config/archs/linux-ppc64/asm_avx2/openssl.gypi'], }, 'target_arch=="s390x" and OS=="linux"', { 'includes': ['config/archs/linux64-s390x/asm_avx2/openssl.gypi'], }, 'target_arch=="arm" and OS=="linux"', { diff --git a/deps/openssl/openssl_no_asm.gypi b/deps/openssl/openssl_no_asm.gypi index e918f826ade8a3..24bd3777fd20ba 100644 --- a/deps/openssl/openssl_no_asm.gypi +++ b/deps/openssl/openssl_no_asm.gypi @@ -1,16 +1,10 @@ { 'defines': ['OPENSSL_NO_ASM'], 'conditions': [ - ['target_arch=="ppc" and OS=="aix"', { - 'includes': ['config/archs/aix-gcc/no-asm/openssl.gypi'], - }, 'target_arch=="ppc" and OS=="linux"', { - 'includes': ['config/archs/linux-ppc/no-asm/openssl.gypi'], - }, 'target_arch=="ppc64" and OS=="aix"', { + ['target_arch=="ppc64" and OS=="aix"', { 'includes': ['config/archs/aix64-gcc-as/no-asm/openssl.gypi'], }, 'target_arch=="ppc64" and OS=="linux" and node_byteorder =="little"', { 'includes': ['config/archs/linux-ppc64le/no-asm/openssl.gypi'], - }, 'target_arch=="ppc64" and OS=="linux"', { - 'includes': ['config/archs/linux-ppc64/no-asm/openssl.gypi'], }, 'target_arch=="s390x" and OS=="linux"', { 'includes': ['config/archs/linux64-s390x/no-asm/openssl.gypi'], }, 'target_arch=="arm" and OS in ("linux", "android")', {