commit: 1d34ac4103c86836c8677e30bc0fc33ed1cd815a Author: Matt Jolly <kangie <AT> gentoo <DOT> org> AuthorDate: Sun Mar 2 00:26:05 2025 +0000 Commit: Matt Jolly <kangie <AT> gentoo <DOT> org> CommitDate: Sun Mar 2 00:49:54 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1d34ac41
app-antivirus/clamav: drop USE=jit (llvm-based bytecode interpreter) The LLVM-based bytecode interpreter was only ever briefly available for end users on Gentoo due to its requirement for LLVM < 14. Since the existing ebuild logic depends on the legacy `llvm.eclass`, we'll just drop support for it entirely. We can reassess if the linked ClamAV ticket sees any movement. Closes: https://bugs.gentoo.org/945340 Bug: https://github.com/Cisco-Talos/clamav/issues/581 Signed-off-by: Matt Jolly <kangie <AT> gentoo.org> app-antivirus/clamav/clamav-1.0.7-r1.ebuild | 21 ++++----------------- app-antivirus/clamav/clamav-1.4.1-r2.ebuild | 23 +++-------------------- app-antivirus/clamav/clamav-1.4.2.ebuild | 23 +++-------------------- 3 files changed, 10 insertions(+), 57 deletions(-) diff --git a/app-antivirus/clamav/clamav-1.0.7-r1.ebuild b/app-antivirus/clamav/clamav-1.0.7-r1.ebuild index 0ef1d488cc1f..7f6d8b35bbad 100644 --- a/app-antivirus/clamav/clamav-1.0.7-r1.ebuild +++ b/app-antivirus/clamav/clamav-1.0.7-r1.ebuild @@ -1,9 +1,8 @@ -# Copyright 1999-2024 Gentoo Authors +# Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -LLVM_MAX_SLOT=13 PYTHON_COMPAT=( python3_{10..12} ) # Auto-Generated by cargo-ebuild 0.5.4-r1 @@ -155,7 +154,7 @@ CRATES=" [email protected] " -inherit cargo cmake flag-o-matic llvm python-any-r1 systemd tmpfiles +inherit cargo cmake flag-o-matic python-any-r1 systemd tmpfiles MY_P=${P//_/-} @@ -171,7 +170,7 @@ if [[ ${PV} != *_rc* ]] ; then KEYWORDS="~alpha amd64 arm arm64 ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos" fi -IUSE="doc clamonacc +clamapp experimental jit libclamav-only milter rar selinux +system-mspack systemd test" +IUSE="doc clamonacc +clamapp experimental libclamav-only milter rar selinux +system-mspack systemd test" REQUIRED_USE="libclamav-only? ( !clamonacc !clamapp !milter ) clamonacc? ( clamapp ) @@ -197,7 +196,6 @@ COMMON_DEPEND=" !libclamav-only? ( net-misc/curl ) clamapp? ( sys-libs/ncurses:= net-misc/curl ) elibc_musl? ( sys-libs/fts-standalone ) - jit? ( <llvm-core/llvm-$((${LLVM_MAX_SLOT} + 1)):= ) milter? ( mail-filter/libmilter:= ) rar? ( app-arch/unrar ) system-mspack? ( dev-libs/libmspack ) @@ -229,7 +227,6 @@ python_check_deps() { pkg_setup() { rust_pkg_setup - use jit && llvm_pkg_setup use test && python-any-r1_pkg_setup } @@ -239,7 +236,7 @@ src_configure() { local mycmakeargs=( -DAPP_CONFIG_DIRECTORY="${EPREFIX}"/etc/clamav - -DBYTECODE_RUNTIME=$(usex jit llvm interpreter) + -DBYTECODE_RUNTIME="interpreter" # https://github.com/Cisco-Talos/clamav/issues/581 -DCLAMAV_GROUP="clamav" -DCLAMAV_USER="clamav" -DDATABASE_DIRECTORY="${EPREFIX}"/var/lib/clamav @@ -270,16 +267,6 @@ src_configure() { ) fi - if use jit ; then - # Suppress CMake warnings that variables aren't consumed if we aren't using LLVM - # https://github.com/Cisco-Talos/clamav/blob/main/INSTALL.md#llvm-optional-see-bytecode-runtime-section - # https://github.com/Cisco-Talos/clamav/blob/main/INSTALL.md#bytecode-runtime - mycmakeargs+=( - -DLLVM_ROOT_DIR="$(get_llvm_prefix -d ${LLVM_MAX_SLOT})" - -DLLVM_FIND_VERSION="$(best_version llvm-core/llvm:${LLVM_MAX_SLOT} | cut -c 16-)" - ) - fi - cmake_src_configure } diff --git a/app-antivirus/clamav/clamav-1.4.1-r2.ebuild b/app-antivirus/clamav/clamav-1.4.1-r2.ebuild index 341bc6af02a8..99f3d1d6f0ae 100644 --- a/app-antivirus/clamav/clamav-1.4.1-r2.ebuild +++ b/app-antivirus/clamav/clamav-1.4.1-r2.ebuild @@ -1,12 +1,7 @@ -# Copyright 1999-2024 Gentoo Authors +# Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -# Upstream are working on updating clamav's LLVM bytecode interpreter to work -# with later versions of LLVM, but it's not ready yet. See: -# https://github.com/Cisco-Talos/clamav/issues/581 -# This does not impact the ability of the package to build with llvm/clang otherwise. -LLVM_MAX_SLOT=13 PYTHON_COMPAT=( python3_{11..13} ) CRATES=" @@ -174,7 +169,7 @@ if [[ ${PV} != *_rc* ]] ; then KEYWORDS="~alpha amd64 arm arm64 ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos" fi -IUSE="doc clamonacc +clamapp experimental jit libclamav-only milter rar selinux +system-mspack systemd test" +IUSE="doc clamonacc +clamapp experimental libclamav-only milter rar selinux +system-mspack systemd test" REQUIRED_USE="libclamav-only? ( !clamonacc !clamapp !milter ) clamonacc? ( clamapp ) @@ -200,7 +195,6 @@ COMMON_DEPEND=" !libclamav-only? ( net-misc/curl ) clamapp? ( sys-libs/ncurses:= net-misc/curl ) elibc_musl? ( sys-libs/fts-standalone ) - jit? ( <llvm-core/llvm-$((${LLVM_MAX_SLOT} + 1)):= ) milter? ( mail-filter/libmilter:= ) rar? ( app-arch/unrar ) system-mspack? ( dev-libs/libmspack ) @@ -232,7 +226,6 @@ python_check_deps() { pkg_setup() { rust_pkg_setup - use jit && llvm_pkg_setup use test && python-any-r1_pkg_setup } @@ -246,7 +239,7 @@ src_configure() { local mycmakeargs=( -DAPP_CONFIG_DIRECTORY="${EPREFIX}"/etc/clamav - -DBYTECODE_RUNTIME=$(usex jit llvm interpreter) + -DBYTECODE_RUNTIME="interpreter" # https://github.com/Cisco-Talos/clamav/issues/581 -DCLAMAV_GROUP="clamav" -DCLAMAV_USER="clamav" -DDATABASE_DIRECTORY="${EPREFIX}"/var/lib/clamav @@ -277,16 +270,6 @@ src_configure() { ) fi - if use jit ; then - # Suppress CMake warnings that variables aren't consumed if we aren't using LLVM - # https://github.com/Cisco-Talos/clamav/blob/main/INSTALL.md#llvm-optional-see-bytecode-runtime-section - # https://github.com/Cisco-Talos/clamav/blob/main/INSTALL.md#bytecode-runtime - mycmakeargs+=( - -DLLVM_ROOT_DIR="$(get_llvm_prefix -d ${LLVM_MAX_SLOT})" - -DLLVM_FIND_VERSION="$(best_version llvm-core/llvm:${LLVM_MAX_SLOT} | cut -c 16-)" - ) - fi - cmake_src_configure } diff --git a/app-antivirus/clamav/clamav-1.4.2.ebuild b/app-antivirus/clamav/clamav-1.4.2.ebuild index 590a0cf5e91f..fcdfde36c8af 100644 --- a/app-antivirus/clamav/clamav-1.4.2.ebuild +++ b/app-antivirus/clamav/clamav-1.4.2.ebuild @@ -2,11 +2,6 @@ # Distributed under the terms of the GNU General Public License v2 EAPI=8 -# Upstream are working on updating clamav's LLVM bytecode interpreter to work -# with later versions of LLVM, but it's not ready yet. See: -# https://github.com/Cisco-Talos/clamav/issues/581 -# This does not impact the ability of the package to build with llvm/clang otherwise. -LLVM_MAX_SLOT=13 PYTHON_COMPAT=( python3_{11..13} ) CRATES=" @@ -157,7 +152,7 @@ declare -A GIT_CRATES=( [onenote_parser]="https://github.com/Cisco-Talos/onenote.rs;29c08532252b917543ff268284f926f30876bb79;onenote.rs-%commit%"; ) -inherit cargo cmake eapi9-ver flag-o-matic llvm python-any-r1 systemd tmpfiles +inherit cargo cmake eapi9-ver flag-o-matic python-any-r1 systemd tmpfiles MY_P=${P//_/-} @@ -174,7 +169,7 @@ if [[ ${PV} != *_rc* ]] ; then KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos" fi -IUSE="doc clamonacc +clamapp experimental jit libclamav-only milter rar selinux +system-mspack systemd test" +IUSE="doc clamonacc +clamapp experimental libclamav-only milter rar selinux +system-mspack systemd test" REQUIRED_USE="libclamav-only? ( !clamonacc !clamapp !milter ) clamonacc? ( clamapp ) @@ -200,7 +195,6 @@ COMMON_DEPEND=" !libclamav-only? ( net-misc/curl ) clamapp? ( sys-libs/ncurses:= net-misc/curl ) elibc_musl? ( sys-libs/fts-standalone ) - jit? ( <llvm-core/llvm-$((${LLVM_MAX_SLOT} + 1)):= ) milter? ( mail-filter/libmilter:= ) rar? ( app-arch/unrar ) system-mspack? ( dev-libs/libmspack ) @@ -232,7 +226,6 @@ python_check_deps() { pkg_setup() { rust_pkg_setup - use jit && llvm_pkg_setup use test && python-any-r1_pkg_setup } @@ -246,7 +239,7 @@ src_configure() { local mycmakeargs=( -DAPP_CONFIG_DIRECTORY="${EPREFIX}"/etc/clamav - -DBYTECODE_RUNTIME=$(usex jit llvm interpreter) + -DBYTECODE_RUNTIME="interpreter" # https://github.com/Cisco-Talos/clamav/issues/581 (does not support modern llvm) -DCLAMAV_GROUP="clamav" -DCLAMAV_USER="clamav" -DDATABASE_DIRECTORY="${EPREFIX}"/var/lib/clamav @@ -277,16 +270,6 @@ src_configure() { ) fi - if use jit ; then - # Suppress CMake warnings that variables aren't consumed if we aren't using LLVM - # https://github.com/Cisco-Talos/clamav/blob/main/INSTALL.md#llvm-optional-see-bytecode-runtime-section - # https://github.com/Cisco-Talos/clamav/blob/main/INSTALL.md#bytecode-runtime - mycmakeargs+=( - -DLLVM_ROOT_DIR="$(get_llvm_prefix -d ${LLVM_MAX_SLOT})" - -DLLVM_FIND_VERSION="$(best_version llvm-core/llvm:${LLVM_MAX_SLOT} | cut -c 16-)" - ) - fi - cmake_src_configure }
