From b98c56fd5e86fa76eb55a98a2266a923f64f705c Mon Sep 17 00:00:00 2001 From: Brent Cook Date: Tue, 28 Feb 2023 01:51:41 -0600 Subject: stop exposing hidden defines in public opensslconf.h pull in hidden headers instead, patching drectly for Windows support --- ssl/CMakeLists.txt | 3 ++- ssl/Makefile.am | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) (limited to 'ssl') diff --git a/ssl/CMakeLists.txt b/ssl/CMakeLists.txt index 173c3b5..f5d52f7 100644 --- a/ssl/CMakeLists.txt +++ b/ssl/CMakeLists.txt @@ -64,8 +64,9 @@ set( add_library(ssl_obj OBJECT ${SSL_SRC}) target_include_directories(ssl_obj PRIVATE - ../crypto/bio . + hidden + ../crypto/bio ../include/compat PUBLIC ../include) diff --git a/ssl/Makefile.am b/ssl/Makefile.am index a2155fb..d27e2af 100644 --- a/ssl/Makefile.am +++ b/ssl/Makefile.am @@ -31,6 +31,7 @@ remove_bs_objects: libssl.la -$(AR) dv $(abs_top_builddir)/ssl/.libs/libssl.a \ bs_ber.o bs_cbb.o bs_cbs.o +libssl_la_CPPFLAGS = -I$(top_srcdir)/ssl/hidden ${AM_CPPFLAGS} libssl_la_LDFLAGS = -version-info @LIBSSL_VERSION@ -no-undefined -export-symbols $(top_srcdir)/ssl/ssl.sym libssl_la_LIBADD = $(abs_top_builddir)/crypto/libcrypto.la $(PLATFORM_LDADD) libssl_la_LIBADD += libbs.la -- cgit v1.2.3-55-g6feb