gentoo resync : 12.05.2022

6 files changed, 8 insertions, 289 deletions

diff --git a/app-forensics/aflplusplus/Manifest b/app-forensics/aflplusplus/Manifest
index 4b9a91f0daf4..c03f7afd91f3 100644
--- a/app-forensics/aflplusplus/Manifest
+++ b/app-forensics/aflplusplus/Manifest
@@ -1,10 +1,5 @@
-AUX aflplusplus-3.0c-LDFLAGS.patch 445 BLAKE2B cfb1282dcba575ed96f355bf6695896f69625b1ace2c6b5d02a0c507fc2a09d4ee6cba97d27f7ac08516a525e5a09c5d3cfab75f3c3f4421357c8aa2cc5aee8c SHA512 d3f43709debf92a0a51077c33c85cf16d9e74324999267c66765f4eeda46d0091ee5c08a6e94bdb635ee6f970445c06e0ac1fdceba561c9345670ef7e365dfb0
-AUX aflplusplus-3.13c-CFLAGS.patch 5732 BLAKE2B 95e4a581fa9e0e9cf8c321968c8f4774c5012f4d5fe0f1d940b0bab3aa15803758c343af0969a5f7fd05b3454845ff306325cd29821f04d630c4bb42f4bfa2c9 SHA512 3e35b5068d64429a435f58e03fc557056ee9b0f73d4c407e34abef083b7c4f47b072f84d1e2abe99bf49449a5f6f46217b158893b84d635bed025979edb8c5e0
-AUX aflplusplus-3.14c-no-ignore-errors-makefile.patch 3047 BLAKE2B 2eaf28e5a758f55294360280b97a06c7e600606c7f22cd3619265ca534ae2146f1d5bae3e4cb30bf9aac89e662bba6491db726693ac644e5070236fd259a0ca8 SHA512 e074b068745e1989153448de1610de5975dd6d738b233056eb30d884208c0b8c61ce82020c3c94b0c95390f31616334cf81e4569af3a16767c1dbffafe1cc75a
 AUX aflplusplus-4.00c-no-ignore-errors-makefile.patch 4990 BLAKE2B e3e4b734e4e2b6d6e6fa384ec3b92003b1ee2a1313ec76eb5b6c0e6a6552dc8d08bb2639add2a11c2203fc9b731deff18015f497531beaa27ef59a6dd8e83be2 SHA512 ccf75c622c9a0227b3bc916f182bb1ad5fa6453622773f3a63a9d697c2e11a8597cc1758b48a19546101c1ea9bd7dc5ec91e75e960ddb3aef580b0447cd5675c
 AUX aflplusplus-4.00c-respect-flags.patch 7004 BLAKE2B a13695116d491e9dc0a05a3d2f3fa14fa9126350ea8debbd5e3664cac45c91969f34d1de6062f62adbbaf97c0fb485f74d6c367ff37464fe34f7b66db9663996 SHA512 2eb8e116fa690e08eb91ced2b760e87d4c623b020ac451409ca68501b32c9aee7773e237c0bdfeef09086b851e95a3b3fb216e7ca58681e64fc12a958994f7d1
-DIST aflplusplus-3.14c.tar.gz 2162934 BLAKE2B 0830b320cea65b9bdd048a08a388c7145164f6b7f4dc140a2f4268a3aa22dc608a771169c830e2196e7a0d543e6f3da49f39736f3b2514c559b986ce929d43c4 SHA512 318607cff40b5f2fc94938747e2ac6b8f400767138eb39edf4daf320afbdab417d0d97a80a1c9db8bb557ad4b7b62f887ae6e692c376f5d5673a493bd23bb811
 DIST aflplusplus-4.00c.tar.gz 2805041 BLAKE2B c1ce15aa9860fc02a7d6f608cae9dd8987b72253b465ea734c721d1b6927e482c31b907aeafe82c00618465227e2e140bfc595151ea5d73037638c3ee630872c SHA512 23a7a4260e581f7c212393e1e14704464bbbc3ff5465b3472db31c6c7f2cd25a9ecc5ad81fad8958c775fcd01b22269085e6c69419a07fbbdb9ec317a3e39beb
