From f60b8d5e956e124808a6faa308b4bab6d121511c Mon Sep 17 00:00:00 2001
From: Armin Novak <armin.novak@gmail.com>
Date: Thu, 10 Mar 2016 22:07:30 +0100
Subject: [PATCH] Replaced version patch with make argument.

---
 scripts/android-build-openssl.sh              | 10 ++------
 .../openssl-disable-library-versioning.patch  | 24 -------------------
 2 files changed, 2 insertions(+), 32 deletions(-)
 delete mode 100644 scripts/openssl-disable-library-versioning.patch

diff --git a/scripts/android-build-openssl.sh b/scripts/android-build-openssl.sh
index 5e27ff7bf..3a36006ba 100755
--- a/scripts/android-build-openssl.sh
+++ b/scripts/android-build-openssl.sh
@@ -47,8 +47,8 @@ function build {
 	common_run cd $BUILD_SRC
 	common_run git clean -xdf
 	common_run ./Configure --openssldir=$DST_DIR $CONFIG shared
-	common_run make depend
-	common_run make build_libs
+	common_run make CALC_VERSIONS="SHLIB_COMPAT=; SHLIB_SOVER=" depend
+	common_run make CALC_VERSIONS="SHLIB_COMPAT=; SHLIB_SOVER=" build_libs
 
 	if [ ! -d $DST_DIR ];
 	then
@@ -66,12 +66,6 @@ common_check_requirements
 common_update $SCM_URL $SCM_TAG $BUILD_SRC
 common_clean $BUILD_DST
 
-# Patch openssl
-BASE=$(pwd)
-common_run cd $BUILD_SRC
-common_run git am $(dirname "${BASH_SOURCE[0]}")/openssl-disable-library-versioning.patch
-common_run cd $BASE
-
 ORG_PATH=$PATH
 for ARCH in $BUILD_ARCH
 do
diff --git a/scripts/openssl-disable-library-versioning.patch b/scripts/openssl-disable-library-versioning.patch
deleted file mode 100644
index 9f2f69107..000000000
--- a/scripts/openssl-disable-library-versioning.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From 12f0521bbb3f046db8c7854364135d8247cf982e Mon Sep 17 00:00:00 2001
-From: Armin Novak <armin.novak@thincast.com>
-Date: Fri, 29 Jan 2016 17:04:12 +0100
-Subject: [PATCH] Disabled library versioning.
-
----
- Makefile.shared | 1 -
- 1 file changed, 1 deletion(-)
-
-diff --git a/Makefile.shared b/Makefile.shared
-index e753f44..5cffcc2 100644
---- a/Makefile.shared
-+++ b/Makefile.shared
-@@ -81,7 +81,6 @@ CALC_VERSIONS=	\
- 		prev=""; \
- 		for v in `echo "$(LIBVERSION) $(LIBCOMPATVERSIONS)" | cut -d';' -f1`; do \
- 			SHLIB_SOVER_NODOT=$$v; \
--			SHLIB_SOVER=.$$v; \
- 			if [ -n "$$prev" ]; then \
- 				SHLIB_COMPAT="$$SHLIB_COMPAT .$$prev"; \
- 			fi; \
--- 
-2.1.4
-