Merge branch 'master' of github.com:Psiphon-Labs/psiphon-tunnel-core into staging-client

MobileLibrary/iOS/OpenSSL-for-iPhone/build-libssl.sh

@@ -37,21 +37,6 @@ ENABLE_EC_NISTP_64_GCC_128=""                                             #
 # Don't change anything under this line!                                  #
 #                                                                         #
 ###########################################################################
-spinner()
-{
-  local pid=$!
-  local delay=0.75
-  local spinstr='|/-\'
-  while [ "$(ps a | awk '{print $1}' | grep $pid)" ]; do
-    local temp=${spinstr#?}
-    printf " [%c]  " "$spinstr"
-    local spinstr=$temp${spinstr%"$temp"}
-    sleep $delay
-    printf "\b\b\b\b\b\b"
-  done
-  printf "    \b\b\b\b"
-}
-
 CURRENTPATH=`pwd`
 # PSIPHON: remove unneeded architectures
 #ARCHS="i386 x86_64 armv7 armv7s arm64 tv_x86_64 tv_arm64"
@@ -186,9 +171,9 @@ do
     fi
   else
     if [ "${ARCH}" == "x86_64" ]; then
-      (./Configure no-asm darwin64-x86_64-cc --openssldir="${CURRENTPATH}/bin/${PLATFORM}${SDKVERSION}-${ARCH}.sdk" ${LOCAL_CONFIG_OPTIONS} > "${LOG}" 2>&1) & spinner
+      (./Configure no-asm darwin64-x86_64-cc --openssldir="${CURRENTPATH}/bin/${PLATFORM}${SDKVERSION}-${ARCH}.sdk" ${LOCAL_CONFIG_OPTIONS} > "${LOG}" 2>&1)
     else
-      (./Configure iphoneos-cross --openssldir="${CURRENTPATH}/bin/${PLATFORM}${SDKVERSION}-${ARCH}.sdk" ${LOCAL_CONFIG_OPTIONS} > "${LOG}" 2>&1) & spinner
+      (./Configure iphoneos-cross --openssldir="${CURRENTPATH}/bin/${PLATFORM}${SDKVERSION}-${ARCH}.sdk" ${LOCAL_CONFIG_OPTIONS} > "${LOG}" 2>&1)
     fi
   fi
 
@@ -216,7 +201,7 @@ do
     if [[ ! -z $CONFIG_OPTIONS ]]; then
       make depend >> "${LOG}" 2>&1
     fi
-    (make >> "${LOG}" 2>&1) & spinner
+    (make >> "${LOG}" 2>&1)
   fi
   echo "\n"