|
|
@@ -136,7 +136,7 @@ checkStatus() {
|
|
|
sayIfVerbal "configure or make of $PKG returned with non zero: $STATUS"
|
|
|
open $LOG_FILE
|
|
|
#printPreprocessor
|
|
|
- ./finish.sh
|
|
|
+ /bin/bash ./finish.sh
|
|
|
exit $STATUS
|
|
|
else
|
|
|
#echo "make returned with zero"
|
|
|
@@ -195,14 +195,12 @@ checkPGPSig() {
|
|
|
exportBuildScript() {
|
|
|
EXPORT_FILE="$1"
|
|
|
echo -e "#!/bin/bash" > $EXPORT_FILE
|
|
|
- echo -e "\nexport SDKROOT=$(xcrun --sdk $PLATFORM_LOWER --show-sdk-path)" >> $EXPORT_FILE
|
|
|
- echo -e "export VER_MIN=13.0" >> $EXPORT_FILE
|
|
|
- echo -e "export 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
|
|
|
- echo -e "export 'CPP=$(xcrun --sdk $PLATFORM_LOWER -f clang) -E -D__arm__ -D__arm64__ -I$SKEL_PREFIX/$ROOT_PREFIX/include/ -I$SDKROOT/usr/include -arch arm64' " >> $EXPORT_FILE
|
|
|
- echo -e "export 'CXXCPP=$(xcrun --sdk $PLATFORM_LOWER -f clang++) -E -D__arm__ -D__arm64__ -I$SKEL_PREFIX/$ROOT_PREFIX/include/ -I$SDKROOT/usr/include -arch arm64' " >> $EXPORT_FILE
|
|
|
+ echo -e "export 'CPP=$(xcrun --sdk $PLATFORM_LOWER -f clang) -E -D__arm__ -I$SDKROOT/usr/include' " >> $EXPORT_FILE
|
|
|
+ echo -e "export 'CXXCPP=$(xcrun --sdk $PLATFORM_LOWER -f clang++) -E -D__arm__ -I$SDKROOT/usr/include' " >> $EXPORT_FILE
|
|
|
echo -e "export RANLIB=$(xcrun --sdk $PLATFORM_LOWER --find ranlib)" >> $EXPORT_FILE
|
|
|
echo -e "export LIBTOOL=$(xcrun --sdk $PLATFORM_LOWER --find libtool)" >> $EXPORT_FILE
|
|
|
echo -e "export STRIP=$(xcrun --sdk $PLATFORM_LOWER --find strip)" >> $EXPORT_FILE
|
|
|
@@ -224,14 +222,16 @@ buildProduct() {
|
|
|
echo $PKG_NAME
|
|
|
echo "build output going to: " $LOG_FILE
|
|
|
echo $EXTRA_CFG
|
|
|
- export SDKROOT=$(xcrun --sdk $PLATFORM_LOWER --show-sdk-path)
|
|
|
- export VER_MIN=13.0
|
|
|
+ local SDKROOT=$(xcrun --sdk $PLATFORM_LOWER --show-sdk-path)
|
|
|
+ local VER_MIN=13.0
|
|
|
export CC=$(xcrun --sdk $PLATFORM_LOWER --find clang)
|
|
|
export CXX=$(xcrun --sdk $PLATFORM_LOWER --find clang++)
|
|
|
export LD=$(xcrun --sdk $PLATFORM_LOWER --find ld)
|
|
|
export AR=$(xcrun --sdk $PLATFORM_LOWER --find ar)
|
|
|
- export CPP="$(xcrun --sdk $PLATFORM_LOWER -f clang) -E -D__arm__ -D__arm64__ -I$SKEL_PREFIX/$ROOT_PREFIX/include/ -I$SDKROOT/usr/include -arch arm64"
|
|
|
- export CXXCPP="$(xcrun --sdk $PLATFORM_LOWER -f clang++) -E -D__arm__ -D__arm64__ -I$SKEL_PREFIX/$ROOT_PREFIX/include/ -I$SDKROOT/usr/include -arch arm64"
|
|
|
+ #export CPP="$(xcrun --sdk $PLATFORM_LOWER -f clang) -E -D__arm__ -D__arm64__ -I$SKEL_PREFIX/$ROOT_PREFIX/include/ -I$SDKROOT/usr/include -arch arm64"
|
|
|
+ #export CXXCPP="$(xcrun --sdk $PLATFORM_LOWER -f clang++) -E -D__arm__ -D__arm64__ -I$SKEL_PREFIX/$ROOT_PREFIX/include/ -I$SDKROOT/usr/include -arch arm64"
|
|
|
+ export CPP="$(xcrun --sdk $PLATFORM_LOWER -f clang) -E -D__arm__ -I$SDKROOT/usr/include"
|
|
|
+ export CXXCPP="$(xcrun --sdk $PLATFORM_LOWER -f clang++) -E -D__arm__ -I$SDKROOT/usr/include"
|
|
|
export RANLIB=$(xcrun --sdk $PLATFORM_LOWER --find ranlib)
|
|
|
export LIBTOOL=$(xcrun --sdk $PLATFORM_LOWER --find libtool)
|
|
|
export STRIP=$(xcrun --sdk $PLATFORM_LOWER --find strip)
|
|
|
@@ -1166,8 +1166,8 @@ buildBerkeleyDB() {
|
|
|
downloadProduct $DOWNLOAD_URL - $RAW_NAME $VERSION
|
|
|
cd build_unix
|
|
|
patchBerkeleyDB
|
|
|
- export CPP=""
|
|
|
- export CXXCPP=""
|
|
|
+ export CPP="$(xcrun --sdk $PLATFORM_LOWER -f clang) -E "
|
|
|
+ export CXXCPP="$(xcrun --sdk $PLATFORM_LOWER -f clang++) -E "
|
|
|
export PLATFORM="$PLATFORM" #TODO: Maybe necessary? Need to test.
|
|
|
export BUILD_TOOLS="$(xcode-select --print-path)"
|
|
|
export CC="clang"
|
|
|
@@ -1257,8 +1257,8 @@ buildDpkg() {
|
|
|
downloadDpkg
|
|
|
local dont_die_here=$(./autogen.sh)
|
|
|
# need to clear these preprocessor flags or they get all wonky
|
|
|
- export CPP=""
|
|
|
- export CXXCPP=""
|
|
|
+ export CPP="$(xcrun --sdk $PLATFORM_LOWER -f clang) -E "
|
|
|
+ export CXXCPP="$(xcrun --sdk $PLATFORM_LOWER -f clang++) -E "
|
|
|
export LZMA_LIBS="$SKEL_PREFIX/$ROOT_PREFIX/lib/liblzma.dylib"
|
|
|
export CC=$(xcrun --sdk $PLATFORM_LOWER --find clang)
|
|
|
export CXX=$(xcrun --sdk $PLATFORM_LOWER --find clang++)
|
|
|
@@ -1761,7 +1761,7 @@ mkdirIfNecessary $ALREADY_BUILT
|
|
|
# Ensure our SDK has all the required "extras" installed/setup
|
|
|
prepSDK
|
|
|
|
|
|
-buildBashAndFriends
|
|
|
+#buildBashAndFriends
|
|
|
buildBasicUtils
|
|
|
buildDPKGAndDependencies
|
|
|
buildAPTAndDependencies
|