-EBUILD aflplusplus-3.14c-r2.ebuild 2218 BLAKE2B bc586c6e3154fe8df05f5867c791a43316a4b1d83a9c8291a6b7d8a103fca3f5c567fc309acac75a5073e2d1bed3fa081593ab59d292e51f337a4aaedab8e620 SHA512 c20e73459494b7b55e143a65eba0d86d68d378733d4744bafc8a22ac961af571f44f3945683a13ca3a0097487dda053b44935059f57a1eb7df5d0d13de3b1927
-EBUILD aflplusplus-4.00c.ebuild 2099 BLAKE2B 08387382daf3f1b0bf7a8eb2970e8e11e6810b01aa67a5fff2a14c3d59b50d8265f661e30650ec6c65cc34293e812f68918169ae1c101548873812a9dd55682f SHA512 29821834e8d1efc6da3d7fe0a599b342ee2ca194032baa4fcf907294ed2b1d8c93caa650b071062d401531568070d7c665d2eb37f2526d31676ea4c9bbf4174d
+EBUILD aflplusplus-4.00c.ebuild 2071 BLAKE2B c511a90fae8a8e42a9e110208ab3dd840f65a203de8eb517713f4637930bda648bb271dc185124ccca34a795c7f34264e616e1a64068a63faa457a3d91a9ebba SHA512 66c28ea49e70fc058a6a953d927b3e75675b1254d3ca29bb12a37cb56462a8ce8235ee5c7d21535619902d482933ecc5f7c927d546f4126e75d13bd7577a0159
 MISC metadata.xml 328 BLAKE2B c9ad582740e9c2ad03a30fe0eaafb8ee19f0d9bc2e98cc7bcd14385a3407f84301479d324b92d3aecafdc1e5cfef1d2cfc8a15c2ecb5d8f2fa348d82de920128 SHA512 e56ce158f6764926c2ed4dc486f017ce75fa272ac8e6ad16e4a816f8c734d7313e3dc9cb007bab07efe73e59cab185312a02d6178296bfe25002719ce4975d14
