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

newer openssl, install fewer things and use curl

Browse Source
This commit is contained in:
Klas Lindfors
2014-10-30 14:26:13 +01:00
parent a4235e9575
commit d10d5da6c0
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
windows.mk
+4 -2
View File
@@ -25,7 +25,7 @@
# for the parts of OpenSSL used as well as that of the covered work. # for the parts of OpenSSL used as well as that of the covered work.
PACKAGE=yubico-piv-tool PACKAGE=yubico-piv-tool
OPENSSLVERSION=1.0.1i OPENSSLVERSION=1.0.1j
all: usage 32bit 64bit all: usage 32bit 64bit
@@ -43,12 +43,14 @@ doit:
rm -rf tmp$(ARCH) && mkdir tmp$(ARCH) && cd tmp$(ARCH) && \ rm -rf tmp$(ARCH) && mkdir tmp$(ARCH) && cd tmp$(ARCH) && \
mkdir -p root/licenses && \ mkdir -p root/licenses && \
cp ../openssl-$(OPENSSLVERSION).tar.gz . || \ cp ../openssl-$(OPENSSLVERSION).tar.gz . || \
wget --no-check-certificate "https://www.openssl.org/source/openssl-$(OPENSSLVERSION).tar.gz" && \ curl -L -O "https://www.openssl.org/source/openssl-$(OPENSSLVERSION).tar.gz" && \
tar xfa openssl-$(OPENSSLVERSION).tar.gz && \ tar xfa openssl-$(OPENSSLVERSION).tar.gz && \
cd openssl-$(OPENSSLVERSION) && \ cd openssl-$(OPENSSLVERSION) && \
CROSS_COMPILE="$(HOST)-" ./Configure mingw64 no-asm shared --prefix=$(PWD)/tmp$(ARCH)/root -static-libgcc && \ CROSS_COMPILE="$(HOST)-" ./Configure mingw64 no-asm shared --prefix=$(PWD)/tmp$(ARCH)/root -static-libgcc && \
make all install_sw && \ make all install_sw && \
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/lib/engines/ && \
cd .. && \ cd .. && \
cp ../$(PACKAGE)-$(VERSION).tar.gz . && \ cp ../$(PACKAGE)-$(VERSION).tar.gz . && \
tar xfa $(PACKAGE)-$(VERSION).tar.gz && \ tar xfa $(PACKAGE)-$(VERSION).tar.gz && \