commit: 7edacb6ebeecfe51254eb8659a5a923799085742
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon Dec 4 01:53:23 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Dec 4 01:53:32 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7edacb6e
app-forensics/aflplusplus: allow LLVM 16 again
Reported by toralf/dwfreed. Should really consider some helper for this in
llvm.eclass
I think.
Signed-off-by: Sam James <sam <AT> gentoo.org>
...splus-4.08c.ebuild => aflplusplus-4.08c-r1.ebuild} | 19 +++++++++++++------
1 file changed, 13 insertions(+), 6 deletions(-)
diff --git a/app-forensics/aflplusplus/aflplusplus-4.08c.ebuild
b/app-forensics/aflplusplus/aflplusplus-4.08c-r1.ebuild
similarity index 89%
rename from app-forensics/aflplusplus/aflplusplus-4.08c.ebuild
rename to app-forensics/aflplusplus/aflplusplus-4.08c-r1.ebuild
index 51cd62ea7a29..2451f727113e 100644
--- a/app-forensics/aflplusplus/aflplusplus-4.08c.ebuild
+++ b/app-forensics/aflplusplus/aflplusplus-4.08c-r1.ebuild
@@ -5,6 +5,7 @@ EAPI=8
PYTHON_COMPAT=( python3_{10..12} )
LLVM_MAX_SLOT=17
+LLVM_MIN_SLOT=14
inherit toolchain-funcs llvm optfeature python-single-r1
AFL_PATCHSET="${PN}-4.07c-patches"
@@ -24,14 +25,20 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}"
# This isn't compatible with sandbox
RESTRICT="test"
-RDEPEND="
- ${PYTHON_DEPS}
+LLVM_DEPS="
<sys-devel/llvm-$((${LLVM_MAX_SLOT} + 1)):=
|| (
- sys-devel/clang:14
- sys-devel/clang:15
- sys-devel/clang:${LLVM_MAX_SLOT}
- )
+"
+# We go downwards as Portage prefers left-most in || ( .. )
+for ((i=${LLVM_MAX_SLOT}; i >= ${LLVM_MIN_SLOT}; i--)) ; do
+ LLVM_DEPS+=" sys-devel/clang:${i}"
+done
+LLVM_DEPS+=" )"
+unset i
+
+RDEPEND="
+ ${PYTHON_DEPS}
+ ${LLVM_DEPS}
!app-forensics/afl
"
DEPEND="
