From de38c5b179d213a6a4d7574f9b6e6746da6de6d4 Mon Sep 17 00:00:00 2001 From: Brent Cook Date: Sun, 18 May 2025 18:01:45 +0900 Subject: experiment with removing BIO_s_log in advance of upstream removal --- crypto/CMakeLists.txt | 4 ++-- crypto/Makefile.am | 5 ----- 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/crypto/CMakeLists.txt b/crypto/CMakeLists.txt index 64bccd8..b898296 100644 --- a/crypto/CMakeLists.txt +++ b/crypto/CMakeLists.txt @@ -570,17 +570,17 @@ set( set(COMPAT_SRC empty.c) +set(CRYPTO_UNEXPORT ${CRYPTO_UNEXPORT} BIO_s_log) + if(UNIX) set(CRYPTO_SRC ${CRYPTO_SRC} crypto_lock.c) set(CRYPTO_SRC ${CRYPTO_SRC} bio/b_posix.c) - set(CRYPTO_SRC ${CRYPTO_SRC} bio/bss_log.c) set(CRYPTO_SRC ${CRYPTO_SRC} ui/ui_openssl.c) endif() if(WIN32) set(CRYPTO_SRC ${CRYPTO_SRC} compat/crypto_lock_win.c) set(CRYPTO_SRC ${CRYPTO_SRC} bio/b_win.c) - set(CRYPTO_UNEXPORT ${CRYPTO_UNEXPORT} BIO_s_log) set(CRYPTO_SRC ${CRYPTO_SRC} ui/ui_openssl_win.c) endif() diff --git a/crypto/Makefile.am b/crypto/Makefile.am index d1c5b76..b8628f0 100644 --- a/crypto/Makefile.am +++ b/crypto/Makefile.am @@ -51,10 +51,8 @@ crypto_portable.sym: crypto.sym Makefile -echo "generating crypto_portable.sym ..." -cp $(top_srcdir)/crypto/crypto.sym crypto_portable.sym -chmod u+w crypto_portable.sym -if HOST_WIN -grep -v BIO_s_log crypto_portable.sym > crypto_portable.sym.tmp -mv crypto_portable.sym.tmp crypto_portable.sym -endif libcrypto_la_objects.mk: Makefile @echo "libcrypto_la_objects= $(libcrypto_la_OBJECTS)" \ @@ -334,9 +332,6 @@ libcrypto_la_SOURCES += bio/bss_conn.c libcrypto_la_SOURCES += bio/bss_dgram.c libcrypto_la_SOURCES += bio/bss_fd.c libcrypto_la_SOURCES += bio/bss_file.c -if !HOST_WIN -libcrypto_la_SOURCES += bio/bss_log.c -endif libcrypto_la_SOURCES += bio/bss_mem.c libcrypto_la_SOURCES += bio/bss_null.c libcrypto_la_SOURCES += bio/bss_sock.c -- cgit v1.2.3-55-g6feb