Fix build with Xcode 11.4 (#48)

* CI: Update azohra/shell-linter to 0.3.0

* Fix build when using Xcode 11.4

Author: guillaumealgis

.github/workflows/main.yml

@@ -12,4 +12,6 @@ jobs:
     steps:
     - uses: actions/checkout@v1
     - name: shellcheck
-      uses: azohra/[email protected]
+      uses: azohra/[email protected]
+      with:
+          path: "*.sh"

boost.sh

@@ -29,7 +29,7 @@
 #
 #===============================================================================
 
-BOOST_VERSION=1.69.0
+BOOST_VERSION=1.72.0
 
 BOOST_LIBS="atomic chrono date_time exception filesystem program_options random system thread test"
 ALL_BOOST_LIBS_1_68="atomic chrono container context coroutine coroutine2
@@ -43,15 +43,12 @@ system test thread timer type_erasure wave"
 BOOTSTRAP_LIBS=""
 
 MIN_IOS_VERSION=11.0
-IOS_SDK_VERSION=$(xcrun --sdk iphoneos --show-sdk-version)
 
 MIN_TVOS_VERSION=11.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.12
-MACOS_SDK_VERSION=$(xcrun --sdk macosx --show-sdk-version)
 MACOS_SDK_PATH=$(xcrun --sdk macosx --show-sdk-path)
 
 MACOS_ARCHS=("x86_64")
@@ -61,6 +58,7 @@ IOS_SIM_ARCHS=("i386" "x86_64")
 # Applied to all platforms
 CXX_FLAGS="-std=c++14 -stdlib=libc++"
 
+XCODE_VERSION=$(xcrun xcodebuild -version | head -n1 | tr -Cd '[:digit:].')
 XCODE_ROOT=$(xcode-select -print-path)
 COMPILER="$XCODE_ROOT/Toolchains/XcodeDefault.xctoolchain/usr/bin/clang++"
 
@@ -81,6 +79,17 @@ BUILD_VARIANT=release
 # Functions
 #===============================================================================
 
+sdkVersion()
+{
+    FULL_VERSION=$(xcrun --sdk "$1" --show-sdk-version)
+    read -ra VERSION <<< "${FULL_VERSION//./ }"
+    echo "${VERSION[0]}.${VERSION[1]}"
+}
+
+IOS_SDK_VERSION=$(sdkVersion iphoneos)
+TVOS_SDK_VERSION=$(sdkVersion appletvos)
+MACOS_SDK_VERSION=$(sdkVersion macosx)
+
 usage()
 {
 cat << EOF
@@ -550,6 +559,22 @@ unpackBoost()
 
 #===============================================================================
 
+patchBoost()
+{
+    echo "Patching boost in $BOOST_SRC"
+
+    if [ "$(version "$BOOST_VERSION")" -le "$(version "1.72.0")" ] &&
+       [ "$(version "$XCODE_VERSION")" -ge "$(version "11.4")" ]
+    then
+        # https://github.com/boostorg/build/pull/560
+        (cd "$BOOST_SRC" && patch --forward -p1 -d "$BOOST_SRC/tools/build" < "$CURRENT_DIR/patches/xcode-11.4.patch")
+    fi
+
+    doneSection
+}
+
+#===============================================================================
+
 inventMissingHeaders()
 {
     # These files are missing in the ARM iPhoneOS SDK, but they are in the simulator.
@@ -1206,6 +1231,7 @@ fi
 downloadBoost
 unpackBoost
 inventMissingHeaders
+patchBoost
 
 if [[ -n $BUILD_IOS ]]; then
     updateBoost "iOS"

changelog

@@ -1,6 +1,10 @@
+-- 2020-04-18 --
+* Updated default boost version to 1.72.0
+* Fixed error "unknown argument: '-fcoalesce-templates'" when building with Xcode 11.4 (#45)
+
 -- 2020-04-08 --
-* Add shellcheck to CI
-* Fix all shellcheck warnings
+* Added shellcheck to CI
+* Fixed all shellcheck warnings
 
 -- 2019-09-20 --
 * Use bintray rather than sourceforge for downloads

patches/xcode-11.4.patch

@@ -0,0 +1,31 @@
+From 40960b23338da0a359d6aa83585ace09ad8804d2 Mon Sep 17 00:00:00 2001
+From: Bo Anderson <[email protected]>
+Date: Sun, 29 Mar 2020 14:55:08 +0100
+Subject: [PATCH] Fix compiler version check on macOS
+
+Fixes #440.
+---
+ src/tools/darwin.jam | 5 +++--
+ 1 file changed, 3 insertions(+), 2 deletions(-)
+
+diff --git a/src/tools/darwin.jam b/src/tools/darwin.jam
+index 8d477410b0..97e7ecb851 100644
+--- a/src/tools/darwin.jam
++++ b/src/tools/darwin.jam
+@@ -137,13 +137,14 @@ rule init ( version ? : command * : options * : requirement * )
+     # - Set the toolset generic common options.
+     common.handle-options darwin : $(condition) : $(command) : $(options) ;
+     
++    real-version = [ regex.split $(real-version) \\. ] ;
+     # - GCC 4.0 and higher in Darwin does not have -fcoalesce-templates.
+-    if $(real-version) < "4.0.0"
++    if [ version.version-less $(real-version) : 4 0 ]
+     {
+         flags darwin.compile.c++ OPTIONS $(condition) : -fcoalesce-templates ;
+     }
+     # - GCC 4.2 and higher in Darwin does not have -Wno-long-double.
+-    if $(real-version) < "4.2.0"
++    if [ version.version-less $(real-version) : 4 2 ]
+     {
+         flags darwin.compile OPTIONS $(condition) : -Wno-long-double ;
+     }