* Updated Boost to 1.67

* Fixed tvOS build (Fixes #20)

Author: faithfracture

boost.sh

@@ -29,7 +29,7 @@
 #
 #===============================================================================
 
-BOOST_VERSION=1.64.0
+BOOST_VERSION=1.67.0
 
 BOOST_LIBS="atomic chrono date_time exception filesystem program_options random signals system thread test"
 ALL_BOOST_LIBS=\
@@ -43,18 +43,19 @@ IOS_SDK_VERSION=`xcrun --sdk iphoneos --show-sdk-version`
 
 MIN_TVOS_VERSION=10.0
 TVOS_SDK_VERSION=`xcrun --sdk appletvos --show-sdk-version`
+TVOS_SDK_PATH=`xcrun --sdk appletvos --show-sdk-path`
+TVOSSIM_SDK_PATH=`xcrun --sdk appletvsimulator --show-sdk-path`
 
 MIN_MACOS_VERSION=10.10
 MACOS_SDK_VERSION=`xcrun --sdk macosx --show-sdk-version`
+MACOS_SDK_PATH=`xcrun --sdk macosx --show-sdk-path`
 
 MACOS_ARCHS=("x86_64")
 IOS_ARCHS=("armv7 arm64")
 
 # Applied to all platforms
 CXX_FLAGS="-std=c++14 -stdlib=libc++"
 
-MACOS_SDK_PATH=`xcrun --sdk macosx --show-sdk-path`
-
 XCODE_ROOT=`xcode-select -print-path`
 COMPILER="$XCODE_ROOT/Toolchains/XcodeDefault.xctoolchain/usr/bin/clang++" 
 
@@ -526,12 +527,12 @@ EOF
     if [[ "$1" == "tvOS" ]]; then
         cat > "$BOOST_SRC/tools/build/src/user-config.jam" <<EOF
 using darwin : ${TVOS_SDK_VERSION}~appletv
-: $COMPILER -arch arm64 $EXTRA_TVOS_FLAGS -I${XCODE_ROOT}/Platforms/AppleTVOS.platform/Developer/SDKs/AppleTVOS${TVOS_SDK_VERSION}.sdk/usr/include
+: $COMPILER -arch arm64 $EXTRA_TVOS_FLAGS -isysroot $TVOS_SDK_PATH -I $TVOS_SDK_PATH
 : <striper> <root>$XCODE_ROOT/Platforms/AppleTVOS.platform/Developer
 : <architecture>arm <target-os>iphone
 ;
 using darwin : ${TVOS_SDK_VERSION}~appletvsim
-: $COMPILER -arch x86_64 $EXTRA_TVOS_FLAGS -I${XCODE_ROOT}/Platforms/AppleTVSimulator.platform/Developer/SDKs/AppleTVSimulator${TVOS_SDK_VERSION}.sdk/usr/include
+: $COMPILER -arch x86_64 $EXTRA_TVOS_FLAGS -isysroot $TVOSSIM_SDK_PATH -I $TVOSSIM_SDK_PATH
 : <striper> <root>$XCODE_ROOT/Platforms/AppleTVSimulator.platform/Developer
 : <architecture>x86 <target-os>iphone
 ;
@@ -542,7 +543,7 @@ EOF
     if [[ "$1" == "macOS" ]]; then
         cat > "$BOOST_SRC/tools/build/src/user-config.jam" <<EOF
 using darwin : ${MACOS_SDK_VERSION}
-: $COMPILER $MACOS_ARCH_FLAGS $EXTRA_MACOS_FLAGS
+: $COMPILER $MACOS_ARCH_FLAGS $EXTRA_MACOS_FLAGS -isysroot $MACOS_SDK_PATH
 : <striper> <root>$XCODE_ROOT/Platforms/MacOSX.platform/Developer
 : <architecture>x86 <target-os>darwin
 ;
@@ -754,11 +755,11 @@ scrunchAllLibsTogetherInOneLibPerPlatform()
         fi
 
         if [[ -n $BUILD_TVOS ]]; then
-            $TVOS_ARM_DEV_CMD lipo "appletv-build/stage/lib/libboost_$NAME.a" \
-                -thin arm64 -o "$TVOS_BUILD_DIR/arm64/libboost_$NAME.a"
+            cp "appletv-build/stage/lib/libboost_$NAME.a" \
+                "$TVOS_BUILD_DIR/arm64/libboost_$NAME.a"
 
-            $TVOS_SIM_DEV_CMD lipo "appletvsim-build/stage/lib/libboost_$NAME.a" \
-                -thin x86_64 -o "$TVOS_BUILD_DIR/x86_64/libboost_$NAME.a"
+            cp "appletvsim-build/stage/lib/libboost_$NAME.a" \
+                "$TVOS_BUILD_DIR/x86_64/libboost_$NAME.a"
         fi
 
         if [[ -n $BUILD_MACOS ]]; then
@@ -1009,9 +1010,9 @@ fi
 # Should perhaps also consider/use instead: -BOOST_SP_USE_PTHREADS
 
 # Must set these after parseArgs to fill in overriden values
-EXTRA_FLAGS="-DBOOST_AC_USE_PTHREADS -DBOOST_SP_USE_PTHREADS -g -DNDEBUG \
-    -fvisibility=hidden -fvisibility-inlines-hidden \
-    -Wno-unused-local-typedef -fembed-bitcode"
+EXTRA_FLAGS="-DBOOST_AC_USE_PTHREADS -DBOOST_SP_USE_PTHREADS -g -DNDEBUG" \
+    " -fvisibility=hidden -fvisibility-inlines-hidden" \
+    " -Wno-unused-local-typedef -fembed-bitcode -Wno-nullability-completeness"
 EXTRA_IOS_FLAGS="$EXTRA_FLAGS -mios-version-min=$MIN_IOS_VERSION"
 EXTRA_TVOS_FLAGS="$EXTRA_FLAGS -mtvos-version-min=$MIN_TVOS_VERSION"
 EXTRA_MACOS_FLAGS="$EXTRA_FLAGS -mmacosx-version-min=$MIN_MACOS_VERSION"
@@ -1050,8 +1051,11 @@ printf "$format" "BOOST_VERSION:" "$BOOST_VERSION"
 printf "$format" "IOS_SDK_VERSION:" "$IOS_SDK_VERSION"
 printf "$format" "MIN_IOS_VERSION:" "$MIN_IOS_VERSION"
 printf "$format" "TVOS_SDK_VERSION:" "$TVOS_SDK_VERSION"
+printf "$format" "TVOS_SDK_PATH:" "$TVOS_SDK_PATH"
+printf "$format" "TVOSSIM_SDK_PATH:" "$TVOSSIM_SDK_PATH"
 printf "$format" "MIN_TVOS_VERSION:" "$MIN_TVOS_VERSION"
 printf "$format" "MACOS_SDK_VERSION:" "$MACOS_SDK_VERSION"
+printf "$format" "MACOS_SDK_PATH:" "$MACOS_SDK_PATH"
 printf "$format" "MIN_MACOS_VERSION:" "$MIN_MACOS_VERSION"
 printf "$format" "MACOS_ARCHS:" "${MACOS_ARCHS[*]}"
 printf "$format" "IOS_ARCHS:" "${IOS_ARCHS[*]}"

changelog

@@ -1,3 +1,7 @@
+-- 2018-07-27 --
+* Updated Boost version to 1.67.0
+* Fixed tvOS build
+
 -- 2018-06-07 --
 * Added a CLI flag to create universal FAT binaries for iOS and tvOS.