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

build crypto_lock_win.c in-place

Browse Source
This commit is contained in:
Brent Cook 2019-01-01 08:06:20 -06:00
parent 20503fd6ac
commit 0f0bec5a76
3 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
crypto/CMakeLists.txt
View File

@ -669,7 +669,7 @@ if(UNIX)
endif() endif()
if(WIN32) if(WIN32)
set(CRYPTO_SRC ${CRYPTO_SRC} crypto_lock_win.c) set(CRYPTO_SRC ${CRYPTO_SRC} compat/crypto_lock_win.c)
set(CRYPTO_SRC ${CRYPTO_SRC} bio/b_win.c) set(CRYPTO_SRC ${CRYPTO_SRC} bio/b_win.c)
set(CRYPTO_UNEXPORT ${CRYPTO_UNEXPORT} BIO_s_log) set(CRYPTO_UNEXPORT ${CRYPTO_UNEXPORT} BIO_s_log)
set(CRYPTO_SRC ${CRYPTO_SRC} ui/ui_openssl_win.c) set(CRYPTO_SRC ${CRYPTO_SRC} ui/ui_openssl_win.c)

2
crypto/Makefile.am
View File

@ -216,7 +216,7 @@ libcrypto_la_SOURCES += crypto_init.c
if !HOST_WIN if !HOST_WIN
libcrypto_la_SOURCES += crypto_lock.c libcrypto_la_SOURCES += crypto_lock.c
else else
libcrypto_la_SOURCES += crypto_lock_win.c libcrypto_la_SOURCES += compat/crypto_lock_win.c
endif endif
libcrypto_la_SOURCES += cversion.c libcrypto_la_SOURCES += cversion.c
libcrypto_la_SOURCES += ex_data.c libcrypto_la_SOURCES += ex_data.c

1
update.sh
View File

@ -154,7 +154,6 @@ for i in `awk '/SOURCES|HEADERS/ { print $3 }' crypto/Makefile.am` ; do
fi fi
done done
$CP crypto/compat/b_win.c crypto/bio $CP crypto/compat/b_win.c crypto/bio
$CP crypto/compat/crypto_lock_win.c crypto
$CP crypto/compat/ui_openssl_win.c crypto/ui $CP crypto/compat/ui_openssl_win.c crypto/ui
# add the libcrypto symbol export list # add the libcrypto symbol export list
$GREP -v OPENSSL_ia32cap_P $libcrypto_src/Symbols.list | $GREP '^[A-Za-z0-9_]' > crypto/crypto.sym $GREP -v OPENSSL_ia32cap_P $libcrypto_src/Symbols.list | $GREP '^[A-Za-z0-9_]' > crypto/crypto.sym