From: Kevin Cernekee <cernekee@gmail.com>
Date: Sun, 28 Jan 2018 03:35:29 +0000 (-0800)
Subject: android: Drop OpenSSL support
X-Git-Tag: v8.00~126^2~9
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=68247c32c2e7b86b3673d1bbd524b9d9101013bf;p=users%2Fdwmw2%2Fopenconnect.git

android: Drop OpenSSL support

This is not used by default, and even the latest release (1.1.0g) has
trouble building under clang.

Signed-off-by: Kevin Cernekee <cernekee@gmail.com>
---

diff --git a/android/Makefile b/android/Makefile
index 1d65b67f..d9dfeb18 100644
--- a/android/Makefile
+++ b/android/Makefile
@@ -16,12 +16,10 @@ ARCH    := arm
 # You should be able to just 'make ARCH=x86' and it should DTRT.
 ifeq ($(ARCH),arm)
 TRIPLET := arm-linux-androideabi
-OPENSSL_TARGET := android-armv7
 EXTRA_CFLAGS := -march=armv7-a
 endif
 ifeq ($(ARCH),x86)
 TRIPLET := i686-linux-android
-OPENSSL_TARGET := android-x86
 endif
 
 TOPDIR := $(shell pwd)
@@ -53,7 +51,7 @@ SOURCE_LIST = $(LIBXML2_SRC)/configure $(GMP_SRC)/configure \
 	$(STOKEN_SRC)/configure $(OATH_SRC)/configure \
 	$(LZ4_DIR)/Makefile
 
-PKG_LIST := LIBXML2 OPENSSL GMP NETTLE GNUTLS STOKEN OATH LZ4
+PKG_LIST := LIBXML2 GMP NETTLE GNUTLS STOKEN OATH LZ4
 
 MIRROR_TEST_TARGETS := $(addprefix mirror-test-,$(PKG_LIST))
 
@@ -121,43 +119,6 @@ LIBXML_DEPS := $(OC_SYSROOT)/lib/libxml2.la $(OC_SYSROOT)/lib/pkgconfig/libxml-2
 libxml: $(LIBXML_DEPS)
 
 
-#####################################################################
-#
-# Build OpenSSL for Android
-#
-OPENSSL_VER := 1.0.1g
-OPENSSL_TAR := openssl-$(OPENSSL_VER).tar.gz
-OPENSSL_SHA := b28b3bcb1dc3ee7b55024c9f795be60eb3183e3c
-OPENSSL_DIR := $(TRIPLET)/openssl-$(OPENSSL_VER)
-
-$(OPENSSL_TAR):
-	$(FETCH) $@ $(OPENSSL_SHA)
-
-$(OPENSSL_DIR)/Configure: $(OPENSSL_TAR)
-	mkdir -p $(TRIPLET)
-	tar xfz $< -C $(TRIPLET)
-	touch $(OPENSSL_DIR)/Configure # Make sure it's newer than Makefile and tarball
-
-$(OPENSSL_DIR)/Makefile: $(TOOLCHAIN_BUILT) $(OPENSSL_DIR)/Configure
-	cd $(OPENSSL_DIR) && perl Configure --prefix=$(OC_SYSROOT) \
-		--cross-compile-prefix=$(TRIPLET)- no-shared \
-		$(OPENSSL_TARGET):gcc
-
-$(OPENSSL_DIR)/libssl.a: $(OPENSSL_DIR)/Makefile
-	$(MAKE) -C $(OPENSSL_DIR)
-
-$(OC_SYSROOT)/lib/libssl.a: $(OPENSSL_DIR)/libssl.a
-	# Do this manually instead of using 'make install' since we want symlinks
-	mkdir -p $(OC_SYSROOT)/include/openssl
-	ln -sf $(shell pwd)/$(OPENSSL_DIR)/include/openssl/*.h $(OC_SYSROOT)/include/openssl
-	mkdir -p $(OC_SYSROOT)/lib/pkgconfig
-	ln -sf $(shell pwd)/$(OPENSSL_DIR)/*.pc $(OC_SYSROOT)/lib/pkgconfig
-	ln -sf $(shell pwd)/$(OPENSSL_DIR)/*.a $(OC_SYSROOT)/lib
-
-OPENSSL_DEPS := $(OC_SYSROOT)/lib/libssl.a
-
-openssl: $(OPENSSL_DEPS)
-
 #####################################################################
 #
 # Build GNU MP
diff --git a/android/fetch.sh b/android/fetch.sh
index 574fe86c..91dd914a 100755
--- a/android/fetch.sh
+++ b/android/fetch.sh
@@ -21,11 +21,6 @@ libxml2_MIRROR_0=ftp://xmlsoft.org/libxml2
 libxml2_MIRROR_1=ftp://gd.tuwien.ac.at/pub/libxml
 libxml2_MIRROR_2=http://distfiles.macports.org/libxml2
 
-openssl_MIRROR_0=http://www.openssl.org/source
-openssl_MIRROR_1=http://mirror.switch.ch/ftp/mirror/openssl/source
-openssl_MIRROR_2=ftp://ftp.pca.dfn.de/pub/tools/net/openssl/source
-openssl_MIRROR_3=ftp://sunsite.uio.no/pub/security/openssl/source
-
 gmp_MIRROR_0=http://ftp.gnu.org/gnu/gmp
 gmp_MIRROR_1=ftp://ftp.gmplib.org/pub/gmp
 gmp_MIRROR_2=http://mirror.anl.gov/pub/gnu/gmp