passepartoutvpn
/
openssl-apple
mirror of https://github.com/passepartoutvpn/openssl-apple.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

No need for --async build option

This commit is contained in:
Andrew Herbert 2017-03-06 09:31:01 +11:00
parent ee1cea7cd4
commit addf784317
2 changed files with 4 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
build-libssl.sh
View File

@ -60,7 +60,6 @@ echo_help()
echo " Note: The framework will contain include files from the architecture listed first" echo " Note: The framework will contain include files from the architecture listed first"
echo echo
echo "Options for OpenSSL 1.1.0 and higher ONLY" echo "Options for OpenSSL 1.1.0 and higher ONLY"
echo " --async Exclude no-async configure option and build with async support - do not use if submitting to App Store"
echo " --deprecated Exclude no-deprecated configure option and build with deprecated methods" echo " --deprecated Exclude no-deprecated configure option and build with deprecated methods"
echo " --targets=\"TARGET TARGET ...\" Space-separated list of build targets" echo " --targets=\"TARGET TARGET ...\" Space-separated list of build targets"
echo " Options: ${DEFAULTTARGETS}" echo " Options: ${DEFAULTTARGETS}"
@ -185,7 +184,6 @@ ARCHS=""
BRANCH="" BRANCH=""
CLEANUP="" CLEANUP=""
CONFIG_ENABLE_EC_NISTP_64_GCC_128="" CONFIG_ENABLE_EC_NISTP_64_GCC_128=""
CONFIG_NO_ASYNC=""
CONFIG_NO_DEPRECATED="" CONFIG_NO_DEPRECATED=""
IOS_SDKVERSION="" IOS_SDKVERSION=""
LOG_VERBOSE="" LOG_VERBOSE=""
@ -202,9 +200,6 @@ case $i in
ARCHS="${i#*=}" ARCHS="${i#*=}"
shift shift
;; ;;
--async)
CONFIG_NO_ASYNC="false"
;;
--branch=*) --branch=*)
BRANCH="${i#*=}" BRANCH="${i#*=}"
shift shift
@ -315,11 +310,6 @@ else
TARGETS="${DEFAULTTARGETS}" TARGETS="${DEFAULTTARGETS}"
fi fi
# Add no-async config option (if not overwritten) - async being enabled leads to App Store rejection
if [ "${CONFIG_NO_ASYNC}" != "false" ]; then
CONFIG_OPTIONS="${CONFIG_OPTIONS} no-async"
fi
# Add no-deprecated config option (if not overwritten) # Add no-deprecated config option (if not overwritten)
if [ "${CONFIG_NO_DEPRECATED}" != "false" ]; then if [ "${CONFIG_NO_DEPRECATED}" != "false" ]; then
CONFIG_OPTIONS="${CONFIG_OPTIONS} no-deprecated" CONFIG_OPTIONS="${CONFIG_OPTIONS} no-deprecated"

6
scripts/build-loop-targets.sh
View File

@ -56,8 +56,10 @@ do
prepare_target_source_dirs prepare_target_source_dirs
## Determine config options ## Determine config options
# Add build target, --prefix and prevent creation of shared libraries (default since 1.1.0) # Add build target, --prefix and prevent async (references to getcontext(),
LOCAL_CONFIG_OPTIONS="${TARGET} --prefix=${TARGETDIR} ${CONFIG_OPTIONS} no-shared" # setcontext() and makecontext() result in App Store rejections) and creation
# of shared libraries (default since 1.1.0)
LOCAL_CONFIG_OPTIONS="${TARGET} --prefix=${TARGETDIR} ${CONFIG_OPTIONS} no-async no-shared"
# Only relevant for 64 bit builds # Only relevant for 64 bit builds
if [[ "${CONFIG_ENABLE_EC_NISTP_64_GCC_128}" == "true" && "${ARCH}" == *64 ]]; then if [[ "${CONFIG_ENABLE_EC_NISTP_64_GCC_128}" == "true" && "${ARCH}" == *64 ]]; then