Skip to content

Fix building boost.locale for iOS and tvOS #64

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Fix building boost.locale for iOS and tvOS #64

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f6dd16d
fix arch armv4t being passed to linker when building boost.locale for…
kambala-decapitator Feb 27, 2021
b4a0bd8
fix building boost.locale for iOS and tvOS
kambala-decapitator Feb 27, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 23 additions & 13 deletions boost.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -704,16 +704,20 @@ unpackBoost()

patchBoost()
{
BOOST_BUILD_DIR="$BOOST_SRC/tools/build"
if [ "$(version "$BOOST_VERSION")" -le "$(version "1.73.0")" ] &&
[ "$(version "$XCODE_VERSION")" -ge "$(version "11.4")" ]
then
echo "Patching boost in $BOOST_SRC"

# 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")
(cd "$BOOST_SRC" && patch --forward -p1 -d "$BOOST_BUILD_DIR" < "$CURRENT_DIR/patches/xcode-11.4.patch")

doneSection
fi

# fixes boost passing `-arch arm` to linker which fails due to attempt to use armv4t
sed -i '' -e "s/options = -arch arm ;/#options = -arch arm ;/" "$BOOST_BUILD_DIR/src/tools/darwin.jam"
}

#===============================================================================
Expand Down Expand Up @@ -741,42 +745,48 @@ updateBoostUserConfigJam()
USING_MPI="using mpi ;" # trailing space needed
fi

COMMON_FLAGS_IOS="$OTHER_FLAGS ${IOS_ARCH_FLAGS[*]} $EXTRA_IOS_FLAGS -isysroot $IOS_SDK_PATH"
COMMON_FLAGS_IOS_SIM="$OTHER_FLAGS ${IOS_SIM_ARCH_FLAGS[*]} $EXTRA_IOS_SIM_FLAGS -isysroot $IOSSIM_SDK_PATH"

COMMON_FLAGS_TVOS="$OTHER_FLAGS ${TVOS_ARCH_FLAGS[*]} $EXTRA_TVOS_FLAGS -isysroot $TVOS_SDK_PATH"
COMMON_FLAGS_TVOS_SIM="$OTHER_FLAGS ${TVOS_SIM_ARCH_FLAGS[*]} $EXTRA_TVOS_SIM_FLAGS -isysroot $TVOSSIM_SDK_PATH"

cat > "$BOOST_SRC/tools/build/src/user-config.jam" <<EOF
using darwin : $COMPILER_VERSION~iphone
: $COMPILER
: <architecture>arm
<target-os>iphone
<cxxflags>"$CXX_FLAGS"
<linkflags>"$LD_FLAGS -isysroot $IOS_SDK_PATH"
<compileflags>"$OTHER_FLAGS ${IOS_ARCH_FLAGS[*]} $EXTRA_IOS_FLAGS -isysroot $IOS_SDK_PATH"
<cxxflags>"$CXX_FLAGS $COMMON_FLAGS_IOS"
<linkflags>"$LD_FLAGS $COMMON_FLAGS_IOS"
<compileflags>"$COMMON_FLAGS_IOS"
<threading>multi

;
using darwin : $COMPILER_VERSION~iphonesim
: $COMPILER
: <architecture>x86
<target-os>iphone
<cxxflags>"$CXX_FLAGS"
<linkflags>"$LD_FLAGS -isysroot $IOSSIM_SDK_PATH"
<compileflags>"$OTHER_FLAGS ${IOS_SIM_ARCH_FLAGS[*]} $EXTRA_IOS_SIM_FLAGS -isysroot $IOSSIM_SDK_PATH"
<cxxflags>"$CXX_FLAGS $COMMON_FLAGS_IOS_SIM"
<linkflags>"$LD_FLAGS $COMMON_FLAGS_IOS_SIM"
<compileflags>"$COMMON_FLAGS_IOS_SIM"
<threading>multi
;
using darwin : $COMPILER_VERSION~appletv
: $COMPILER
: <architecture>arm
<target-os>iphone
<cxxflags>"$CXX_FLAGS"
<linkflags>"$LD_FLAGS -isysroot $TVOS_SDK_PATH"
<compileflags>"$OTHER_FLAGS ${TVOS_ARCH_FLAGS[*]} $EXTRA_TVOS_FLAGS -isysroot $TVOS_SDK_PATH"
<cxxflags>"$CXX_FLAGS $COMMON_FLAGS_TVOS"
<linkflags>"$LD_FLAGS $COMMON_FLAGS_TVOS"
<compileflags>"$COMMON_FLAGS_TVOS"
<threading>multi
;
using darwin : $COMPILER_VERSION~appletvsim
: $COMPILER
: <architecture>x86
<target-os>iphone
<cxxflags>"$CXX_FLAGS"
<linkflags>"$LD_FLAGS -isysroot $TVOSSIM_SDK_PATH"
<compileflags>"$OTHER_FLAGS ${TVOS_SIM_ARCH_FLAGS[*]} $EXTRA_TVOS_SIM_FLAGS -isysroot $TVOSSIM_SDK_PATH"
<cxxflags>"$CXX_FLAGS $COMMON_FLAGS_TVOS_SIM"
<linkflags>"$LD_FLAGS $COMMON_FLAGS_TVOS_SIM"
<compileflags>"$COMMON_FLAGS_TVOS_SIM"
<threading>multi
;
using darwin : $COMPILER_VERSION~macos
Expand Down