Skip to content

Commit 1878bd3

Browse files
guillaumealgisfaithfracture
authored andcommitted
Update default boost version to 1.73
Fix compilation of boost 1.73 with Xcode 11
1 parent c5516b9 commit 1878bd3

File tree

1 file changed

+9
-7
lines changed

1 file changed

+9
-7
lines changed

boost.sh

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
#
3030
#===============================================================================
3131

32-
BOOST_VERSION=1.72.0
32+
BOOST_VERSION=1.73.0
3333

3434
BOOST_LIBS="atomic chrono date_time exception filesystem program_options random system thread test"
3535
ALL_BOOST_LIBS_1_68="atomic chrono container context coroutine coroutine2
@@ -559,16 +559,16 @@ unpackBoost()
559559

560560
patchBoost()
561561
{
562-
echo "Patching boost in $BOOST_SRC"
563-
564-
if [ "$(version "$BOOST_VERSION")" -le "$(version "1.72.0")" ] &&
562+
if [ "$(version "$BOOST_VERSION")" -le "$(version "1.73.0")" ] &&
565563
[ "$(version "$XCODE_VERSION")" -ge "$(version "11.4")" ]
566564
then
565+
echo "Patching boost in $BOOST_SRC"
566+
567567
# https://github.com/boostorg/build/pull/560
568568
(cd "$BOOST_SRC" && patch --forward -p1 -d "$BOOST_SRC/tools/build" < "$CURRENT_DIR/patches/xcode-11.4.patch")
569-
fi
570569

571-
doneSection
570+
doneSection
571+
fi
572572
}
573573

574574
#===============================================================================
@@ -578,9 +578,11 @@ inventMissingHeaders()
578578
# These files are missing in the ARM iPhoneOS SDK, but they are in the simulator.
579579
# They are supported on the device, so we copy them from x86 SDK to a staging area
580580
# to use them on ARM, too.
581-
echo Invent missing headers
581+
echo "Inventing missing headers"
582582

583583
cp "$XCODE_ROOT/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator${IOS_SDK_VERSION}.sdk/usr/include/"{crt_externs,bzlib}.h "$BOOST_SRC"
584+
585+
doneSection
584586
}
585587

586588
#===============================================================================

0 commit comments

Comments
 (0)