james/yubikey.rs
Public Access
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Build with correct OpenSSL version number on Mac and mingw32/64

Browse Source 
This is a cosmetic change.  OpenSSL picks up the VERSION environment variable
when building, which is set to the yubico-piv-tool version number during
Travis-CI builds.  This overrides it back to the OpenSSL version when building
OpenSSL.
This commit is contained in:
Trevor Bentley
2017-11-27 13:02:19 +01:00
parent 20a5ecce0f
commit c1a500fce4
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mac.mk
+1 -1
View File
@@ -49,7 +49,7 @@ doit:
tar xfz openssl-$(OPENSSLVERSION).tar.gz && \ tar xfz openssl-$(OPENSSLVERSION).tar.gz && \
cd openssl-$(OPENSSLVERSION) && \ cd openssl-$(OPENSSLVERSION) && \
./Configure darwin64-x86_64-cc shared no-ssl2 no-ssl3 no-engines --prefix=$(PWD)/tmp/root $(CFLAGS) && \ ./Configure darwin64-x86_64-cc shared no-ssl2 no-ssl3 no-engines --prefix=$(PWD)/tmp/root $(CFLAGS) && \
make all install_sw && \ make all install_sw VERSION="$(OPENSSLVERSION)" && \
cp LICENSE $(PWD)/tmp$(ARCH)/root/licenses/openssl.txt && \ cp LICENSE $(PWD)/tmp$(ARCH)/root/licenses/openssl.txt && \
rm -rf $(PWD)/tmp/root/ssl/ && \ rm -rf $(PWD)/tmp/root/ssl/ && \
rm -rf $(PWD)/tmp/root/bin/ && \ rm -rf $(PWD)/tmp/root/bin/ && \
windows.mk
+1 -1
View File
@@ -49,7 +49,7 @@ doit:
tar xfa openssl-$(OPENSSLVERSION).tar.gz && \ tar xfa openssl-$(OPENSSLVERSION).tar.gz && \
cd openssl-$(OPENSSLVERSION) && \ cd openssl-$(OPENSSLVERSION) && \
CROSS_COMPILE="$(HOST)-" ./Configure mingw$(64) no-ssl2 no-ssl3 no-engines shared --prefix=$(PWD)/tmp$(ARCH)/root -static-libgcc && \ CROSS_COMPILE="$(HOST)-" ./Configure mingw$(64) no-ssl2 no-ssl3 no-engines shared --prefix=$(PWD)/tmp$(ARCH)/root -static-libgcc && \
make depend all install_sw && \ make depend all install_sw VERSION="$(OPENSSLVERSION)" && \
cp LICENSE $(PWD)/tmp$(ARCH)/root/licenses/openssl.txt && \ cp LICENSE $(PWD)/tmp$(ARCH)/root/licenses/openssl.txt && \
rm -rf $(PWD)/tmp$(ARCH)/root/ssl/ && \ rm -rf $(PWD)/tmp$(ARCH)/root/ssl/ && \
rm $(PWD)/tmp$(ARCH)/root/bin/openssl.exe && \ rm $(PWD)/tmp$(ARCH)/root/bin/openssl.exe && \