summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCzarek Nakamoto <cyjan@mrcyjanek.net>2024-10-23 13:47:30 +0200
committerCzarek Nakamoto <cyjan@mrcyjanek.net>2024-10-23 13:47:30 +0200
commitcaaed59daf0375f6824b1982d3c77d347efdbb60 (patch)
tree1c499ed4da83421943d8472b49a06011915b2371
parent97353d79af24c75fe8b6c507b3b6ed8274850f1e (diff)
update boost build script
-rw-r--r--.gitmodules5
-rwxr-xr-xbuild_single.sh2
m---------external/icu4c-iosx0
-rwxr-xr-xexternal/ios/build_boost.sh1
4 files changed, 2 insertions, 6 deletions
diff --git a/.gitmodules b/.gitmodules
index a053feb..74ea651 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -46,8 +46,3 @@
path = external/libexpat
url = https://github.com/libexpat/libexpat.git
shallow = true
-[submodule "external/icu4c-ios"]
- path = external/icu4c-ios
- url = https://github.com/MrCyjaneK/icu4c-ios.git
- branch = master
- shallow = true
diff --git a/build_single.sh b/build_single.sh
index 4f0c5ad..5c857ee 100755
--- a/build_single.sh
+++ b/build_single.sh
@@ -271,7 +271,7 @@ pushd $repo/contrib/depends
export IOS_PREFIX="$(realpath "${PWD}/../../../external/ios/build/ios")"
verbose_copy "${IOS_PREFIX}/lib/libunbound.a" ${IOS_LIBS_DIR}/lib/libunbound.a
verbose_copy "${IOS_PREFIX}/lib/libboost_chrono.a" ${IOS_LIBS_DIR}/lib/libboost_chrono.a
- verbose_copy "${IOS_PREFIX}/lib/libboost_locale.a" ${IOS_LIBS_DIR}/lib/libboost_locale.a
+ # verbose_copy "${IOS_PREFIX}/lib/libboost_locale.a" ${IOS_LIBS_DIR}/lib/libboost_locale.a
verbose_copy "${IOS_PREFIX}/lib/libboost_date_time.a" ${IOS_LIBS_DIR}/lib/libboost_date_time.a
verbose_copy "${IOS_PREFIX}/lib/libboost_filesystem.a" ${IOS_LIBS_DIR}/lib/libboost_filesystem.a
verbose_copy "${IOS_PREFIX}/lib/libboost_program_options.a" ${IOS_LIBS_DIR}/lib/libboost_program_options.a
diff --git a/external/icu4c-iosx b/external/icu4c-iosx
deleted file mode 160000
-Subproject d33806797ef9e68e8bd557fce77eb11107a36ab
diff --git a/external/ios/build_boost.sh b/external/ios/build_boost.sh
index 43c029d..5948128 100755
--- a/external/ios/build_boost.sh
+++ b/external/ios/build_boost.sh
@@ -26,6 +26,7 @@ cd $BOOST_DIR_PATH
--min-ios-version ${MIN_IOS_VERSION} \
--boost-libs "${BOOST_LIBS}" \
--boost-version ${BOOST_VERSION} \
+ --ios-sdk 17.5 \
--no-framework
mv -f ${BOOST_DIR_PATH}/build/boost/${BOOST_VERSION}/ios/release/prefix/include/* $EXTERNAL_IOS_INCLUDE_DIR