From a9703a55efdafdd5479d6c67448be6375c576904 Mon Sep 17 00:00:00 2001 From: Daniel Bevenius Date: Tue, 10 May 2022 09:39:18 +0200 Subject: [PATCH] deps: remove opensslconf template headers This commit removes the header template files opensslconf.h as it is not a generated header anymore (configuration.h is the generated header now). The motivation for this is that not using opensslconf.h from the OpenSSL include directory means an addon that includes openssl/ssl.h will get the following error: ~/.cache/node-gyp/17.8.0/include/node/openssl/macros.h:148:4: error: compatibility level" 148 | # error "The requested API level higher than the configured API compatibility level" For more details please see #40575. PR-URL: https://github.com/nodejs/node/pull/43035 Fixes: https://github.com/nodejs/node/issues/40575 Reviewed-By: Michael Dawson --- deps/openssl/config/opensslconf.h | 23 ------------ deps/openssl/config/opensslconf.h.tmpl | 1 - deps/openssl/config/opensslconf_no-asm.h | 47 ------------------------ 3 files changed, 71 deletions(-) delete mode 100644 deps/openssl/config/opensslconf.h delete mode 100644 deps/openssl/config/opensslconf.h.tmpl delete mode 100644 deps/openssl/config/opensslconf_no-asm.h diff --git a/deps/openssl/config/opensslconf.h b/deps/openssl/config/opensslconf.h deleted file mode 100644 index 9c492032b05f76..00000000000000 --- a/deps/openssl/config/opensslconf.h +++ /dev/null @@ -1,23 +0,0 @@ -#undef OPENSSL_LINUX -#if defined(__linux) && !defined(__ANDROID__) -# define OPENSSL_LINUX 1 -#endif - -#if defined(OPENSSL_NO_ASM) -# include "./opensslconf_no-asm.h" -#else -# include "./opensslconf_asm.h" -#endif - -/* GOST is not included in all platform */ -#ifndef OPENSSL_NO_GOST -# define OPENSSL_NO_GOST -#endif -/* HW_PADLOCK is not included in all platform */ -#ifndef OPENSSL_NO_HW_PADLOCK -# define OPENSSL_NO_HW_PADLOCK -#endif -/* musl in Alpine Linux does not support getcontext etc.*/ -#if defined(OPENSSL_LINUX) && !defined(__GLIBC__) && !defined(__clang__) -# define OPENSSL_NO_ASYNC -#endif diff --git a/deps/openssl/config/opensslconf.h.tmpl b/deps/openssl/config/opensslconf.h.tmpl deleted file mode 100644 index 1ab4c35af539df..00000000000000 --- a/deps/openssl/config/opensslconf.h.tmpl +++ /dev/null @@ -1 +0,0 @@ -#include "../../../config/opensslconf.h" diff --git a/deps/openssl/config/opensslconf_no-asm.h b/deps/openssl/config/opensslconf_no-asm.h deleted file mode 100644 index bb5d4d261c7f34..00000000000000 --- a/deps/openssl/config/opensslconf_no-asm.h +++ /dev/null @@ -1,47 +0,0 @@ -#if defined(OPENSSL_LINUX) && defined(__i386__) -# include "./archs/linux-elf/no-asm/include/openssl/opensslconf.h" -#elif defined(OPENSSL_LINUX) && defined(__x86_64__) -# include "./archs/linux-x86_64/no-asm/include/openssl/opensslconf.h" -#elif defined(OPENSSL_LINUX) && defined(__arm__) -# include "./archs/linux-armv4/no-asm/include/openssl/opensslconf.h" -#elif defined(OPENSSL_LINUX) && defined(__aarch64__) -# include "./archs/linux-aarch64/no-asm/include/openssl/opensslconf.h" -#elif defined(__APPLE__) && defined(__MACH__) && defined(__i386__) -# include "./archs/darwin-i386-cc/no-asm/include/openssl/opensslconf.h" -#elif defined(__APPLE__) && defined(__MACH__) && defined(__x86_64__) -# include "./archs/darwin64-x86_64-cc/no-asm/include/openssl/opensslconf.h" -#elif defined(__APPLE__) && defined(__MACH__) && defined(__arm64__) -# include "./archs/darwin64-arm64-cc/no-asm/include/openssl/opensslconf.h" -#elif defined(_WIN32) && defined(_M_IX86) -# include "./archs/VC-WIN32/no-asm/include/openssl/opensslconf.h" -#elif defined(_WIN32) && defined(_M_X64) -# include "./archs/VC-WIN64A/no-asm/include/openssl/opensslconf.h" -#elif defined(_WIN32) && defined(_M_ARM64) -# include "./archs/VC-WIN64-ARM/no-asm/include/openssl/opensslconf.h" -#elif (defined(__FreeBSD__) || defined(__OpenBSD__)) && defined(__i386__) -# include "./archs/BSD-x86/no-asm/include/openssl/opensslconf.h" -#elif (defined(__FreeBSD__) || defined(__OpenBSD__)) && defined(__x86_64__) -# include "./archs/BSD-x86_64/no-asm/include/openssl/opensslconf.h" -#elif defined(__sun) && defined(__i386__) -# include "./archs/solaris-x86-gcc/no-asm/include/openssl/opensslconf.h" -#elif defined(__sun) && defined(__x86_64__) -# include "./archs/solaris64-x86_64-gcc/no-asm/include/openssl/opensslconf.h" -#elif defined(OPENSSL_LINUX) && defined(__PPC64__) && defined(L_ENDIAN) -# include "./archs/linux-ppc64le/no-asm/include/openssl/opensslconf.h" -#elif defined(OPENSSL_LINUX) && defined(__PPC64__) -# include "./archs/linux-ppc64/no-asm/include/openssl/opensslconf.h" -#elif defined(OPENSSL_LINUX) && !defined(__PPC64__) && defined(__ppc__) -# include "./archs/linux-ppc/no-asm/include/openssl/opensslconf.h" -#elif defined(_AIX) && defined(_ARCH_PPC64) -# include "./archs/aix64-gcc-as/no-asm/include/openssl/opensslconf.h" -#elif defined(_AIX) && !defined(_ARCH_PPC64) && defined(_ARCH_PPC) -# include "./archs/aix-gcc/no-asm/include/openssl/opensslconf.h" -#elif defined(OPENSSL_LINUX) && defined(__s390x__) -# include "./archs/linux64-s390x/no-asm/include/openssl/opensslconf.h" -#elif defined(OPENSSL_LINUX) && defined(__s390__) -# include "./archs/linux32-s390x/no-asm/include/openssl/opensslconf.h" -#elif defined(OPENSSL_LINUX) && defined(__mips64) && defined(__MIPSEL__) -# include "./archs/linux64-mips64/no-asm/include/openssl/opensslconf.h" -#else -# include "./archs/linux-elf/no-asm/include/openssl/opensslconf.h" -#endif