factotum/libressl-portable
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

stop exposing hidden defines in public opensslconf.h

Browse Source 
pull in hidden headers instead, patching drectly for Windows support
This commit is contained in:
Brent Cook
2023-02-28 01:51:41 -06:00
parent 65af3925dc
commit b98c56fd5e
9 changed files with 42 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -3,40 +3,37 @@ include $(top_srcdir)/Makefile.am.common
if !ENABLE_LIBTLS_ONLY
opensslincludedir=$(includedir)/openssl
noinst_HEADERS = opensslconf.h.in
BUILT_SOURCES = opensslconf.h
CLEANFILES = opensslconf.h
opensslconf.h: opensslconf.h.in Makefile
opensslconf.h: Makefile
-echo "generating opensslconf.h ..."
-cp $(top_srcdir)/include/openssl/opensslconf.h.in opensslconf.h
-chmod u+w opensslconf.h
if HOST_AARCH64
-cat $(top_srcdir)/include/arch/aarch64/opensslconf.h >> opensslconf.h
-cp $(top_srcdir)/include/arch/aarch64/opensslconf.h opensslconf.h
endif
if HOST_ARM
-cat $(top_srcdir)/include/arch/arm/opensslconf.h >> opensslconf.h
-cp $(top_srcdir)/include/arch/arm/opensslconf.h opensslconf.h
endif
if HOST_I386
-cat $(top_srcdir)/include/arch/i386/opensslconf.h >> opensslconf.h
-cp $(top_srcdir)/include/arch/i386/opensslconf.h opensslconf.h
endif
if HOST_MIPS64
-cat $(top_srcdir)/include/arch/mips64/opensslconf.h >> opensslconf.h
-cp $(top_srcdir)/include/arch/mips64/opensslconf.h opensslconf.h
endif
if HOST_POWERPC
-cat $(top_srcdir)/include/arch/powerpc/opensslconf.h >> opensslconf.h
-cp $(top_srcdir)/include/arch/powerpc/opensslconf.h opensslconf.h
endif
if HOST_POWERPC64
-cat $(top_srcdir)/include/arch/powerpc64/opensslconf.h >> opensslconf.h
-cp $(top_srcdir)/include/arch/powerpc64/opensslconf.h opensslconf.h
endif
if HOST_RISCV64
-cat $(top_srcdir)/include/arch/riscv64/opensslconf.h >> opensslconf.h
-cp $(top_srcdir)/include/arch/riscv64/opensslconf.h opensslconf.h
endif
if HOST_SPARC64
-cat $(top_srcdir)/include/arch/sparc64/opensslconf.h >> opensslconf.h
-cp $(top_srcdir)/include/arch/sparc64/opensslconf.h opensslconf.h
endif
if HOST_X86_64
-cat $(top_srcdir)/include/arch/amd64/opensslconf.h >> opensslconf.h
-cp $(top_srcdir)/include/arch/amd64/opensslconf.h opensslconf.h
endif
opensslinclude_HEADERS = opensslconf.h

15
include/openssl/opensslconf.h.in
View File

@@ -1,15 +0,0 @@
#if defined(_MSC_VER) && !defined(__clang__) && !defined(__attribute__)
#define __attribute__(a)
#endif
#if defined(LIBRESSL_INTERNAL) && !defined(LIBRESSL_NAMESPACE)
# define LCRYPTO_UNUSED(x)
# define LCRYPTO_USED(x)
# define LCRYPTO_ALIAS1(pre, x)
# define LCRYPTO_ALIAS(x)
# define LSSL_UNUSED(x)
# define LSSL_USED(x)
# define LSSL_ALIAS(x)
#endif /* LIBRESSL_INTERNAL && !LIBRESSL_NAMESPACE */