- rework openssl target

archive-patches/openssl-add-ni-specific-target.patch

@@ -0,0 +1,25 @@
+From b45d7f3d60560fc01211645d63c100e52f522668 Mon Sep 17 00:00:00 2001
+Message-Id: <b45d7f3d60560fc01211645d63c100e52f522668.1504716870.git.thomas.harfmann@gmail.com>
+From: gixxpunk <thomas.harfmann@gmail.com>
+Date: Wed, 6 Sep 2017 18:54:23 +0200
+Subject: [PATCH] - add ni-specific target
+
+---
+ Configure | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/Configure b/Configure
+index fd7988e..a951b3a 100755
+--- a/Configure
++++ b/Configure
+@@ -406,6 +406,7 @@ my %table=(
+ #
+ "linux-armv4",	"gcc: -O3 -Wall::-D_REENTRANT::-ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_INT DES_UNROLL BF_PTR:${armv4_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+ "linux-aarch64","gcc: -O3 -Wall::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_INT DES_UNROLL BF_PTR:${aarch64_asm}:linux64:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
++"linux-armv4-ni","gcc:-DTERMIOS \$(NI_OPTIMIZATION_FLAGS) -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_INT DES_UNROLL BF_PTR:${armv4_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+ # Configure script adds minimally required -march for assembly support,
+ # if no -march was specified at command line. mips32 and mips64 below
+ # refer to contemporary MIPS Architecture specifications, MIPS32 and
+-- 
+2.11.0
+

make/system-libs.mk

@@ -193,24 +193,40 @@ $(D)/libjpeg: $(ARCHIVE)/libjpeg-turbo-$(LIBJPEG-TURBO_VER).tar.gz | $(TARGETPRE
 	$(REMOVE)/libjpeg-turbo-$(LIBJPEG-TURBO_VER)
 	touch $@
 
-OPENSSLFLAGS = CC=$(TARGET)-gcc LD=$(TARGET)-ld AR="$(TARGET)-ar r" RANLIB=$(TARGET)-ranlib MAKEDEPPROG=$(TARGET)-gcc PROCESSOR=ARM
+OPENSSLFLAGS = CC=$(TARGET)-gcc \
-$(D)/openssl: $(ARCHIVE)/openssl-$(OPENSSL_VER).tar.gz | $(TARGETPREFIX)
+		LD=$(TARGET)-ld \
+		AR="$(TARGET)-ar r" \
+		RANLIB=$(TARGET)-ranlib \
+		MAKEDEPPROG=$(TARGET)-gcc \
+		NI_OPTIMIZATION_FLAGS="$(TARGET_CFLAGS)" \
+		PROCESSOR=ARM
+
+OPENSSL_NI_FLAVOR = linux-armv4-ni -march=armv7-a -mcpu=cortex-a9 -mtune=cortex-a9 -mfpu=vfpv3-d16 -mfloat-abi=hard -mlittle-endian
+ifeq ($(BOXSERIES), hd1)
+	OPENSSL_NI_FLAVOR = linux-armv4-ni -march=armv6 -mfloat-abi=soft -mlittle-endian
+endif
+
+$(D)/openssl: $(D)/zlib $(ARCHIVE)/openssl-$(OPENSSL_VER).tar.gz | $(TARGETPREFIX)
 	$(UNTAR)/openssl-$(OPENSSL_VER).tar.gz
 	pushd $(BUILD_TMP)/openssl-$(OPENSSL_VER) && \
-		$(OPENSSLFLAGS) \
+	$(PATCH)/openssl-add-ni-specific-target.patch && \
 		./Configure \
-			linux-armv4 \
+			$(OPENSSL_NI_FLAVOR) \
 			shared \
+			zlib \
+			threads \
 			no-hw \
 			no-engine \
 			no-sse2 \
+			no-perlasm \
+			$(TARGET_CPPFLAGS) \
+			$(TARGET_LDFLAGS) \
 			-DOPENSSL_SMALL_FOOTPRINT \
 			--prefix=/ \
 			--openssldir=/.remove && \
-		make depend $(OPENSSLFLAGS) && \
+		make $(OPENSSLFLAGS) depend && \
-		sed -i "s#-O[0-9]#$(TARGET_CFLAGS)#" Makefile && \
 		sed -i "s# build_tests##" Makefile && \
-		make all $(OPENSSLFLAGS) && \
+		make $(OPENSSLFLAGS) all && \
 		make install_sw INSTALL_PREFIX=$(TARGETPREFIX)
 	$(REWRITE_PKGCONF) $(PKG_CONFIG_PATH)/openssl.pc
 	$(REWRITE_PKGCONF) $(PKG_CONFIG_PATH)/libcrypto.pc