diff --git a/app-forensics/aflplusplus/aflplusplus-3.14c-r2.ebuild b/app-forensics/aflplusplus/aflplusplus-3.14c-r2.ebuild
deleted file mode 100644
index 0bae6dec57a2..000000000000
--- a/app-forensics/aflplusplus/aflplusplus-3.14c-r2.ebuild
+++ /dev/null
@@ -1,99 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8,9,10} )
-LLVM_MAX_SLOT=13
-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"
-SRC_URI="https://github.com/AFLplusplus/AFLplusplus/archive/${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/AFLplusplus-${PV}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 arm64"
-IUSE="test"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-# Tests involve heavy use of LD_PRELOAD in some cases
-# This isn't compatible with sandbox
-RESTRICT="test"
-
-# It turns out we need Clang too
-RDEPEND="
-	${PYTHON_DEPS}
-	>=sys-devel/llvm-10:=
-	|| (
-		sys-devel/clang:10
-		sys-devel/clang:11
-		sys-devel/clang:12
-		sys-devel/clang:13
-	)
-	!app-forensics/afl
-"
-DEPEND="
-	${RDEPEND}
-	test? ( dev-util/cmocka )
-"
-
-QA_PREBUILT="/usr/share/afl/testcases/others/elf/small_exec.elf"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-3.0c-LDFLAGS.patch"
-	"${FILESDIR}/${PN}-3.13c-CFLAGS.patch"
-	"${FILESDIR}/${PN}-3.14c-no-ignore-errors-makefile.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
-}
-
-src_prepare() {
-	default
-	sed -i -e 's/-O3 -fno-unroll-loops//' GNUmakefile || die
-}
-
-src_compile() {
-	emake \
-		CC="$(tc-getCC)" \
-		CXX="$(tc-getCXX)" \
-		CFLAGS_FLTO="" \
-		PREFIX="${EPREFIX}/usr" \
-		HELPER_PATH="${EPREFIX}/usr/$(get_libdir)/afl" \
-		DOC_PATH="${EPREFIX}/usr/share/doc/${PF}" \
-		MAN_PATH="${EPREFIX}/usr/share/man/man8"
-}
-
-src_test() {
-	emake \
-		CC="$(tc-getCC)" \
-		CXX="$(tc-getCXX)"
-}
-
-src_install() {
-	emake \
-		CC="$(tc-getCC)" \
-		CXX="$(tc-getCXX)" \
-		DESTDIR="${D}" \
-		PREFIX="${EPREFIX}/usr" \
-		HELPER_PATH="${EPREFIX}/usr/$(get_libdir)/afl" \
-		DOC_PATH="${EPREFIX}/usr/share/doc/${PF}" \
-		MAN_PATH="${EPREFIX}/usr/share/man/man8" \
-		install
-}
-
-pkg_postinst() {
-	# TODO: Any others?
-	optfeature "fuzzing with AFL_USE_ASAN" sys-libs/compiler-rt-sanitizers[asan]
-	optfeature "fuzzing with AFL_USE_MSAN" sys-libs/compiler-rt-sanitizers[msan]
-}
diff --git a/app-forensics/aflplusplus/aflplusplus-4.00c.ebuild b/app-forensics/aflplusplus/aflplusplus-4.00c.ebuild
index d327f3912c26..3cc127a6a3d0 100644
--- a/app-forensics/aflplusplus/aflplusplus-4.00c.ebuild
+++ b/app-forensics/aflplusplus/aflplusplus-4.00c.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 PYTHON_COMPAT=( python3_{8,9,10} )
 LLVM_MAX_SLOT=13
@@ -24,23 +24,18 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 RESTRICT="test"
 
 # It turns out we need Clang too
-RDEPEND="
-	${PYTHON_DEPS}
-	>=sys-devel/llvm-10:=
+RDEPEND="${PYTHON_DEPS}
+	>=sys-devel/llvm-11:=
 	|| (
-		sys-devel/clang:10
 		sys-devel/clang:11
 		sys-devel/clang:12
 		sys-devel/clang:13
 	)
-	!app-forensics/afl
-"
-DEPEND="
-	${RDEPEND}
-	test? ( dev-util/cmocka )
-"
+	!app-forensics/afl"
+DEPEND="${RDEPEND}
+	test? ( dev-util/cmocka )"
 
