diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/CMakeLists.txt | 32 | ||||
| -rw-r--r-- | include/Makefile.am | 16 | ||||
| -rw-r--r-- | include/arch/loongarch64/opensslconf.h | 13 | ||||
| -rw-r--r-- | include/arch/mips/opensslconf.h | 13 | ||||
| -rw-r--r-- | include/openssl/Makefile.am.tpl | 41 |
5 files changed, 2 insertions, 113 deletions
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) | |||
| 19 | PATTERN "CMakeLists.txt" EXCLUDE | 19 | PATTERN "CMakeLists.txt" EXCLUDE |
| 20 | PATTERN "compat" EXCLUDE | 20 | PATTERN "compat" EXCLUDE |
| 21 | PATTERN "pqueue.h" EXCLUDE | 21 | PATTERN "pqueue.h" EXCLUDE |
| 22 | PATTERN "Makefile*" EXCLUDE | 22 | PATTERN "Makefile*" EXCLUDE) |
| 23 | PATTERN "arch" EXCLUDE) | ||
| 24 | install(FILES ${CMAKE_BINARY_DIR}/include/openssl/opensslconf.h | ||
| 25 | DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/openssl") | ||
| 26 | endif(ENABLE_LIBRESSL_INSTALL) | 23 | endif(ENABLE_LIBRESSL_INSTALL) |
| 27 | 24 | ||
| 28 | file(COPY . | 25 | file(COPY . |
| @@ -32,30 +29,3 @@ file(COPY . | |||
| 32 | PATTERN "pqueue.h" EXCLUDE | 29 | PATTERN "pqueue.h" EXCLUDE |
| 33 | PATTERN "Makefile*" EXCLUDE | 30 | PATTERN "Makefile*" EXCLUDE |
| 34 | PATTERN "arch" EXCLUDE) | 31 | PATTERN "arch" EXCLUDE) |
| 35 | |||
| 36 | if(HOST_AARCH64) | ||
| 37 | file(READ arch/aarch64/opensslconf.h OPENSSLCONF) | ||
| 38 | elseif(HOST_ARM) | ||
| 39 | file(READ arch/arm/opensslconf.h OPENSSLCONF) | ||
| 40 | elseif(HOST_I386) | ||
| 41 | file(READ arch/i386/opensslconf.h OPENSSLCONF) | ||
| 42 | elseif(HOST_LOONGARCH64) | ||
| 43 | file(READ arch/loongarch64/opensslconf.h OPENSSLCONF) | ||
| 44 | elseif(HOST_MIPS) | ||
| 45 | file(READ arch/mips/opensslconf.h OPENSSLCONF) | ||
| 46 | elseif(HOST_MIPS64) | ||
| 47 | file(READ arch/mips64/opensslconf.h OPENSSLCONF) | ||
| 48 | elseif(HOST_POWERPC) | ||
| 49 | file(READ arch/powerpc/opensslconf.h OPENSSLCONF) | ||
| 50 | elseif(HOST_POWERPC64) | ||
| 51 | file(READ arch/powerpc64/opensslconf.h OPENSSLCONF) | ||
| 52 | elseif(HOST_RISCV64) | ||
| 53 | file(READ arch/riscv64/opensslconf.h OPENSSLCONF) | ||
| 54 | elseif(HOST_SPARC64) | ||
| 55 | file(READ arch/sparc64/opensslconf.h OPENSSLCONF) | ||
| 56 | elseif(HOST_X86_64) | ||
| 57 | file(READ arch/amd64/opensslconf.h OPENSSLCONF) | ||
| 58 | else() | ||
| 59 | message(FATAL_ERROR "Architecture not supported") | ||
| 60 | endif() | ||
| 61 | 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 | |||
| 61 | noinst_HEADERS += compat/sys/types.h | 61 | noinst_HEADERS += compat/sys/types.h |
| 62 | noinst_HEADERS += compat/sys/uio.h | 62 | noinst_HEADERS += compat/sys/uio.h |
| 63 | 63 | ||
| 64 | noinst_HEADERS += arch/aarch64/opensslconf.h | ||
| 65 | noinst_HEADERS += arch/alpha/opensslconf.h | ||
| 66 | noinst_HEADERS += arch/amd64/opensslconf.h | ||
| 67 | noinst_HEADERS += arch/arm/opensslconf.h | ||
| 68 | noinst_HEADERS += arch/hppa/opensslconf.h | ||
| 69 | noinst_HEADERS += arch/i386/opensslconf.h | ||
| 70 | noinst_HEADERS += arch/loongarch64/opensslconf.h | ||
| 71 | noinst_HEADERS += arch/m88k/opensslconf.h | ||
| 72 | noinst_HEADERS += arch/mips/opensslconf.h | ||
| 73 | noinst_HEADERS += arch/mips64/opensslconf.h | ||
| 74 | noinst_HEADERS += arch/powerpc/opensslconf.h | ||
| 75 | noinst_HEADERS += arch/powerpc64/opensslconf.h | ||
| 76 | noinst_HEADERS += arch/riscv64/opensslconf.h | ||
| 77 | noinst_HEADERS += arch/sh/opensslconf.h | ||
| 78 | noinst_HEADERS += arch/sparc64/opensslconf.h | ||
| 79 | |||
| 80 | include_HEADERS = tls.h | 64 | 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 @@ | |||
| 1 | #include <openssl/opensslfeatures.h> | ||
| 2 | |||
| 3 | #undef OPENSSL_EXPORT_VAR_AS_FUNCTION | ||
| 4 | |||
| 5 | #ifndef OPENSSL_FILE | ||
| 6 | #ifdef OPENSSL_NO_FILENAMES | ||
| 7 | #define OPENSSL_FILE "" | ||
| 8 | #define OPENSSL_LINE 0 | ||
| 9 | #else | ||
| 10 | #define OPENSSL_FILE __FILE__ | ||
| 11 | #define OPENSSL_LINE __LINE__ | ||
| 12 | #endif | ||
| 13 | #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 @@ | |||
| 1 | #include <openssl/opensslfeatures.h> | ||
| 2 | |||
| 3 | #undef OPENSSL_EXPORT_VAR_AS_FUNCTION | ||
| 4 | |||
| 5 | #ifndef OPENSSL_FILE | ||
| 6 | #ifdef OPENSSL_NO_FILENAMES | ||
| 7 | #define OPENSSL_FILE "" | ||
| 8 | #define OPENSSL_LINE 0 | ||
| 9 | #else | ||
| 10 | #define OPENSSL_FILE __FILE__ | ||
| 11 | #define OPENSSL_LINE __LINE__ | ||
| 12 | #endif | ||
| 13 | #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 | |||
| 3 | if !ENABLE_LIBTLS_ONLY | 3 | if !ENABLE_LIBTLS_ONLY |
| 4 | opensslincludedir=$(includedir)/openssl | 4 | opensslincludedir=$(includedir)/openssl |
| 5 | 5 | ||
| 6 | BUILT_SOURCES = opensslconf.h | 6 | opensslinclude_HEADERS = |
| 7 | CLEANFILES = opensslconf.h | ||
| 8 | |||
| 9 | opensslconf.h: Makefile | ||
| 10 | -echo "generating opensslconf.h ..." | ||
| 11 | if HOST_AARCH64 | ||
| 12 | -cp $(top_srcdir)/include/arch/aarch64/opensslconf.h opensslconf.h | ||
| 13 | endif | ||
| 14 | if HOST_ARM | ||
| 15 | -cp $(top_srcdir)/include/arch/arm/opensslconf.h opensslconf.h | ||
| 16 | endif | ||
| 17 | if HOST_I386 | ||
| 18 | -cp $(top_srcdir)/include/arch/i386/opensslconf.h opensslconf.h | ||
| 19 | endif | ||
| 20 | if HOST_LOONGARCH64 | ||
| 21 | -cp $(top_srcdir)/include/arch/loongarch64/opensslconf.h opensslconf.h | ||
| 22 | endif | ||
| 23 | if HOST_MIPS | ||
| 24 | -cp $(top_srcdir)/include/arch/mips/opensslconf.h opensslconf.h | ||
| 25 | endif | ||
| 26 | if HOST_MIPS64 | ||
| 27 | -cp $(top_srcdir)/include/arch/mips64/opensslconf.h opensslconf.h | ||
| 28 | endif | ||
| 29 | if HOST_POWERPC | ||
| 30 | -cp $(top_srcdir)/include/arch/powerpc/opensslconf.h opensslconf.h | ||
| 31 | endif | ||
| 32 | if HOST_POWERPC64 | ||
| 33 | -cp $(top_srcdir)/include/arch/powerpc64/opensslconf.h opensslconf.h | ||
| 34 | endif | ||
| 35 | if HOST_RISCV64 | ||
| 36 | -cp $(top_srcdir)/include/arch/riscv64/opensslconf.h opensslconf.h | ||
| 37 | endif | ||
| 38 | if HOST_SPARC64 | ||
| 39 | -cp $(top_srcdir)/include/arch/sparc64/opensslconf.h opensslconf.h | ||
| 40 | endif | ||
| 41 | if HOST_X86_64 | ||
| 42 | -cp $(top_srcdir)/include/arch/amd64/opensslconf.h opensslconf.h | ||
| 43 | endif | ||
| 44 | |||
| 45 | opensslinclude_HEADERS = opensslconf.h | ||
