Browse Source

re-indent and fix bzip2 build

Kevin Bradley 3 years ago
parent
commit
efee7f2657
1 changed files with 11 additions and 11 deletions
  1. 11 11
      the_memo2.sh

+ 11 - 11
the_memo2.sh

@@ -195,7 +195,7 @@ checkPGPSig() {
 exportBuildScript() {
 	EXPORT_FILE="$1"
 	echo -e "#!/bin/bash" > $EXPORT_FILE
-    echo -e "\nexport CC=$(xcrun --sdk $PLATFORM_LOWER --find clang)" >> $EXPORT_FILE
+	echo -e "\nexport CC=$(xcrun --sdk $PLATFORM_LOWER --find clang)" >> $EXPORT_FILE
 	echo -e "export CXX=$(xcrun --sdk $PLATFORM_LOWER --find clang++)" >> $EXPORT_FILE
 	echo -e "export LD=$(xcrun --sdk $PLATFORM_LOWER --find ld)" >> $EXPORT_FILE
 	echo -e "export AR=$(xcrun --sdk $PLATFORM_LOWER --find ar)" >> $EXPORT_FILE
@@ -973,9 +973,9 @@ patchOpenSSL() {
 patchBZip2() {
 	if [[ "$PLATFORM" == "AppleTVOS" ]]; then
 		#fix up our makefile...
-		sed -i -- 's|CC=gcc|CC=/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/clang|' Makefile
-		sed -i -- 's|AR=ar|AR=/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/ar|' Makefile
-		sed -i -- 's|RANLIB=ranlib|RANLIB=/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/ranlib|' Makefile
+		sed -i -- "s|CC=gcc|CC=$(xcrun --sdk $PLATFORM_LOWER --find clang)|" Makefile
+		sed -i -- "s|AR=ar|AR=$(xcrun --sdk $PLATFORM_LOWER --find ar)|" Makefile
+		sed -i -- "s|RANLIB=ranlib|RANLIB=$(xcrun --sdk $PLATFORM_LOWER --find ranlib)|" Makefile
 		sed -i -- "s|LDFLAGS=|LDFLAGS=$MIN_VERSION -isysroot \"$SDK_PATH\" -arch $ARCH|" Makefile
 		sed -i -- "s|CFLAGS=|CFLAGS=$MIN_VERSION -isysroot \"$SDK_PATH\" -arch $ARCH |" Makefile
 		sed -i -- 's|all:\(.*\) test$|all: \1|' Makefile
@@ -1398,13 +1398,13 @@ buildGcrypt() {
 
 patchKSBA() {
 	sed -i -- 's|#include <stdarg.h>|#include <stdarg.h>\n#include "ksba.h"\n|' src/asn1-gentables.c
-    FIND='$(CC_FOR_BUILD) -I$(srcdir)'
-    sed -i -- "s|$FIND |$FIND -I$SKEL_PREFIX/$ROOT_PREFIX/include |" src/Makefile.in
-    #	sed -i -- "s|$(CC_FOR_BUILD) -I$(srcdir) |$(CC_FOR_BUILD) -I$(srcdir) -I$SKEL_PREFIX/$ROOT_PREFIX/include/ |" src/Makefile.in
-    sed -i -- 's|const char \*gpg_strerror|//const char \*gpg_strerror|' src/gen-help.h
-}
+		FIND='$(CC_FOR_BUILD) -I$(srcdir)'
+			sed -i -- "s|$FIND |$FIND -I$SKEL_PREFIX/$ROOT_PREFIX/include |" src/Makefile.in
+			#	sed -i -- "s|$(CC_FOR_BUILD) -I$(srcdir) |$(CC_FOR_BUILD) -I$(srcdir) -I$SKEL_PREFIX/$ROOT_PREFIX/include/ |" src/Makefile.in
+			sed -i -- 's|const char \*gpg_strerror|//const char \*gpg_strerror|' src/gen-help.h
+		}
 
-buildKSBA() {
+	buildKSBA() {
 		PKG_NAME="libksba-1.3.5"
 		checkBuilt $PKG_NAME
 		if [[ $? != 0 ]]; then
@@ -1418,7 +1418,7 @@ buildKSBA() {
 			buildProduct $PKG_NAME "--with-libgpg-error-prefix=$SKEL_PREFIX/$ROOT_PREFIX/"
 			codesign "$SKEL_PREFIX/$ROOT_PREFIX/lib/libksba.8.dylib"
 		fi
-}
+	}
 
 patchNpth() {
 	if [[ "$PLATFORM" == "AppleTVOS" ]]; then