From: Markham <markham001@gmx.de>
Date: Sun, 15 Nov 2015 15:30:00 +0000 (+0100)
Subject: update target openssl
X-Git-Url: https://git.webhop.me/?a=commitdiff_plain;h=2883c6e8988aa86c19f1d451e6029f5c84bbc827;p=bs-cst-neutrino-hd.git

update target openssl

use openssl-0.9.8 for nevis
and openssl-1.0.x for kronos, apollo
---

diff --git a/Makefile b/Makefile
index 8b66eb4..324b02d 100755
--- a/Makefile
+++ b/Makefile
@@ -2,8 +2,8 @@ SHELL := /bin/bash
 
 # master makefile
 
-include make/versions.mk
 include make/environment.mk
+include make/versions.mk
 include make/prerequisites.mk
 include make/bootstrap.mk
 include make/crosstool.mk
diff --git a/make/archives.mk b/make/archives.mk
index bb31b65..fe98bd9 100755
--- a/make/archives.mk
+++ b/make/archives.mk
@@ -45,8 +45,8 @@ $(ARCHIVE)/libbluray-0.5.0.tar.bz2:
 $(ARCHIVE)/libsigc++-2.3.1.tar.xz:
 	$(WGET) http://www.fhloston-paradise.de/libsigc++-2.3.1.tar.xz
 
-$(ARCHIVE)/openssl-1.0.1f.tar.gz:
-	$(WGET) http://www.fhloston-paradise.de/openssl-1.0.1f.tar.gz
+$(ARCHIVE)/openssl-$(OPENSSL_VER)$(OPENSSL_SUBVER).tar.gz:
+	$(WGET) http://www.openssl.org/source/openssl-$(OPENSSL_VER)$(OPENSSL_SUBVER).tar.gz
 
 $(ARCHIVE)/libogg-1.3.1.tar.gz:
 	$(WGET) http://www.fhloston-paradise.de/libogg-1.3.1.tar.gz
diff --git a/make/libraries.mk b/make/libraries.mk
index 03bf32b..0c77b15 100755
--- a/make/libraries.mk
+++ b/make/libraries.mk
@@ -112,9 +112,9 @@ $(D)/libungif: $(ARCHIVE)/libungif-4.1.4.tar.bz2 | $(TARGETPREFIX)
 	$(REMOVE)/libungif-4.1.4
 	touch $@
 
-$(D)/openssl: $(ARCHIVE)/openssl-1.0.1f.tar.gz | $(TARGETPREFIX)
-	$(UNTAR)/openssl-1.0.1f.tar.gz
-	pushd $(BUILD_TMP)/openssl-1.0.1f && \
+$(D)/openssl: $(ARCHIVE)/openssl-$(OPENSSL_VER)$(OPENSSL_SUBVER).tar.gz | $(TARGETPREFIX)
+	$(UNTAR)/openssl-$(OPENSSL_VER)$(OPENSSL_SUBVER).tar.gz
+	pushd $(BUILD_TMP)/openssl-$(OPENSSL_VER)$(OPENSSL_SUBVER) && \
 		CC=$(TARGET)-gcc \
 		./Configure shared no-hw no-engine linux-generic32 --prefix=/ --openssldir=/.remove && \
 		$(MAKE) all && \
@@ -123,13 +123,22 @@ $(D)/openssl: $(ARCHIVE)/openssl-1.0.1f.tar.gz | $(TARGETPREFIX)
 	$(REWRITE_PKGCONF) $(PKG_CONFIG_PATH)/libcrypto.pc
 	$(REWRITE_PKGCONF) $(PKG_CONFIG_PATH)/libssl.pc
 	rm -r $(TARGETPREFIX)/.remove $(TARGETPREFIX)/bin/openssl $(TARGETPREFIX)/bin/c_rehash
-	$(REMOVE)/openssl-1.0.1f
+	$(REMOVE)/openssl-$(OPENSSL_VER)$(OPENSSL_SUBVER)
 	pushd $(TARGETPREFIX)/lib && \
-	ln -sf libcrypto.so.1.0.0 libcrypto.so.0 && \
-	ln -sf libcrypto.so.1.0.0 libcrypto.so.0.9.8 && \
-	ln -sf libcrypto.so.1.0.0 libcrypto.so.0.9.7 && \
-	ln -sf libssl.so.1.0.0 libssl.so.0.9.8 && \
-	ln -sf libssl.so.1.0.0 libssl.so.0.9.7 && \
+		if [ "$(OPENSSL_VER)" = "1.0.1" -o "$(OPENSSL_VER)" = "1.0.2" ]; then \
+			OPENSSL_VER_X=1.0.0; \
+		else \
+			OPENSSL_VER_X=$(OPENSSL_VER); \
+		fi; \
+		ln -sf libcrypto.so.$$OPENSSL_VER_X libcrypto.so.0.9.7; \
+		ln -sf libssl.so.$$OPENSSL_VER_X libssl.so.0.9.7; \
+		if [ ! "$(OPENSSL_VER)" = "0.9.8" ]; then \
+			ln -sf libcrypto.so.$$OPENSSL_VER_X libcrypto.so.0.9.8; \
+			ln -sf libssl.so.$$OPENSSL_VER_X libssl.so.0.9.8; \
+		else \
+			ln -sf libcrypto.so.$$OPENSSL_VER_X libcrypto.so.1.0.0; \
+			ln -sf libssl.so.$$OPENSSL_VER_X libssl.so.1.0.0; \
+		fi;
 	chmod 0755 $(TARGETPREFIX)/lib/libcrypto.so.* $(TARGETPREFIX)/lib/libssl.so.*
 	touch $@
 
diff --git a/make/versions.mk b/make/versions.mk
index 2a2f9a9..c6eda88 100644
--- a/make/versions.mk
+++ b/make/versions.mk
@@ -21,6 +21,15 @@ LUA_VER=$(LUA_ABIVER).3
 
 LUACURL_VER=v3
 
+# openssl; toolkit for the SSL v2/v3 and TLS v1 protocol
+ifeq ($(PLATFORM), nevis)
+OPENSSL_VER=0.9.8
+OPENSSL_SUBVER=zg
+else
+OPENSSL_VER=1.0.2
+OPENSSL_SUBVER=d
+endif
+
 # pkg-config; a helper tool used when compiling applications and libraries to insert the correct compiler options
 PKGCONFIG_VER=0.28