From e4e25cd2815efbf586a4297ed777e8653367a2b4 Mon Sep 17 00:00:00 2001 From: Theo Buehler Date: Tue, 26 Aug 2025 00:47:10 -0600 Subject: Make opensslconf.h MI again --- include/CMakeLists.txt | 32 +------------------------- include/Makefile.am | 16 ------------- include/arch/loongarch64/opensslconf.h | 13 ----------- include/arch/mips/opensslconf.h | 13 ----------- include/openssl/Makefile.am.tpl | 41 +--------------------------------- 5 files changed, 2 insertions(+), 113 deletions(-) delete mode 100644 include/arch/loongarch64/opensslconf.h delete mode 100644 include/arch/mips/opensslconf.h (limited to 'include') diff --git a/include/CMakeLists.txt b/include/CMakeLists.txt index 04160af..4802d13 100644 --- a/include/CMakeLists.txt +++ b/include/CMakeLists.txt @@ -19,10 +19,7 @@ if(ENABLE_LIBRESSL_INSTALL) PATTERN "CMakeLists.txt" EXCLUDE PATTERN "compat" EXCLUDE PATTERN "pqueue.h" EXCLUDE - PATTERN "Makefile*" EXCLUDE - PATTERN "arch" EXCLUDE) - install(FILES ${CMAKE_BINARY_DIR}/include/openssl/opensslconf.h - DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/openssl") + PATTERN "Makefile*" EXCLUDE) endif(ENABLE_LIBRESSL_INSTALL) file(COPY . @@ -32,30 +29,3 @@ file(COPY . PATTERN "pqueue.h" EXCLUDE PATTERN "Makefile*" EXCLUDE PATTERN "arch" EXCLUDE) - -if(HOST_AARCH64) - file(READ arch/aarch64/opensslconf.h OPENSSLCONF) -elseif(HOST_ARM) - file(READ arch/arm/opensslconf.h OPENSSLCONF) -elseif(HOST_I386) - file(READ arch/i386/opensslconf.h OPENSSLCONF) -elseif(HOST_LOONGARCH64) - file(READ arch/loongarch64/opensslconf.h OPENSSLCONF) -elseif(HOST_MIPS) - file(READ arch/mips/opensslconf.h OPENSSLCONF) -elseif(HOST_MIPS64) - file(READ arch/mips64/opensslconf.h OPENSSLCONF) -elseif(HOST_POWERPC) - file(READ arch/powerpc/opensslconf.h OPENSSLCONF) -elseif(HOST_POWERPC64) - file(READ arch/powerpc64/opensslconf.h OPENSSLCONF) -elseif(HOST_RISCV64) - file(READ arch/riscv64/opensslconf.h OPENSSLCONF) -elseif(HOST_SPARC64) - file(READ arch/sparc64/opensslconf.h OPENSSLCONF) -elseif(HOST_X86_64) - file(READ arch/amd64/opensslconf.h OPENSSLCONF) -else() - message(FATAL_ERROR "Architecture not supported") -endif() -file(WRITE ${CMAKE_BINARY_DIR}/include/openssl/opensslconf.h "${OPENSSLCONF}") diff --git a/include/Makefile.am b/include/Makefile.am index a3e1c19..04c9ea2 100644 --- a/include/Makefile.am +++ b/include/Makefile.am @@ -61,20 +61,4 @@ noinst_HEADERS += compat/sys/time.h noinst_HEADERS += compat/sys/types.h noinst_HEADERS += compat/sys/uio.h -noinst_HEADERS += arch/aarch64/opensslconf.h -noinst_HEADERS += arch/alpha/opensslconf.h -noinst_HEADERS += arch/amd64/opensslconf.h -noinst_HEADERS += arch/arm/opensslconf.h -noinst_HEADERS += arch/hppa/opensslconf.h -noinst_HEADERS += arch/i386/opensslconf.h -noinst_HEADERS += arch/loongarch64/opensslconf.h -noinst_HEADERS += arch/m88k/opensslconf.h -noinst_HEADERS += arch/mips/opensslconf.h -noinst_HEADERS += arch/mips64/opensslconf.h -noinst_HEADERS += arch/powerpc/opensslconf.h -noinst_HEADERS += arch/powerpc64/opensslconf.h -noinst_HEADERS += arch/riscv64/opensslconf.h -noinst_HEADERS += arch/sh/opensslconf.h -noinst_HEADERS += arch/sparc64/opensslconf.h - include_HEADERS = tls.h diff --git a/include/arch/loongarch64/opensslconf.h b/include/arch/loongarch64/opensslconf.h deleted file mode 100644 index c31bcc0..0000000 --- a/include/arch/loongarch64/opensslconf.h +++ /dev/null @@ -1,13 +0,0 @@ -#include - -#undef OPENSSL_EXPORT_VAR_AS_FUNCTION - -#ifndef OPENSSL_FILE -#ifdef OPENSSL_NO_FILENAMES -#define OPENSSL_FILE "" -#define OPENSSL_LINE 0 -#else -#define OPENSSL_FILE __FILE__ -#define OPENSSL_LINE __LINE__ -#endif -#endif diff --git a/include/arch/mips/opensslconf.h b/include/arch/mips/opensslconf.h deleted file mode 100644 index c31bcc0..0000000 --- a/include/arch/mips/opensslconf.h +++ /dev/null @@ -1,13 +0,0 @@ -#include - -#undef OPENSSL_EXPORT_VAR_AS_FUNCTION - -#ifndef OPENSSL_FILE -#ifdef OPENSSL_NO_FILENAMES -#define OPENSSL_FILE "" -#define OPENSSL_LINE 0 -#else -#define OPENSSL_FILE __FILE__ -#define OPENSSL_LINE __LINE__ -#endif -#endif diff --git a/include/openssl/Makefile.am.tpl b/include/openssl/Makefile.am.tpl index 4bbbd60..1bea34d 100644 --- a/include/openssl/Makefile.am.tpl +++ b/include/openssl/Makefile.am.tpl @@ -3,43 +3,4 @@ include $(top_srcdir)/Makefile.am.common if !ENABLE_LIBTLS_ONLY opensslincludedir=$(includedir)/openssl -BUILT_SOURCES = opensslconf.h -CLEANFILES = opensslconf.h - -opensslconf.h: Makefile - -echo "generating opensslconf.h ..." -if HOST_AARCH64 - -cp $(top_srcdir)/include/arch/aarch64/opensslconf.h opensslconf.h -endif -if HOST_ARM - -cp $(top_srcdir)/include/arch/arm/opensslconf.h opensslconf.h -endif -if HOST_I386 - -cp $(top_srcdir)/include/arch/i386/opensslconf.h opensslconf.h -endif -if HOST_LOONGARCH64 - -cp $(top_srcdir)/include/arch/loongarch64/opensslconf.h opensslconf.h -endif -if HOST_MIPS - -cp $(top_srcdir)/include/arch/mips/opensslconf.h opensslconf.h -endif -if HOST_MIPS64 - -cp $(top_srcdir)/include/arch/mips64/opensslconf.h opensslconf.h -endif -if HOST_POWERPC - -cp $(top_srcdir)/include/arch/powerpc/opensslconf.h opensslconf.h -endif -if HOST_POWERPC64 - -cp $(top_srcdir)/include/arch/powerpc64/opensslconf.h opensslconf.h -endif -if HOST_RISCV64 - -cp $(top_srcdir)/include/arch/riscv64/opensslconf.h opensslconf.h -endif -if HOST_SPARC64 - -cp $(top_srcdir)/include/arch/sparc64/opensslconf.h opensslconf.h -endif -if HOST_X86_64 - -cp $(top_srcdir)/include/arch/amd64/opensslconf.h opensslconf.h -endif - -opensslinclude_HEADERS = opensslconf.h +opensslinclude_HEADERS = -- cgit v1.2.3-55-g6feb