openssl enable threads and rm no-deprecated option

Author: debugly

do-compile/android/openssl.sh

@@ -20,38 +20,46 @@
 # https://github.com/openssl/openssl/blob/master/NOTES-ANDROID.md
 # https://github.com/xbmc/xbmc/pull/25092/commits/494a452cd65abe1447771874cc79ed967015d944
 
+# no-deprecated, fix ffmepg compile error:
+# libavformat/tls_openssl.c:56:16: error: use of undeclared identifier 'CRYPTO_LOCK'; did you mean 'CRYPTO_free'?
+#     if (mode & CRYPTO_LOCK)
+#                ^~~~~~~~~~~
+#                CRYPTO_free
+
 set -e
 
 THIS_DIR=$(DIRNAME=$(dirname "$0"); cd "$DIRNAME"; pwd)
 cd "$THIS_DIR"
 
 case $_MR_ARCH in
     armv7a)
-    target=android-arm
+    os=android-arm
     ;;
     x86)
-    target=android-x86
+    os=android-x86
     ;;
     x86_64)
-    target=android-x86_64
+    os=android-x86_64
     ;;
     arm64)
-    target=android-arm64
+    os=android-arm64
     ;;
     *)
     echo "unknown architecture $_MR_ARCH";
     exit 1
     ;;
 esac
 
-# prepare build config
-CFG_FLAGS="no-threads enable-tls1_3 no-comp no-zlib no-zlib-dynamic no-deprecated \
-        no-shared no-filenames no-engine no-dynamic-engine no-static-engine \
-        no-dso no-err no-ui-console no-stdio no-tests \
+CFG_FLAGS="no-shared no-engine no-dynamic-engine no-static-engine \
+        no-dso no-ui-console no-tests \
         --prefix=$MR_BUILD_PREFIX \
         --openssldir=$MR_BUILD_PREFIX \
         -U__ANDROID_API__ -D__ANDROID_API__=$MR_ANDROID_API \
-        $target"
+        $os"
+
+if [[ "$MR_DEBUG" != "debug" ]]; then
+    CFG_FLAGS="$CFG_FLAGS --release"
+fi
 
 # -arch $MR_ARCH
 C_FLAGS="$MR_DEFAULT_CFLAGS"

do-compile/apple/openssl.sh

@@ -24,19 +24,31 @@ set -e
 THIS_DIR=$(DIRNAME=$(dirname "$0"); cd "$DIRNAME"; pwd)
 cd "$THIS_DIR"
 
-# prepare build config
-CFG_FLAGS="--prefix=$MR_BUILD_PREFIX --openssldir=$MR_BUILD_PREFIX no-shared no-hw no-engine no-asm"
-
 if [ "$MR_ARCH" = "x86_64" ]; then
-    CFG_FLAGS="$CFG_FLAGS darwin64-x86_64-cc enable-ec_nistp_64_gcc_128"
+    compiler="darwin64-x86_64-cc"
 elif [ "$MR_ARCH" = "arm64" ]; then
-    CFG_FLAGS="$CFG_FLAGS darwin64-arm64-cc enable-ec_nistp_64_gcc_128"
+    compiler="darwin64-arm64-cc"
 else
     echo "unknown architecture $FF_ARCH";
     exit 1
 fi
 
-CFLAGS="$MR_DEFAULT_CFLAGS"
+# no-hw no-asm
+
+CFG_FLAGS="no-shared no-engine no-dynamic-engine no-static-engine \
+        no-dso no-ui-console no-tests \
+        --prefix=$MR_BUILD_PREFIX \
+        --openssldir=$MR_BUILD_PREFIX \
+        enable-ec_nistp_64_gcc_128"
+
+if [[ "$MR_DEBUG" != "debug" ]]; then
+    CFG_FLAGS="$CFG_FLAGS --release"
+fi
+
+CFG_FLAGS="$CFG_FLAGS $compiler"
+
+# -arch $MR_ARCH
+C_FLAGS="$MR_DEFAULT_CFLAGS"
 
 # for cross compile
 if [[ $(uname -m) != "$MR_ARCH" || "$MR_FORCE_CROSS" ]];then
@@ -45,31 +57,28 @@ if [[ $(uname -m) != "$MR_ARCH" || "$MR_FORCE_CROSS" ]];then
     CFLAGS="$CFLAGS -isysroot $MR_SYS_ROOT"
 fi
 
-#----------------------
-echo "----------------------"
-echo "[*] configurate $LIB_NAME"
-echo "----------------------"
-
 cd $MR_BUILD_SOURCE
 if [ -f "./Makefile" ]; then
     echo 'reuse configure'
+    echo "----------------------"
+    echo "[*] reuse configurate"
 else
-    echo 
-    echo "CC: $MR_CC"
-    echo "CFLAGS: $CFLAGS"
+    echo "----------------------"
+    echo "[*] configurate"
+    echo "C_FLAGS: $C_FLAGS"
     echo "Openssl CFG: $CFG_FLAGS"
-    echo 
-    ./Configure $CFG_FLAGS \
-        CC="$MR_CC" \
-        CFLAGS="$CFLAGS" \
-        CXXFLAG="$CFLAGS"
+    echo "----------------------"
+
+    export C_FLAGS="$C_FLAGS"
+    export CXXFLAG="$C_FLAGS"
+    export CC="$MR_CC"
+    ./Configure $CFG_FLAGS
 fi
 
 #----------------------
 echo "----------------------"
 echo "[*] compile $LIB_NAME"
 echo "----------------------"
-set +e
 
 make build_libs -j$MR_HOST_NPROC >/dev/null
 make install_dev >/dev/null