From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 85EC41382C5 for ; Tue, 27 Apr 2021 18:20:46 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id E09BDE089A; Tue, 27 Apr 2021 18:20:45 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id C95A1E089A for ; Tue, 27 Apr 2021 18:20:45 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 9B53D341035 for ; Tue, 27 Apr 2021 18:20:44 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id EF972478 for ; Tue, 27 Apr 2021 18:20:42 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1619547637.43ab977c0eb0504b46bf04823afb8018da15e5da.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-forensics/aflplusplus/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-forensics/aflplusplus/aflplusplus-3.12c-r1.ebuild app-forensics/aflplusplus/aflplusplus-3.12c-r2.ebuild X-VCS-Directories: app-forensics/aflplusplus/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 43ab977c0eb0504b46bf04823afb8018da15e5da X-VCS-Branch: master Date: Tue, 27 Apr 2021 18:20:42 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 796dfe60-5d27-49cc-adae-e298be8294d6 X-Archives-Hash: 73b19770a6a1f518c6249af8c5da5e3c commit: 43ab977c0eb0504b46bf04823afb8018da15e5da Author: Sam James gentoo org> AuthorDate: Tue Apr 27 18:16:02 2021 +0000 Commit: Sam James gentoo org> CommitDate: Tue Apr 27 18:20:37 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=43ab977c app-forensics/aflplusplus: allow LLVM 12, add optfeature for sanitizers, clang dep * Allow LLVM 12 * Add optfeature for sanitizers * Clang is required for afl-* testing during build (and generating some targets) Signed-off-by: Sam James gentoo.org> ...3.12c-r1.ebuild => aflplusplus-3.12c-r2.ebuild} | 25 ++++++++++++++++------ 1 file changed, 19 insertions(+), 6 deletions(-) diff --git a/app-forensics/aflplusplus/aflplusplus-3.12c-r1.ebuild b/app-forensics/aflplusplus/aflplusplus-3.12c-r2.ebuild similarity index 74% rename from app-forensics/aflplusplus/aflplusplus-3.12c-r1.ebuild rename to app-forensics/aflplusplus/aflplusplus-3.12c-r2.ebuild index d6d3ef5f510..4a430c66773 100644 --- a/app-forensics/aflplusplus/aflplusplus-3.12c-r1.ebuild +++ b/app-forensics/aflplusplus/aflplusplus-3.12c-r2.ebuild @@ -4,8 +4,8 @@ EAPI=7 PYTHON_COMPAT=( python3_{7,8,9} ) -LLVM_MAX_SLOT=11 -inherit toolchain-funcs llvm python-single-r1 +LLVM_MAX_SLOT=12 +inherit toolchain-funcs llvm optfeature python-single-r1 DESCRIPTION="A fork of AFL, the popular compile-time instrumentation fuzzer" HOMEPAGE="https://github.com/AFLplusplus/AFLplusplus" @@ -14,7 +14,7 @@ S="${WORKDIR}/AFLplusplus-${PV}" LICENSE="Apache-2.0" SLOT="0" -KEYWORDS="~amd64" +KEYWORDS="~amd64 ~arm64" IUSE="test" REQUIRED_USE="${PYTHON_REQUIRED_USE}" @@ -23,12 +23,14 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}" # This isn't compatible with sandbox RESTRICT="test" +# It turns out we need Clang too RDEPEND=" ${PYTHON_DEPS} + >=sys-devel/llvm-10:= || ( - sys-devel/llvm:10 - sys-devel/llvm:11 - sys-devel/llvm:12 + sys-devel/clang:10 + sys-devel/clang:11 + sys-devel/clang:12 ) " DEPEND=" @@ -43,6 +45,11 @@ PATCHES=( "${FILESDIR}/${PN}-3.0c-CFLAGS.patch" ) +llvm_check_deps() { + has_version -b "sys-devel/clang:${LLVM_SLOT}" && \ + has_version -b "sys-devel/llvm:${LLVM_SLOT}" +} + pkg_setup() { llvm_pkg_setup python-single-r1_pkg_setup @@ -82,3 +89,9 @@ src_install() { MAN_PATH="${EPREFIX}/usr/share/man/man8" \ install } + +pkg_postinst() { + # TODO: Any otherrs? + optfeature "fuzzing with AFL_USE_ASAN" sys-libs/compiler-rt-sanitizers[asan] + optfeature "fuzzing with AFL_USE_MSAN" sys-libs/compiler-rt-sanitizers[msan] +}