From c1a500fce4feebb948e2d9809aa7d545c72b650f Mon Sep 17 00:00:00 2001 From: Trevor Bentley Date: Mon, 27 Nov 2017 13:02:19 +0100 Subject: [PATCH] Build with correct OpenSSL version number on Mac and mingw32/64 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. --- mac.mk | 2 +- windows.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/mac.mk b/mac.mk index 7fff5da..ac342bd 100644 --- a/mac.mk +++ b/mac.mk @@ -49,7 +49,7 @@ doit: tar xfz openssl-$(OPENSSLVERSION).tar.gz && \ cd openssl-$(OPENSSLVERSION) && \ ./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 && \ rm -rf $(PWD)/tmp/root/ssl/ && \ rm -rf $(PWD)/tmp/root/bin/ && \ diff --git a/windows.mk b/windows.mk index 5dfc9db..b5b9b06 100644 --- a/windows.mk +++ b/windows.mk @@ -49,7 +49,7 @@ doit: tar xfa openssl-$(OPENSSLVERSION).tar.gz && \ cd openssl-$(OPENSSLVERSION) && \ 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 && \ rm -rf $(PWD)/tmp$(ARCH)/root/ssl/ && \ rm $(PWD)/tmp$(ARCH)/root/bin/openssl.exe && \