Tryign somehting here

Author: Arun Veluri

tools/extra_ios_libs/crt1.3.1.o

@@ -2,6 +2,8 @@
 
 TOOLS_ROOT=`pwd`
 
+export ANDROID_NDK="/Users/arun/workspace/ndk/android-ndk-r15c"
+
 #
 # Warning !!! Android Build !!!
 #
@@ -27,8 +29,15 @@ TOOLS_ROOT=`pwd`
  ANDROID_API=${ANDROID_API:-21}
  ARCHS=("android" "android-armeabi" "android64-aarch64" "android-x86" "android64" "android-mips" "android-mips64")
  ABIS=("armeabi" "armeabi-v7a" "arm64-v8a" "x86" "x86_64" "mips" "mips64")
+#NDK=${ANDROID_NDK}
 NDK=${ANDROID_NDK}
 
+CURL_LIB_VERSION="7.58.0"
+OPENSSL_LIB_VERSION="1.1.0f"
+
+OPENSSL_VERSION="openssl-$OPENSSL_LIB_VERSION"
+CURL_VERSION="curl-$CURL_LIB_VERSION"
+
 configure() {
   ARCH=$1; OUT=$2; CLANG=${3:-""};
 
@@ -119,3 +128,33 @@ configure() {
   echo "export LIBS=${LIBS}"
   echo "**********************************************"
 }
+
+downloadOpensslTar ()
+{
+	rm -rf "${OPENSSL_VERSION}"
+
+	if [ ! -e ${OPENSSL_VERSION}.tar.gz ]; then
+		echo "Downloading ${OPENSSL_VERSION}.tar.gz"
+		curl -LO https://www.openssl.org/source/${OPENSSL_VERSION}.tar.gz
+	else
+		echo "Using ${OPENSSL_VERSION}.tar.gz"
+	fi
+
+	echo "Unpacking openssl"
+	tar xfz "${OPENSSL_VERSION}.tar.gz"
+}
+
+downloadCurlTar()
+{
+	rm -rf "${CURL_VERSION}"
+
+	if [ ! -e ${CURL_VERSION}.tar.gz ]; then
+		echo "Downloading ${CURL_VERSION}.tar.gz"
+		curl -LO https://curl.haxx.se/download/${CURL_VERSION}.tar.gz
+	else
+		echo "Using ${CURL_VERSION}.tar.gz"
+	fi
+
+	echo "Unpacking CURL"
+	tar xvf "${CURL_VERSION}.tar.gz"
+}

tools/_shared.sh renamed to tools/original/_shared.sh

@@ -21,7 +21,9 @@ source ./_shared.sh cURL
 # Setup architectures, library name and other vars + cleanup from previous runs
 TOOLS_ROOT=`pwd`
 #LIB_NAME="curl-7.54.1"
-LIB_NAME="curl-7.49.1"
+#LIB_NAME="curl-7.49.1"
+LIB_NAME=$CURL_LIB_VERSION
+#LIB_NAME="curl-7.49.1"
 LIB_DEST_DIR=${TOOLS_ROOT}/libs
 [ -f ${LIB_NAME}.tar.gz ] || wget https://curl.haxx.se/download/${LIB_NAME}.tar.gz
 # Unarchive library, then configure and make for specified architectures

tools/build-curl4android.sh renamed to tools/original/build-curl4android.sh

@@ -16,6 +16,8 @@
 
 set -u
 
+source ./_shared.sh
+
 SOURCE="$0"
 while [ -h "$SOURCE" ]; do
     DIR="$( cd -P "$( dirname "$SOURCE" )" && pwd )"
@@ -29,19 +31,26 @@ pwd_path="$( cd -P "$( dirname "$SOURCE" )" && pwd )"
 ARCHS=("arm64" "armv7s" "armv7" "i386" "x86_64")
 SDKS=("iphoneos" "iphoneos" "iphoneos" "iphonesimulator" "iphonesimulator")
 PLATFORMS=("iPhoneOS" "iPhoneOS" "iPhoneOS" "iPhoneSimulator" "iPhoneSimulator")
-LIB_NAME="curl-7.53.1"
+#LIB_NAME="curl-7.53.1"
+LIB_NAME=$CURL_VERSION
 DEVELOPER=`xcode-select -print-path`
 TOOLCHAIN=/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain
 # If you can't compile with this version, please modify the version to it which on your mac.
-SDK_VERSION=""10.3""
-IPHONEOS_DEPLOYMENT_TARGET="6.0"
+#SDK_VERSION=""10.3""
+SDK_VERSION=""
+IPHONEOS_DEPLOYMENT_TARGET="9.0"
 LIB_DEST_DIR="${pwd_path}/../output/ios/curl-universal"
 HEADER_DEST_DIR="include"
 rm -rf "${HEADER_DEST_DIR}" "${LIB_DEST_DIR}" "${LIB_NAME}"
+#--with-ssl=${OPENSSL}/Mac
+OPENSSL_DIR="${PWD}/../output/ios/openssl"
+#HOST="x86_64-apple-darwin"
 
 # Unarchive library, then configure and make for specified architectures
 configure_make()
 {
+	downloadCurlTar;
+
    ARCH=$1; SDK=$2; PLATFORM=$3;
 
    export PATH="${TOOLCHAIN}/usr/bin:${PATH}"
@@ -69,15 +78,20 @@ configure_make()
    else
        HOST="--host=${ARCH}-apple-darwin"
    fi
-   ./configure --prefix=${PREFIX_DIR} \
-       --with-sysroot=${CROSS_TOP}/SDKs/${CROSS_SDK} \
-       ${HOST} \
-       --with-darwinssl \
-       --enable-static \
-       --disable-shared \
-       --disable-verbose \
-       --enable-threaded-resolver \
-       --enable-ipv6
+   OPENSSL_PATH="${OPENSSL_DIR}-${ARCH}"
+   ./configure -prefix="${PREFIX_DIR}" -disable-shared --enable-static -with-random=/dev/urandom --with-ssl=${OPENSSL_PATH} --host=${HOST}	\
+		--with-sysroot=${CROSS_TOP}/SDKs/${CROSS_SDK}	${HOST}
+
+   #./configure --prefix=${PREFIX_DIR} \
+       #--with-sysroot=${CROSS_TOP}/SDKs/${CROSS_SDK} \
+       #${HOST} \
+       ##--with-darwinssl \
+       #--enable-static \
+       #-disable-shared \
+       #--disable-verbose \
+       #--enable-threaded-resolver \
+       #--enable-ipv6	\
+	   #--with-ssl=${OPENSSL_DIR}-${ARCH}/lib
    make clean
    if make -j8
    then

tools/build-curl4ios.sh renamed to tools/original/build-curl4ios.sh

@@ -20,12 +20,14 @@ source ./_shared.sh
 
 # Setup architectures, library name and other vars + cleanup from previous runs
 #LIB_NAME="openssl-1.1.0f"
-LIB_NAME="openssl-1.0.2h"
+#LIB_NAME="openssl-1.0.2h"
+LIB_NAME=$OPENSSL_LIB_VERSION
 LIB_DEST_DIR=${TOOLS_ROOT}/libs
 [ -d ${LIB_DEST_DIR} ] && rm -rf ${LIB_DEST_DIR}
 [ -f "${LIB_NAME}.tar.gz" ] || wget https://www.openssl.org/source/${LIB_NAME}.tar.gz;
 # Unarchive library, then configure and make for specified architectures
 configure_make() {
+  downloadOpensslTar;
   ARCH=$1; ABI=$2;
   rm -rf "${LIB_NAME}"
   tar xfz "${LIB_NAME}.tar.gz"

tools/build-openssl4android.sh renamed to tools/original/build-openssl4android.sh

@@ -16,6 +16,8 @@
 
 set -u
 
+source ./_shared.sh
+
 SOURCE="$0"
 while [ -h "$SOURCE" ]; do
     DIR="$( cd -P "$( dirname "$SOURCE" )" && pwd )"
@@ -30,15 +32,20 @@ SDKS=("iphoneos" "iphoneos" "iphoneos" "iphonesimulator" "iphonesimulator")
 PLATFORMS=("iPhoneOS" "iPhoneOS" "iPhoneOS" "iPhoneSimulator" "iPhoneSimulator")
 DEVELOPER=`xcode-select -print-path`
 # If you can't compile with this version, please modify the version to it which on your mac.
-SDK_VERSION=""10.3""
-LIB_NAME="openssl-1.1.0f"
+#SDK_VERSION=""10.3""
+SDK_VERSION=""
+#LIB_NAME="openssl-1.1.0f"
+LIB_NAME=$OPENSSL_VERSION
 LIB_DEST_DIR="${pwd_path}/../output/ios/openssl-universal"
 HEADER_DEST_DIR="include"
 rm -rf "${HEADER_DEST_DIR}" "${LIB_DEST_DIR}" "${LIB_NAME}"
+
 
 # Unarchive library, then configure and make for specified architectures
 configure_make()
 {
+   downloadOpensslTar;
+
    ARCH=$1; SDK=$2; PLATFORM=$3;
    if [ -d "${LIB_NAME}" ]; then
        rm -fr "${LIB_NAME}"