1、修复openssl脚本编译错误

Author: lzj

4.2/build-ffmpeg-iOS.sh

@@ -10,7 +10,7 @@ SRC_PATH="$SHELL_PATH/$SRC_NAME"
 ARCHS="arm64 armv7 armv7s x86_64 i386"
 #输出路径
 PREFIX="$SHELL_PATH/FFmpeg-iOS"
-SRC_SCRATCH="$SHELL_PATH/FFmpeg-build"
+SRC_BUILD="$SHELL_PATH/FFmpeg-build"
 
 #需要编译的平台
 BUILD_ARCH=$1
@@ -103,7 +103,7 @@ then
         || exit 1
 fi
 
-rm -rf "$PREFIX" "$SRC_SCRATCH"
+rm -rf "$PREFIX" "$SRC_BUILD"
 #检测并下载资源包
 if [ ! -r $SRC_NAME ]
 then
@@ -123,8 +123,8 @@ do
     if [ "$BUILD_ARCH" = "all" -o "$BUILD_ARCH" = "$ARCH" ]
     then
         echo "building $ARCH..."
-        mkdir -p "$SRC_SCRATCH/$ARCH"
-        cd "$SRC_SCRATCH/$ARCH"
+        mkdir -p "$SRC_BUILD/$ARCH"
+        cd "$SRC_BUILD/$ARCH"
 
         CFLAGS="-arch $ARCH -fno-stack-check"
         if [ "$ARCH" = "i386" -o "$ARCH" = "x86_64" ]
@@ -191,7 +191,7 @@ do
             $CONFIGURE_FLAGS \
             --extra-cflags="$CFLAGS" \
             --extra-ldflags="$LDFLAGS" \
-            --prefix="$SRC_SCRATCH/$ARCH" \
+            --prefix="$SRC_BUILD/$ARCH" \
         || exit 1
 
         make -j3 install $EXPORT || exit 1
@@ -202,15 +202,14 @@ done
 echo "building lipo ffmpeg lib binaries..."
 mkdir -p $PREFIX/lib
 set - $ARCHS
-cd $SRC_SCRATCH/$1/lib
+cd $SRC_BUILD/$1/lib
 for LIB in *.a
 do
     cd $SHELL_PATH
-    lipo -create `find $SRC_SCRATCH -name $LIB` -output $PREFIX/lib/$LIB || exit 1
+    lipo -create `find $SRC_BUILD -name $LIB` -output $PREFIX/lib/$LIB || exit 1
 done
 
 cd $SHELL_PATH
-cp -rf $SRC_SCRATCH/$1/include $PREFIX
-rm -rf $SCRATCH
-rm -rf $SRC_SCRATCH
+cp -rf $SRC_BUILD/$1/include $PREFIX
+rm -rf $SRC_BUILD
 echo "building lipo ffmpeg lib binaries successed"

4.2/build-opencore-amr-iOS.sh

@@ -54,7 +54,7 @@ for arch in $ARCHS; do
     *)
         echo "Building opencore-amr for iPhoneSimulator $arch *****************"
         PATH=`xcodebuild -version -sdk iphonesimulator PlatformPath`"/Developer/usr/bin:$PATH" \
-        CXX="xcrun --sdk iphonesimulator clang++ -arch $arch $IOSMV  -fembed-bitcode" \
+        CXX="xcrun --sdk iphonesimulator clang++ -arch $arch $IOSMV -fembed-bitcode" \
         ./configure \
         --host=$arch \
         --prefix=$DEST \

4.2/build-openssl-iOS.sh

@@ -7,19 +7,18 @@ SRC_VERSION="1.1.1f"
 SRC_NAME="openssl-$SRC_VERSION"
 SRC_PATH="$SHELL_PATH/$SRC_NAME"
 #编译的平台
-ARCHS="arm64 armv7 x86_64 i386"
+ARCHS="arm64 armv7 armv7s x86_64 i386"
 #最低触发的版本
 DEPLOYMENT_TARGET="8.0"
 #输出路径
 PREFIX="$SHELL_PATH/openssl-iOS"
