hardcoresushi/libcryfs
1
0
Fork 0
Code Issues Pull Requests Releases Activity

libcryfs: Update Boost to 1.79.0 & allow curl and wget for download

Browse Source
This commit is contained in:
Matéo Duparc 2024-07-22 21:16:39 +02:00
parent 0398d48b09
commit cd0af70880
Signed by: hardcoresushi
GPG Key ID: AFE384344A45E13A
4 changed files with 28 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
vendor/boost/Boost-for-Android vendored

@ -1 +1 @@
Subproject commit 83ba7174dea6e0595085dc30051eb17747e7260a Subproject commit 7daeea97271a4067386254dc491d49db2b13ae65

22
vendor/boost/CMakeLists.txt vendored
View File

@ -15,16 +15,16 @@ else()
message(FATAL_ERROR "Android ABI not supported: ${CMAKE_ANDROID_ARCH_ABI}") message(FATAL_ERROR "Android ABI not supported: ${CMAKE_ANDROID_ARCH_ABI}")
endif() endif()
set(BOOST_STATIC_LIBS set(BOOST_STATIC_LIBS
${BOOST_OUTPUT}/lib/libboost_atomic-clang-mt-${BOOST_ARCH}-1_77.a ${BOOST_OUTPUT}/lib/libboost_atomic-clang-mt-${BOOST_ARCH}-1_79.a
${BOOST_OUTPUT}/lib/libboost_chrono-clang-mt-${BOOST_ARCH}-1_77.a ${BOOST_OUTPUT}/lib/libboost_chrono-clang-mt-${BOOST_ARCH}-1_79.a
${BOOST_OUTPUT}/lib/libboost_container-clang-mt-${BOOST_ARCH}-1_77.a ${BOOST_OUTPUT}/lib/libboost_container-clang-mt-${BOOST_ARCH}-1_79.a
${BOOST_OUTPUT}/lib/libboost_date_time-clang-mt-${BOOST_ARCH}-1_77.a ${BOOST_OUTPUT}/lib/libboost_date_time-clang-mt-${BOOST_ARCH}-1_79.a
${BOOST_OUTPUT}/lib/libboost_exception-clang-mt-${BOOST_ARCH}-1_77.a ${BOOST_OUTPUT}/lib/libboost_exception-clang-mt-${BOOST_ARCH}-1_79.a
${BOOST_OUTPUT}/lib/libboost_filesystem-clang-mt-${BOOST_ARCH}-1_77.a ${BOOST_OUTPUT}/lib/libboost_filesystem-clang-mt-${BOOST_ARCH}-1_79.a
${BOOST_OUTPUT}/lib/libboost_serialization-clang-mt-${BOOST_ARCH}-1_77.a ${BOOST_OUTPUT}/lib/libboost_serialization-clang-mt-${BOOST_ARCH}-1_79.a
${BOOST_OUTPUT}/lib/libboost_system-clang-mt-${BOOST_ARCH}-1_77.a ${BOOST_OUTPUT}/lib/libboost_system-clang-mt-${BOOST_ARCH}-1_79.a
${BOOST_OUTPUT}/lib/libboost_thread-clang-mt-${BOOST_ARCH}-1_77.a ${BOOST_OUTPUT}/lib/libboost_thread-clang-mt-${BOOST_ARCH}-1_79.a
${BOOST_OUTPUT}/lib/libboost_wserialization-clang-mt-${BOOST_ARCH}-1_77.a ${BOOST_OUTPUT}/lib/libboost_wserialization-clang-mt-${BOOST_ARCH}-1_79.a
) )
add_custom_target( add_custom_target(
vendor_boost vendor_boost
@ -33,5 +33,5 @@ add_custom_target(
WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
) )
add_dependencies(boost vendor_boost) add_dependencies(boost vendor_boost)
target_include_directories(boost SYSTEM INTERFACE ${BOOST_OUTPUT}/include/boost-1_77) target_include_directories(boost SYSTEM INTERFACE ${BOOST_OUTPUT}/include/boost-1_79)
target_link_libraries(boost INTERFACE ${BOOST_STATIC_LIBS}) target_link_libraries(boost INTERFACE ${BOOST_STATIC_LIBS})

22
vendor/boost/android-build.sh vendored
View File

@ -2,7 +2,7 @@
set -e set -e
if [ $(find build/$2/lib -name libboost_*.a 2>/dev/null |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"; echo "boost already built for $2";
exit 0 exit 0
fi fi
@ -10,16 +10,24 @@ fi
exec 9>/var/tmp/libcryfs-boost.lock exec 9>/var/tmp/libcryfs-boost.lock
flock 9 flock 9
mkdir -p build && rm -rf build/$2 && cd Boost-for-Android mkdir -p build && rm -rf build/"$2" && cd Boost-for-Android
BOOST_TAR=boost_1_77_0.tar.bz2 BOOST_TAR=boost_1_79_0.tar.bz2
if [ ! -f $BOOST_TAR ]; then if [ ! -f $BOOST_TAR ]; then
wget -O $BOOST_TAR https://boostorg.jfrog.io/artifactory/main/release/1.77.0/source/boost_1_77_0.tar.bz2 DL_URL="https://archives.boost.io/release/1.79.0/source/boost_1_79_0.tar.bz2"
if command -v wget; then
wget -O $BOOST_TAR "$DL_URL"
elif command -v curl; then
curl -fLo $BOOST_TAR "$DL_URL"
else
echo "Neither curl or wget have been found">&2
exit 1
fi
fi fi
sha256sum -c ../checksum.txt sha256sum -c ../checksum.txt
./build-android.sh --boost=1.77.0 --arch=$2 --target-version=21 \ ./build-android.sh --boost=1.79.0 --arch="$2" --target-version=21 \
--with-libraries=atomic,chrono,container,date_time,exception,filesystem,serialization,system,thread \ --with-libraries=atomic,chrono,container,date_time,exception,filesystem,serialization,system,thread \
$1 "$1"
mv build/out/$2 ../build mv build/out/"$2" ../build

2
vendor/boost/checksum.txt vendored
View File

@ -1 +1 @@
fc9f85fc030e233142908241af7a846e60630aa7388de9a5fafb1f3a26840854 boost_1_77_0.tar.bz2 475d589d51a7f8b3ba2ba4eda022b170e562ca3b760ee922c146b6c65856ef39 boost_1_79_0.tar.bz2