Skip to content

Commit 131763e

Browse files
committed
Build against OpenSSL 3.5.x for both Windows and Linux. #326 #331
1 parent b223c59 commit 131763e

File tree

2 files changed

+6
-3
lines changed

2 files changed

+6
-3
lines changed

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,7 @@ uninstall:
141141
@true
142142

143143
opensslpull:
144-
upstream=`git ls-remote https://github.com/openssl/openssl | grep -Eo '(openssl-3\.0\.[0-9]+)' | sort -V | tail -n 1` ; \
144+
upstream=`git ls-remote https://github.com/openssl/openssl | grep -Eo '(openssl-3\.5\.[0-9]+)' | sort -V | tail -n 1` ; \
145145
if [ -d openssl -a -d openssl/.git ]; then \
146146
if [ "$$upstream" != "`cd ./openssl && git describe --exact-match --tags`" ]; then \
147147
cd ./openssl && git fetch --depth 1 origin refs/tags/$$upstream:refs/tags/$$upstream && git checkout $$upstream && touch ../.openssl.is.fresh ; \

Makefile.mingw

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -70,10 +70,13 @@ zlibpull:
7070
fi
7171

7272
opensslpull:
73+
upstream=`git ls-remote https://github.com/openssl/openssl | grep -Eo '(openssl-3\.5\.[0-9]+)' | sort -V | tail -n 1` ; \
7374
if [ -d openssl_mingw -a -d openssl_mingw/.git ]; then \
74-
cd ./openssl_mingw && git checkout `git ls-remote https://github.com/openssl/openssl | grep -Eo '(openssl-3\.0\.[0-9]+)' | sort --version-sort | tail -n 1` && git pull | grep -q "Already up-to-date." && [ -e ../.openssl_mingw.is.fresh ] || touch ../.openssl_mingw.is.fresh ; \
75+
if [ "$$upstream" != "`cd ./openssl_mingw && git describe --exact-match --tags`" ]; then \
76+
cd ./openssl_mingw && git fetch --depth 1 origin refs/tags/$$upstream:refs/tags/$$upstream && git checkout $$upstream && touch ../.openssl_mingw.is.fresh ; \
77+
fi \
7578
else \
76-
git clone --depth 1 -b `git ls-remote https://github.com/openssl/openssl | grep -Eo '(openssl-3\.0\.[0-9]+)' | sort --version-sort | tail -n 1` https://github.com/openssl/openssl ./openssl_mingw && cd ./openssl_mingw && touch ../.openssl_mingw.is.fresh ; \
79+
git clone --depth 1 -b $$upstream https://github.com/openssl/openssl ./openssl_mingw && cd ./openssl_mingw && touch ../.openssl_mingw.is.fresh ; \
7780
fi
7881

7982
zlib_mingw/libz.a: zlibpull

0 commit comments

Comments
 (0)