diff --git a/packages/clamav/build.sh b/packages/clamav/build.sh index 74ce907442..fb9e30838c 100644 --- a/packages/clamav/build.sh +++ b/packages/clamav/build.sh @@ -2,9 +2,9 @@ TERMUX_PKG_HOMEPAGE=https://www.clamav.net/ TERMUX_PKG_DESCRIPTION="Anti-virus toolkit for Unix" TERMUX_PKG_LICENSE="GPL-2.0" TERMUX_PKG_MAINTAINER="@termux" -TERMUX_PKG_VERSION=0.105.1 +TERMUX_PKG_VERSION=1.0.0 TERMUX_PKG_SRCURL=https://www.clamav.net/downloads/production/clamav-$TERMUX_PKG_VERSION.tar.gz -TERMUX_PKG_SHA256=d2bc16374db889a6e5a6ac40f8c6e700254a039acaa536885a09eeea4b8529f6 +TERMUX_PKG_SHA256=bda39bb856902e6dd6077ea313a3eb8beccd487e0082a95917877f2b299cd86e TERMUX_PKG_DEPENDS="json-c, libandroid-support, libbz2, libc++, libcurl, libiconv, libxml2, ncurses, openssl, pcre2, zlib" TERMUX_PKG_BREAKS="clamav-dev" TERMUX_PKG_REPLACES="clamav-dev" diff --git a/packages/clamav/cmake-FindRust.cmake.patch b/packages/clamav/cmake-FindRust.cmake.patch index def7e9ad88..9429c577e8 100644 --- a/packages/clamav/cmake-FindRust.cmake.patch +++ b/packages/clamav/cmake-FindRust.cmake.patch @@ -4,8 +4,8 @@ # Determine the native libs required to link w/ rust static libs # message(STATUS "Detecting native static libs for rust: ${rustc_EXECUTABLE} --crate-type staticlib --print=native-static-libs /dev/null") execute_process( -- COMMAND ${CMAKE_COMMAND} -E env "CARGO_TARGET_DIR=${CMAKE_CURRENT_BINARY_DIR}" ${rustc_EXECUTABLE} --crate-type staticlib --print=native-static-libs /dev/null -+ COMMAND ${CMAKE_COMMAND} -E env "CARGO_TARGET_DIR=${CMAKE_CURRENT_BINARY_DIR}" ${rustc_EXECUTABLE} --target ${RUST_COMPILER_TARGET} --crate-type staticlib --print=native-static-libs /dev/null +- COMMAND ${CMAKE_COMMAND} -E env "CARGO_TARGET_DIR=${CMAKE_BINARY_DIR}" ${rustc_EXECUTABLE} --crate-type staticlib --print=native-static-libs /dev/null ++ COMMAND ${CMAKE_COMMAND} -E env "CARGO_TARGET_DIR=${CMAKE_BINARY_DIR}" ${rustc_EXECUTABLE} --target ${RUST_COMPILER_TARGET} --crate-type staticlib --print=native-static-libs /dev/null OUTPUT_VARIABLE RUST_NATIVE_STATIC_LIBS_OUTPUT - ERROR_VARIABLE RUST_NATIVE_STATIC_LIBS_ERROR + ERROR_VARIABLE RUST_NATIVE_STATIC_LIBS_ERROR RESULT_VARIABLE RUST_NATIVE_STATIC_LIBS_RESULT