From 03b648cf1b18c30eb9f79b58119792410a000139 Mon Sep 17 00:00:00 2001 From: gpongelli Date: Tue, 11 Aug 2015 20:19:00 +0200 Subject: [PATCH] Added configuration option variable. Added "make depend", to be run when disabling algorithms and "install_sw" to install only software without docs. --- build-libssl.sh | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/build-libssl.sh b/build-libssl.sh index f463b1d..1c77d0d 100755 --- a/build-libssl.sh +++ b/build-libssl.sh @@ -23,6 +23,7 @@ # VERSION="1.0.2d" # SDKVERSION=`xcrun -sdk iphoneos --show-sdk-version` # +CONFIG_OPTIONS="" # # ########################################################################### # # @@ -103,10 +104,10 @@ do set +e if [ "${ARCH}" == "x86_64" ]; then - ./Configure no-asm darwin64-x86_64-cc --openssldir="${CURRENTPATH}/bin/${PLATFORM}${SDKVERSION}-${ARCH}.sdk" > "${LOG}" 2>&1 - else - ./Configure iphoneos-cross --openssldir="${CURRENTPATH}/bin/${PLATFORM}${SDKVERSION}-${ARCH}.sdk" > "${LOG}" 2>&1 - fi + ./Configure no-asm darwin64-x86_64-cc --openssldir="${CURRENTPATH}/bin/${PLATFORM}${SDKVERSION}-${ARCH}.sdk" ${CONFIG_OPTIONS} > "${LOG}" 2>&1 + else + ./Configure iphoneos-cross --openssldir="${CURRENTPATH}/bin/${PLATFORM}${SDKVERSION}-${ARCH}.sdk" ${CONFIG_OPTIONS} > "${LOG}" 2>&1 + fi if [ $? != 0 ]; then @@ -119,8 +120,10 @@ do if [ "$1" == "verbose" ]; then + make depend make else + make depend >> "${LOG}" 2>&1 make >> "${LOG}" 2>&1 fi @@ -131,7 +134,7 @@ do fi set -e - make install >> "${LOG}" 2>&1 + make install_sw >> "${LOG}" 2>&1 make clean >> "${LOG}" 2>&1 done