+SRC_BUILD="$SHELL_PATH/openssl-build"
 
 #需要编译的平台
 BUILD_ARCH=$1
 #最低触发的版本
 DEPLOYMENT_TARGET=$2
 
-ARCHS="arm64 armv7 armv7s x86_64 i386"
-
 if [ ! "$BUILD_ARCH" ]
 then
 BUILD_ARCH="all"
@@ -29,7 +28,7 @@ then
 DEPLOYMENT_TARGET="8.0"
 fi
 
-rm -rf "$SRC_PATH" "$PREFIX"
+rm -rf "$SRC_PATH" "$SRC_BUILD"
 #下载资源包
 if [ ! -r $SRC_NAME ]
 then
@@ -43,7 +42,7 @@ then
     tar zxvf $SHELL_PATH/$SRC_TAR_NAME --strip-components 1 -C $SRC_PATH || exit 1
 fi
 
-CC=$(xcrun --find clang)
+XCRUN=$(xcrun --find clang)
 IOS_SDK_PATH=$(xcrun -sdk iphoneos --show-sdk-path)
 IOS_CROSS_TOP=${IOS_SDK_PATH//\/SDKs*/}
 IOS_CROSS_SDK=${IOS_SDK_PATH##*/}
@@ -55,7 +54,8 @@ for ARCH in $ARCHS
 do
     if [ "$BUILD_ARCH" = "all" -o "$BUILD_ARCH" = "$ARCH" ]
     then
-        cd $SRC_PATH
+        mkdir -p "$SRC_BUILD/$ARCH"
+        cd "$SRC_BUILD/$ARCH"
         echo "building $ARCH..."
 
         CONFIGURE_FLAGS="no-shared"
@@ -64,12 +64,12 @@ do
         then
             CROSS_TOP=$IOS_SIMULATOR_CROSS_TOP
             CROSS_SDK=$IOS_SIMULATOR_CROSS_SDK
-            if [ "$ARCH" = "i386" ]
+            if [ "$ARCH" = "x86_64" ]
             then
                 CONFIGURE_FLAGS="$CONFIGURE_FLAGS no-asm"
             fi
         else
-            if [ "$ARCH" == "arm64" -o "$ARCH" == "armv7" ]
+            if [ "$ARCH" == "arm64" -o "$ARCH" == "armv7" -o "$ARCH" == "armv7s" ]
             then
                 CROSS_TOP=$IOS_CROSS_TOP
                 CROSS_SDK=$IOS_CROSS_SDK
@@ -79,41 +79,31 @@ do
 
         export CROSS_TOP
         export CROSS_SDK
-        export CC="$CC -arch $ARCH $CFLAGS"
+        export CC="$XCRUN -arch $ARCH $CFLAGS"
 
         echo CROSS_TOP=$CROSS_TOP
         echo CROSS_SDK=$CROSS_SDK
         echo CC=$CC
-        echo prefix=$PREFIX/$ARCH
 
         $SRC_PATH/Configure \
             iphoneos-cross \
-            --prefix=$PREFIX/$ARCH \
+            --prefix=$SRC_BUILD/$ARCH \
             $CONFIGURE_FLAGS
         make -j3
-        make install -j3
-
-        mkdir $PREFIX/$ARCH/lib
-        cp *.a $PREFIX/$ARCH/lib
-        cp -rf include $PREFIX
-        make clean
-
-        unset CC
-        unset CROSS_SDK
-        unset CROSS_TOP
+        make install_sw -j3
     fi
 done
 
 echo "building lipo lib binaries..."
 mkdir -p $PREFIX/lib
 set - $ARCHS
-cd $PREFIX/$1/lib
+cd $SRC_BUILD/$1
 for LIB in *.a
 do
-    cd $SHELL_PATH
-    lipo -create `find $PREFIX -name $LIB` -output $PREFIX/lib/$LIB
+    lipo -create `find $SRC_BUILD -name $LIB` -output $PREFIX/lib/$LIB
 done
 
 cd $SHELL_PATH
-cp -rf $PREFIX/$1/include $PREFIX
+cp -rf $SRC_BUILD/$1/include $PREFIX
+rm -rf $SRC_BUILD
 echo "building lipo openssl lib binaries successed"