Skip to content

Commit 0d922f5

Browse files
Clarify BOOST_VERSION2 naming
1 parent f4d7da7 commit 0d922f5

File tree

1 file changed

+7
-7
lines changed

1 file changed

+7
-7
lines changed

boost.sh

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
# MAC_CATALYST_SDK_VERSION: macOS SDK version when building a Mac Catalyst app (e.g. 10.15)
2727
# MIN_MAC_CATALYST_VERSION: Minimum iOS Target Version when building a Mac Catalyst app (e.g. 13.0)
2828
#
29-
# If a boost tarball (a file named “boost_$BOOST_VERSION2.tar.bz2”) does not
29+
# If a boost tarball (a file named “boost_$BOOST_VERSION_SNAKE_CASE.tar.bz2”) does not
3030
# exist in the current directory, this script will attempt to download the
3131
# version specified. You may also manually place a matching
3232
# tarball in the current directory and the script will use that.
@@ -652,9 +652,9 @@ version() { echo "$@" | awk -F. '{ printf("%d%03d%03d%03d\n", $1,$2,$3,$4); }';
652652
downloadBoost()
653653
{
654654
if [ "$(version "$BOOST_VERSION")" -ge "$(version "1.63.0")" ]; then
655-
DOWNLOAD_SRC=https://boostorg.jfrog.io/artifactory/main/release/${BOOST_VERSION}/source/boost_${BOOST_VERSION2}.tar.bz2
655+
DOWNLOAD_SRC=https://boostorg.jfrog.io/artifactory/main/release/${BOOST_VERSION}/source/boost_${BOOST_VERSION_SNAKE_CASE}.tar.bz2
656656
else
657-
DOWNLOAD_SRC=http://sourceforge.net/projects/boost/files/boost/${BOOST_VERSION}/boost_${BOOST_VERSION2}.tar.bz2/download
657+
DOWNLOAD_SRC=http://sourceforge.net/projects/boost/files/boost/${BOOST_VERSION}/boost_${BOOST_VERSION_SNAKE_CASE}.tar.bz2/download
658658
fi
659659
if [ ! -s "$BOOST_TARBALL" ]; then
660660
echo "Downloading boost ${BOOST_VERSION} from ${DOWNLOAD_SRC}"
@@ -1140,7 +1140,7 @@ scrunchAllLibsTogetherInOneLibPerPlatform()
11401140
"$MACOS_SILICON_BUILD_DIR/${MACOS_SILICON_ARCHS[0]}/libboost_$NAME.a"
11411141
fi
11421142
fi
1143-
1143+
11441144
if [[ -n $BUILD_MAC_CATALYST ]]; then
11451145
if [[ "${#MAC_CATALYST_ARCHS[@]}" -gt 1 ]]; then
11461146
for ARCH in "${MAC_CATALYST_ARCHS[@]}"; do
@@ -1523,9 +1523,9 @@ EXTRA_TVOS_SIM_FLAGS="$EXTRA_FLAGS $EXTRA_ARM_FLAGS -mtvos-simulator-version-min
15231523
EXTRA_MACOS_FLAGS="$EXTRA_FLAGS -mmacosx-version-min=$MIN_MACOS_VERSION"
15241524
EXTRA_MACOS_SILICON_FLAGS="$EXTRA_FLAGS $EXTRA_ARM_FLAGS -mmacosx-version-min=$MIN_MACOS_SILICON_VERSION"
15251525

1526-
BOOST_VERSION2="${BOOST_VERSION//./_}"
1527-
BOOST_TARBALL="$CURRENT_DIR/boost_$BOOST_VERSION2.tar.bz2"
1528-
BOOST_SRC="$SRCDIR/boost_${BOOST_VERSION2}"
1526+
BOOST_VERSION_SNAKE_CASE="${BOOST_VERSION//./_}"
1527+
BOOST_TARBALL="$CURRENT_DIR/boost_$BOOST_VERSION_SNAKE_CASE.tar.bz2"
1528+
BOOST_SRC="$SRCDIR/boost_${BOOST_VERSION_SNAKE_CASE}"
15291529
OUTPUT_DIR="$CURRENT_DIR/build/boost/$BOOST_VERSION"
15301530
IOS_OUTPUT_DIR="$OUTPUT_DIR/ios/$BUILD_VARIANT"
15311531
TVOS_OUTPUT_DIR="$OUTPUT_DIR/tvos/$BUILD_VARIANT"

0 commit comments

Comments
 (0)