diff options
author | Brent Cook <busterb@gmail.com> | 2023-02-28 01:51:41 -0600 |
---|---|---|
committer | Brent Cook <busterb@gmail.com> | 2023-02-28 01:51:41 -0600 |
commit | b98c56fd5e86fa76eb55a98a2266a923f64f705c (patch) | |
tree | abfc4a6ae7db1cc78e3f9c530bead5ad353dc3aa /ssl | |
parent | 65af3925dcb7fc84000cedc373d5f84db3fc3265 (diff) | |
download | portable-b98c56fd5e86fa76eb55a98a2266a923f64f705c.tar.gz portable-b98c56fd5e86fa76eb55a98a2266a923f64f705c.tar.bz2 portable-b98c56fd5e86fa76eb55a98a2266a923f64f705c.zip |
stop exposing hidden defines in public opensslconf.h
pull in hidden headers instead, patching drectly for Windows support
Diffstat (limited to 'ssl')
-rw-r--r-- | ssl/CMakeLists.txt | 3 | ||||
-rw-r--r-- | ssl/Makefile.am | 1 |
2 files changed, 3 insertions, 1 deletions
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( | |||
64 | add_library(ssl_obj OBJECT ${SSL_SRC}) | 64 | add_library(ssl_obj OBJECT ${SSL_SRC}) |
65 | target_include_directories(ssl_obj | 65 | target_include_directories(ssl_obj |
66 | PRIVATE | 66 | PRIVATE |
67 | ../crypto/bio | ||
68 | . | 67 | . |
68 | hidden | ||
69 | ../crypto/bio | ||
69 | ../include/compat | 70 | ../include/compat |
70 | PUBLIC | 71 | PUBLIC |
71 | ../include) | 72 | ../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 | |||
31 | -$(AR) dv $(abs_top_builddir)/ssl/.libs/libssl.a \ | 31 | -$(AR) dv $(abs_top_builddir)/ssl/.libs/libssl.a \ |
32 | bs_ber.o bs_cbb.o bs_cbs.o | 32 | bs_ber.o bs_cbb.o bs_cbs.o |
33 | 33 | ||
34 | libssl_la_CPPFLAGS = -I$(top_srcdir)/ssl/hidden ${AM_CPPFLAGS} | ||
34 | libssl_la_LDFLAGS = -version-info @LIBSSL_VERSION@ -no-undefined -export-symbols $(top_srcdir)/ssl/ssl.sym | 35 | libssl_la_LDFLAGS = -version-info @LIBSSL_VERSION@ -no-undefined -export-symbols $(top_srcdir)/ssl/ssl.sym |
35 | libssl_la_LIBADD = $(abs_top_builddir)/crypto/libcrypto.la $(PLATFORM_LDADD) | 36 | libssl_la_LIBADD = $(abs_top_builddir)/crypto/libcrypto.la $(PLATFORM_LDADD) |
36 | libssl_la_LIBADD += libbs.la | 37 | libssl_la_LIBADD += libbs.la |