-QA_PREBUILT="/usr/share/afl/testcases/others/elf/small_exec.elf"
+QA_PREBUILT="usr/share/afl/testcases/others/elf/small_exec.elf"
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-4.00c-respect-flags.patch
diff --git a/app-forensics/aflplusplus/files/aflplusplus-3.0c-LDFLAGS.patch b/app-forensics/aflplusplus/files/aflplusplus-3.0c-LDFLAGS.patch
deleted file mode 100644
index 3e8f4dd92d1a..000000000000
--- a/app-forensics/aflplusplus/files/aflplusplus-3.0c-LDFLAGS.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/GNUmakefile.gcc_plugin
-+++ b/GNUmakefile.gcc_plugin
-@@ -129,7 +129,7 @@ afl-common.o: ./src/afl-common.c
- 	$(CC) $(CFLAGS) $(CPPFLAGS) -c $< -o $@ $(LDFLAGS)
- 
- ./afl-gcc-pass.so: instrumentation/afl-gcc-pass.so.cc | test_deps
--	$(CXX) $(CXXEFLAGS) $(PLUGIN_FLAGS) -shared $< -o $@
-+	$(CXX) $(CXXEFLAGS) $(PLUGIN_FLAGS) -shared $< -o $@ $(LDFLAGS)
- 	ln -sf afl-cc afl-gcc-fast
- 	ln -sf afl-cc afl-g++-fast
- 	ln -sf afl-cc.8 afl-gcc-fast.8
diff --git a/app-forensics/aflplusplus/files/aflplusplus-3.13c-CFLAGS.patch b/app-forensics/aflplusplus/files/aflplusplus-3.13c-CFLAGS.patch
deleted file mode 100644
index a3f54b437b83..000000000000
--- a/app-forensics/aflplusplus/files/aflplusplus-3.13c-CFLAGS.patch
+++ /dev/null
@@ -1,99 +0,0 @@
---- a/GNUmakefile.gcc_plugin
-+++ b/GNUmakefile.gcc_plugin
-@@ -28,14 +28,14 @@ MAN_PATH    ?= $(PREFIX)/share/man/man8
- 
- VERSION     = $(shell grep '^$(HASH)define VERSION ' ./config.h | cut -d '"' -f2)
- 
--CFLAGS          ?= -O3 -g -funroll-loops -D_FORTIFY_SOURCE=2
-+CFLAGS          ?= -D_FORTIFY_SOURCE=2
- CFLAGS_SAFE     := -Wall -Iinclude -Wno-pointer-sign \
-                    -DAFL_PATH=\"$(HELPER_PATH)\" -DBIN_PATH=\"$(BIN_PATH)\" \
-                    -DGCC_VERSION=\"$(GCCVER)\" -DGCC_BINDIR=\"$(GCCBINDIR)\" \
-                    -Wno-unused-function
- override CFLAGS += $(CFLAGS_SAFE)
- 
--CXXFLAGS    ?= -O3 -g -funroll-loops -D_FORTIFY_SOURCE=2
-+CXXFLAGS    ?= -D_FORTIFY_SOURCE=2
- CXXEFLAGS   := $(CXXFLAGS) -Wall -std=c++11
- 
- CC          ?= gcc
---- a/GNUmakefile.llvm
-+++ b/GNUmakefile.llvm
-@@ -237,7 +237,7 @@ else
-         AFL_CLANG_DEBUG_PREFIX =
- endif
- 
--CFLAGS          ?= -O3 -funroll-loops -fPIC -D_FORTIFY_SOURCE=2
-+CFLAGS          ?= -fPIC -D_FORTIFY_SOURCE=2
- CFLAGS_SAFE     := -Wall -g -Wno-cast-qual -Wno-variadic-macros -Wno-pointer-sign -I ./include/ -I ./instrumentation/ \
-                    -DAFL_PATH=\"$(HELPER_PATH)\" -DBIN_PATH=\"$(BIN_PATH)\" \
-                    -DLLVM_BINDIR=\"$(LLVM_BINDIR)\" -DVERSION=\"$(VERSION)\" \
-@@ -254,7 +254,7 @@ ifdef AFL_TRACE_PC
-   $(info Compile option AFL_TRACE_PC is deprecated, just set AFL_LLVM_INSTRUMENT=PCGUARD to activate when compiling targets )
- endif
- 
--CXXFLAGS          ?= -O3 -funroll-loops -fPIC -D_FORTIFY_SOURCE=2
-+CXXFLAGS          ?= -fPIC -D_FORTIFY_SOURCE=2
- override CXXFLAGS += -Wall -g -I ./include/ \
-                      -DVERSION=\"$(VERSION)\" -Wno-variadic-macros \
-                      -DLLVM_MINOR=$(LLVM_MINOR) -DLLVM_MAJOR=$(LLVM_MAJOR)
-@@ -434,20 +434,20 @@ afl-llvm-dict2file.so:	instrumentation/afl-llvm-dict2file.so.cc instrumentation/
- 
- .PHONY: document
- document:
--	$(CLANG_BIN) -D_AFL_DOCUMENT_MUTATIONS $(CFLAGS_SAFE) $(CPPFLAGS) $(CLANG_CFL) -O3 -Wno-unused-result -fPIC -c instrumentation/afl-compiler-rt.o.c -o ./afl-compiler-rt.o
--	@$(CLANG_BIN) -D_AFL_DOCUMENT_MUTATIONS $(CFLAGS_SAFE) $(CPPFLAGS) $(CLANG_CFL) -O3 -Wno-unused-result -m32 -fPIC -c instrumentation/afl-compiler-rt.o.c -o ./afl-compiler-rt-32.o 2>/dev/null; if [ "$$?" = "0" ]; then echo "success!"; else echo "failed (that's fine)"; fi
--	@$(CLANG_BIN) -D_AFL_DOCUMENT_MUTATIONS $(CFLAGS_SAFE) $(CPPFLAGS) $(CLANG_CFL) -O3 -Wno-unused-result -m64 -fPIC -c instrumentation/afl-compiler-rt.o.c -o ./afl-compiler-rt-64.o 2>/dev/null; if [ "$$?" = "0" ]; then echo "success!"; else echo "failed (that's fine)"; fi
-+	$(CLANG_BIN) -D_AFL_DOCUMENT_MUTATIONS $(CFLAGS_SAFE) $(CPPFLAGS) $(CLANG_CFL) -Wno-unused-result -fPIC -c instrumentation/afl-compiler-rt.o.c -o ./afl-compiler-rt.o
-+	@$(CLANG_BIN) -D_AFL_DOCUMENT_MUTATIONS $(CFLAGS_SAFE) $(CPPFLAGS) $(CLANG_CFL) -Wno-unused-result -m32 -fPIC -c instrumentation/afl-compiler-rt.o.c -o ./afl-compiler-rt-32.o 2>/dev/null; if [ "$$?" = "0" ]; then echo "success!"; else echo "failed (that's fine)"; fi
-+	@$(CLANG_BIN) -D_AFL_DOCUMENT_MUTATIONS $(CFLAGS_SAFE) $(CPPFLAGS) $(CLANG_CFL) -Wno-unused-result -m64 -fPIC -c instrumentation/afl-compiler-rt.o.c -o ./afl-compiler-rt-64.o 2>/dev/null; if [ "$$?" = "0" ]; then echo "success!"; else echo "failed (that's fine)"; fi
- 
- ./afl-compiler-rt.o: instrumentation/afl-compiler-rt.o.c
--	$(CC) $(CLANG_CFL) $(CFLAGS_SAFE) $(CPPFLAGS) -O3 -Wno-unused-result -fPIC -c $< -o $@
-+	$(CC) $(CLANG_CFL) $(CFLAGS_SAFE) $(CPPFLAGS) -Wno-unused-result -fPIC -c $< -o $@
- 
- ./afl-compiler-rt-32.o: instrumentation/afl-compiler-rt.o.c
- 	@printf "[*] Building 32-bit variant of the runtime (-m32)... "
--	@$(CC) $(CLANG_CFL) $(CFLAGS_SAFE) $(CPPFLAGS) -O3 -Wno-unused-result -m32 -fPIC -c $< -o $@ 2>/dev/null; if [ "$$?" = "0" ]; then echo "success!"; ln -sf afl-compiler-rt-32.o afl-llvm-rt-32.o; else echo "failed (that's fine)"; fi
-+	@$(CC) $(CLANG_CFL) $(CFLAGS_SAFE) $(CPPFLAGS) -Wno-unused-result -m32 -fPIC -c $< -o $@ 2>/dev/null; if [ "$$?" = "0" ]; then echo "success!"; ln -sf afl-compiler-rt-32.o afl-llvm-rt-32.o; else echo "failed (that's fine)"; fi
- 
- ./afl-compiler-rt-64.o: instrumentation/afl-compiler-rt.o.c
- 	@printf "[*] Building 64-bit variant of the runtime (-m64)... "
--	@$(CC) $(CLANG_CFL) $(CFLAGS_SAFE) $(CPPFLAGS) -O3 -Wno-unused-result -m64 -fPIC -c $< -o $@ 2>/dev/null; if [ "$$?" = "0" ]; then echo "success!"; ln -sf afl-compiler-rt-64.o afl-llvm-rt-64.o; else echo "failed (that's fine)"; fi
-+	@$(CC) $(CLANG_CFL) $(CFLAGS_SAFE) $(CPPFLAGS) -Wno-unused-result -m64 -fPIC -c $< -o $@ 2>/dev/null; if [ "$$?" = "0" ]; then echo "success!"; ln -sf afl-compiler-rt-64.o afl-llvm-rt-64.o; else echo "failed (that's fine)"; fi
- 
- .PHONY: test_build
- test_build: $(PROGS)
---- a/unicorn_mode/samples/c/Makefile
-+++ b/unicorn_mode/samples/c/Makefile
-@@ -35,7 +35,7 @@ clean:
- 	rm -rf *.o harness harness-debug
- 
- harness.o: harness.c ../../unicornafl/include/unicorn/*.h
--	${MYCC} ${CFLAGS} -O3 -c harness.c
-+	${MYCC} ${CFLAGS} -c harness.c
- 
- harness-debug.o: harness.c ../../unicornafl/include/unicorn/*.h
- 	${MYCC} ${CFLAGS} -g -c harness.c -o $@
---- a/unicorn_mode/samples/persistent/Makefile
-+++ b/unicorn_mode/samples/persistent/Makefile
-@@ -35,7 +35,7 @@ clean:
- 	rm -rf *.o harness harness-debug
- 
- harness.o: harness.c ../../unicornafl/include/unicorn/*.h
--	${MYCC} ${CFLAGS} -O3 -c harness.c
-+	${MYCC} ${CFLAGS} -c harness.c
- 
- harness-debug.o: harness.c ../../unicornafl/include/unicorn/*.h
- 	${MYCC} ${CFLAGS} -DAFL_DEBUG=1 -g -c harness.c -o $@
---- a/utils/afl_untracer/Makefile
-+++ b/utils/afl_untracer/Makefile
-@@ -1,7 +1,7 @@
- ifdef DEBUG
-   OPT=-O0
- else
--  OPT=-O3
-+  OPT?=-O2
- endif
- 
- all:	afl-untracer libtestinstr.so
diff --git a/app-forensics/aflplusplus/files/aflplusplus-3.14c-no-ignore-errors-makefile.patch b/app-forensics/aflplusplus/files/aflplusplus-3.14c-no-ignore-errors-makefile.patch
deleted file mode 100644
index 0b029396390c..000000000000
--- a/app-forensics/aflplusplus/files/aflplusplus-3.14c-no-ignore-errors-makefile.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-https://bugs.gentoo.org/800941
-
---- a/GNUmakefile
-+++ b/GNUmakefile
-@@ -310,12 +310,12 @@ all:	test_x86 test_shm test_python ready $(PROGS) afl-as llvm gcc_plugin test_bu
- 
- .PHONY: llvm
- llvm:
--	-$(MAKE) -j -f GNUmakefile.llvm
-+	$(MAKE) -j -f GNUmakefile.llvm
- 	@test -e afl-cc || { echo "[-] Compiling afl-cc failed. You seem not to have a working compiler." ; exit 1; }
- 
- .PHONY: gcc_plugin
- gcc_plugin:
--	-$(MAKE) -f GNUmakefile.gcc_plugin
-+	$(MAKE) -f GNUmakefile.gcc_plugin
- 
- .PHONY: man
- man:    $(MANPAGES)
-@@ -562,8 +562,8 @@ all_done: test_build
- .PHONY: clean
- clean:
- 	rm -f $(PROGS) libradamsa.so afl-fuzz-document afl-as as afl-g++ afl-clang afl-clang++ *.o src/*.o *~ a.out core core.[1-9][0-9]* *.stackdump .test .test1 .test2 test-instr .test-instr0 .test-instr1 afl-qemu-trace afl-gcc-fast afl-gcc-pass.so afl-g++-fast ld *.so *.8 test/unittests/*.o test/unittests/unit_maybe_alloc test/unittests/preallocable .afl-* afl-gcc afl-g++ afl-clang afl-clang++ test/unittests/unit_hash test/unittests/unit_rand
--	-$(MAKE) -f GNUmakefile.llvm clean
--	-$(MAKE) -f GNUmakefile.gcc_plugin clean
-+	$(MAKE) -f GNUmakefile.llvm clean
-+	$(MAKE) -f GNUmakefile.gcc_plugin clean
- 	$(MAKE) -C utils/libdislocator clean
- 	$(MAKE) -C utils/libtokencap clean
- 	$(MAKE) -C utils/aflpp_driver clean
-@@ -618,8 +618,8 @@ binary-only: test_shm test_python ready $(PROGS)
- 
- .PHONY: source-only
- source-only: all
--	-$(MAKE) -j -f GNUmakefile.llvm
--	-$(MAKE) -f GNUmakefile.gcc_plugin
-+	$(MAKE) -j -f GNUmakefile.llvm
-+	$(MAKE) -f GNUmakefile.gcc_plugin
- 	$(MAKE) -C utils/libdislocator
- 	$(MAKE) -C utils/libtokencap
- 
-@@ -661,8 +661,8 @@ install: all $(MANPAGES)
- 	@if [ -f utils/afl_network_proxy/afl-network-server ]; then $(MAKE) -C utils/afl_network_proxy install; fi
- 	@if [ -f utils/aflpp_driver/libAFLDriver.a ]; then set -e; install -m 644 utils/aflpp_driver/libAFLDriver.a $${DESTDIR}$(HELPER_PATH); fi
- 	@if [ -f utils/aflpp_driver/libAFLQemuDriver.a ]; then set -e; install -m 644 utils/aflpp_driver/libAFLQemuDriver.a $${DESTDIR}$(HELPER_PATH); fi
--	-$(MAKE) -f GNUmakefile.llvm install
--	-$(MAKE) -f GNUmakefile.gcc_plugin install
-+	$(MAKE) -f GNUmakefile.llvm install
-+	$(MAKE) -f GNUmakefile.gcc_plugin install
- 	ln -sf afl-cc $${DESTDIR}$(BIN_PATH)/afl-gcc
- 	ln -sf afl-cc $${DESTDIR}$(BIN_PATH)/afl-g++
- 	ln -sf afl-cc $${DESTDIR}$(BIN_PATH)/afl-clang
---- a/GNUmakefile.llvm
-+++ b/GNUmakefile.llvm
-@@ -460,6 +460,7 @@ document:
- test_build: $(PROGS)
- 	@echo "[*] Testing the CC wrapper and instrumentation output..."
- 	unset AFL_USE_ASAN AFL_USE_MSAN AFL_INST_RATIO; ASAN_OPTIONS=detect_leaks=0 AFL_QUIET=1 AFL_PATH=. AFL_LLVM_LAF_ALL=1 ./afl-cc $(CFLAGS) $(CPPFLAGS) ./test-instr.c -o test-instr $(LDFLAGS)
-+	@test -e test-instr || { echo "[-] Testing CC wrapper failed. You seem not to have a working compiler." ; exit 1; }
- 	ASAN_OPTIONS=detect_leaks=0 ./afl-showmap -m none -q -o .test-instr0 ./test-instr < /dev/null
- 	echo 1 | ASAN_OPTIONS=detect_leaks=0 ./afl-showmap -m none -q -o .test-instr1 ./test-instr
- 	@rm -f test-instr