From fb593c468c62c2f92b0420e80e1f77c001dd3a24 Mon Sep 17 00:00:00 2001 From: Hardcore Sushi Date: Fri, 24 Jun 2022 19:52:59 +0200 Subject: [PATCH] Switch to boost 1.77.0 --- vendor/boost/CMakeLists.txt | 22 +++++++++++----------- vendor/boost/android-build.sh | 8 ++++---- vendor/boost/checksum.txt | 2 +- 3 files changed, 16 insertions(+), 16 deletions(-) diff --git a/vendor/boost/CMakeLists.txt b/vendor/boost/CMakeLists.txt index 67cb8dcc..45d6696f 100644 --- a/vendor/boost/CMakeLists.txt +++ b/vendor/boost/CMakeLists.txt @@ -15,16 +15,16 @@ else() message(FATAL_ERROR "Android ABI not supported: ${CMAKE_ANDROID_ARCH_ABI}") endif() set(BOOST_STATIC_LIBS - ${BOOST_OUTPUT}/lib/libboost_atomic-clang-mt-${BOOST_ARCH}-1_76.a - ${BOOST_OUTPUT}/lib/libboost_chrono-clang-mt-${BOOST_ARCH}-1_76.a - ${BOOST_OUTPUT}/lib/libboost_container-clang-mt-${BOOST_ARCH}-1_76.a - ${BOOST_OUTPUT}/lib/libboost_date_time-clang-mt-${BOOST_ARCH}-1_76.a - ${BOOST_OUTPUT}/lib/libboost_exception-clang-mt-${BOOST_ARCH}-1_76.a - ${BOOST_OUTPUT}/lib/libboost_filesystem-clang-mt-${BOOST_ARCH}-1_76.a - ${BOOST_OUTPUT}/lib/libboost_serialization-clang-mt-${BOOST_ARCH}-1_76.a - ${BOOST_OUTPUT}/lib/libboost_system-clang-mt-${BOOST_ARCH}-1_76.a - ${BOOST_OUTPUT}/lib/libboost_thread-clang-mt-${BOOST_ARCH}-1_76.a - ${BOOST_OUTPUT}/lib/libboost_wserialization-clang-mt-${BOOST_ARCH}-1_76.a + ${BOOST_OUTPUT}/lib/libboost_atomic-clang-mt-${BOOST_ARCH}-1_77.a + ${BOOST_OUTPUT}/lib/libboost_chrono-clang-mt-${BOOST_ARCH}-1_77.a + ${BOOST_OUTPUT}/lib/libboost_container-clang-mt-${BOOST_ARCH}-1_77.a + ${BOOST_OUTPUT}/lib/libboost_date_time-clang-mt-${BOOST_ARCH}-1_77.a + ${BOOST_OUTPUT}/lib/libboost_exception-clang-mt-${BOOST_ARCH}-1_77.a + ${BOOST_OUTPUT}/lib/libboost_filesystem-clang-mt-${BOOST_ARCH}-1_77.a + ${BOOST_OUTPUT}/lib/libboost_serialization-clang-mt-${BOOST_ARCH}-1_77.a + ${BOOST_OUTPUT}/lib/libboost_system-clang-mt-${BOOST_ARCH}-1_77.a + ${BOOST_OUTPUT}/lib/libboost_thread-clang-mt-${BOOST_ARCH}-1_77.a + ${BOOST_OUTPUT}/lib/libboost_wserialization-clang-mt-${BOOST_ARCH}-1_77.a ) add_custom_target( vendor_boost @@ -33,5 +33,5 @@ add_custom_target( WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} ) add_dependencies(boost vendor_boost) -target_include_directories(boost SYSTEM INTERFACE ${BOOST_OUTPUT}/include/boost-1_76) +target_include_directories(boost SYSTEM INTERFACE ${BOOST_OUTPUT}/include/boost-1_77) target_link_libraries(boost INTERFACE ${BOOST_STATIC_LIBS}) diff --git a/vendor/boost/android-build.sh b/vendor/boost/android-build.sh index c87448fa..4b139cb9 100755 --- a/vendor/boost/android-build.sh +++ b/vendor/boost/android-build.sh @@ -1,19 +1,19 @@ #!/bin/sh -if [ $(find build/$2/lib -name libboost_*.a |wc -l) -eq 10 ]; then +if [ $(find build/$2/lib -name libboost_*.a 2>/dev/null |wc -l) -eq 10 ]; then echo "boost already built for $2"; exit 0 fi mkdir -p build && rm -rf build/$2 && cd Boost-for-Android || exit 1 -BOOST_TAR=boost_1_76_0.tar.bz2 +BOOST_TAR=boost_1_77_0.tar.bz2 if [ ! -f $BOOST_TAR ]; then - wget -O $BOOST_TAR https://boostorg.jfrog.io/artifactory/main/release/1.76.0/source/boost_1_76_0.tar.bz2 || exit 1 + wget -O $BOOST_TAR https://boostorg.jfrog.io/artifactory/main/release/1.77.0/source/boost_1_77_0.tar.bz2 || exit 1 fi sha256sum -c ../checksum.txt && \ -./build-android.sh --boost=1.76.0 --arch=$2 --target-version=21 \ +./build-android.sh --boost=1.77.0 --arch=$2 --target-version=21 \ --with-libraries=atomic,chrono,container,date_time,exception,filesystem,serialization,system,thread \ $1 && \ mv build/out/$2 ../build diff --git a/vendor/boost/checksum.txt b/vendor/boost/checksum.txt index 9af1426b..96fff938 100644 --- a/vendor/boost/checksum.txt +++ b/vendor/boost/checksum.txt @@ -1 +1 @@ -f0397ba6e982c4450f27bf32a2a83292aba035b827a5623a14636ea583318c41 boost_1_76_0.tar.bz2 +fc9f85fc030e233142908241af7a846e60630aa7388de9a5fafb1f3a26840854 boost_1_77_0.tar.bz2