Mirrors/libressl
0
0
Fork 0
mirror of https://github.com/libressl/portable.git synced 2026-01-17 21:51:17 +01:00
Code Issues Packages Projects Releases Wiki Activity

Make opensslconf.h MI again

Browse Source
This commit is contained in:
Theo Buehler
2025-08-26 00:47:10 -06:00
parent 4494cd0525
commit e4e25cd281
6 changed files with 3 additions and 115 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
include/CMakeLists.txt
View File

@@ -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}")

16
include/Makefile.am
View File

@@ -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

13
include/arch/loongarch64/opensslconf.h
View File

@@ -1,13 +0,0 @@
#include <openssl/opensslfeatures.h>
#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

13
include/arch/mips/opensslconf.h
View File

@@ -1,13 +0,0 @@
#include <openssl/opensslfeatures.h>
#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

41
include/openssl/Makefile.am.tpl
View File

@@ -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 =

3
update.sh
View File

@@ -98,6 +98,7 @@ if [ -x /opt/csw/bin/ggrep ]; then
GREP='/opt/csw/bin/ggrep'
fi
$CP $libcrypto_src/opensslconf.h include/openssl
$CP $libcrypto_src/opensslfeatures.h include/openssl
$CP $libssl_src/pqueue.h include
@@ -186,8 +187,6 @@ done
for i in $libcrypto_src/arch/*; do
arch=`basename $i`
mkdir -p include/arch/$arch
$CP $libcrypto_src/arch/$arch/opensslconf.h include/arch/$arch/
mkdir -p crypto/arch/$arch
$CP $libcrypto_src/arch/$arch/crypto_arch.h crypto/arch/$arch/
crypto_cpu_caps=$libcrypto_src/arch/$arch/crypto_cpu_caps.c