diff --git a/packages/ccache/Blake-CMakeList.patch b/packages/ccache/Blake-CMakeList.patch index 0048b976a..3df811acc 100644 --- a/packages/ccache/Blake-CMakeList.patch +++ b/packages/ccache/Blake-CMakeList.patch @@ -1,49 +1,11 @@ -diff -uNr src/third_party/blake3/CMakeLists.txt src/third_party/blake3/CMakeLists.txt.mod ---- ./src/third_party/blake3/CMakeLists.txt 2021-05-10 00:09:46.000000000 +0530 -+++ ./src/third_party/blake3/CMakeLists.txt.mod 2021-06-11 09:05:04.054571163 +0530 -@@ -17,44 +17,7 @@ - set(compile_flags "${others_flags}") - endif() +--- ./src/third_party/blake3/CMakeLists.txt.orig 2021-09-01 18:47:43.285956872 +0530 ++++ ./src/third_party/blake3/CMakeLists.txt 2021-09-01 18:49:01.195956842 +0530 +@@ -27,7 +27,7 @@ -- # First check if it's possible to use the assembler variant for the feature. -- string(TOUPPER "have_asm_${feature}" have_feature) + # First check if it's possible to use the assembler variant for the feature. + string(TOUPPER "have_asm_${feature}" have_feature) - if(NOT DEFINED "${have_feature}" AND CMAKE_SIZEOF_VOID_P EQUAL 8) -- if(MSVC) -- set(suffix "_x86-64_windows_msvc.asm") -- elseif(WIN32) -- set(suffix "_x86-64_windows_gnu.S") -- else() -- set(suffix "_x86-64_unix.S") -- endif() -- -- if(NOT CMAKE_REQUIRED_QUIET) -- message(STATUS "Performing Test ${have_feature}") -- endif() -- -- set(CMAKE_TRY_COMPILE_TARGET_TYPE STATIC_LIBRARY) -- -- # Must set CMAKE_ASM_MASM_CREATE_STATIC_LIBRARY explicitly otherwise try_compile -- # fails, see https://discourse.cmake.org/t/building-lib-file-from-asm-cmake-bug/1959 -- try_compile( -- ${have_feature} -- ${CMAKE_CURRENT_BINARY_DIR} -- "${CMAKE_CURRENT_SOURCE_DIR}/blake3_${feature}${suffix}" -- CMAKE_FLAGS -DCMAKE_ASM_MASM_CREATE_STATIC_LIBRARY=${CMAKE_C_CREATE_STATIC_LIBRARY} -- COMPILE_DEFINITIONS ${compile_flags}) -- -- unset(CMAKE_TRY_COMPILE_TARGET_TYPE) -- -- if(NOT CMAKE_REQUIRED_QUIET) -- if (${${have_feature}}) -- message(STATUS "Performing Test ${have_feature} - Success") -- else() -- message(STATUS "Performing Test ${have_feature} - Failed") -- endif() -- endif() -- endif() -- -- # If the assembler variant didn't work, try the c variant. -+ # Force use the C variant - if(NOT ${have_feature}) - string(TOUPPER "have_c_${feature}" have_feature) - set(suffix ".c") ++ if(NOT DEFINED "${have_feature}" AND CMAKE_SIZEOF_VOID_P EQUAL 8 AND 0) + if(NOT CMAKE_REQUIRED_QUIET) + message(STATUS "Performing Test ${have_feature}") + endif() diff --git a/packages/ccache/build.sh b/packages/ccache/build.sh index 59866c206..1f4768596 100644 --- a/packages/ccache/build.sh +++ b/packages/ccache/build.sh @@ -2,11 +2,15 @@ TERMUX_PKG_HOMEPAGE=https://ccache.samba.org TERMUX_PKG_DESCRIPTION="Compiler cache for fast recompilation of C/C++ code" TERMUX_PKG_LICENSE="GPL-3.0" TERMUX_PKG_MAINTAINER="@termux" -TERMUX_PKG_VERSION=4.3 +TERMUX_PKG_VERSION=4.4 TERMUX_PKG_SRCURL=https://github.com/ccache/ccache/releases/download/v$TERMUX_PKG_VERSION/ccache-$TERMUX_PKG_VERSION.tar.xz -TERMUX_PKG_SHA256=504a0f2184465c306826f035b4bc00bae7500308d6af4abbfb50e33a694989b4 +TERMUX_PKG_SHA256=b40bea2ecf88fc15d4431f0d5fb8babf018d7218eaded0f40e07d4c18c667561 TERMUX_PKG_DEPENDS="zlib, zstd" #[46/89] Building ASM object src/third_party/blake3/CMakeFiles/blake3.dir/blake3_sse2_x86-64_unix.S.o #FAILED: src/third_party/blake3/CMakeFiles/blake3.dir/blake3_sse2_x86-64_unix.S.o -TERMUX_PKG_EXTRA_CONFIGURE_ARGS="-DHAVE_ASM_AVX2=FALSE -DHAVE_ASM_AVX512=FALSE -DHAVE_ASM_SSE2=FALSE -DHAVE_ASM_SSE41=FALSE " +TERMUX_PKG_EXTRA_CONFIGURE_ARGS="-DHAVE_ASM_AVX2=FALSE +-DHAVE_ASM_AVX512=FALSE +-DHAVE_ASM_SSE2=FALSE +-DHAVE_ASM_SSE41=FALSE +-DREDIS_STORAGE_BACKEND=OFF "