From: Mike Frysinger <vapier@chromium.org>
Date: Thu, 11 Jan 2018 01:31:47 +0000 (-0500)
Subject: dev-util/perf: clean up -Werror usage
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=0c386fa287ecc474995b49e492fe5ec4184bed4a;p=gentoo.git

dev-util/perf: clean up -Werror usage

The api/Makefile already checks $(WERROR), so no need to mung it anymore.
---

diff --git a/dev-util/perf/perf-4.9.13.ebuild b/dev-util/perf/perf-4.9.13.ebuild
index 99c34d5b4c5b..f63b51115804 100644
--- a/dev-util/perf/perf-4.9.13.ebuild
+++ b/dev-util/perf/perf-4.9.13.ebuild
@@ -112,7 +112,9 @@ src_prepare() {
 	sed -i \
 		-e "s:\$(sysconfdir_SQ)/bash_completion.d:$(get_bashcompdir):" \
 		"${S}"/Makefile.perf || die
-	sed -i -e 's:-Werror::' "${S_K}"/tools/lib/api/Makefile || die
+	# A few places still use -Werror w/out $(WERROR) protection.
+	sed -i -e 's:-Werror::' \
+		"${S}"/Makefile.perf "${S_K}"/tools/lib/bpf/Makefile || die
 
 	# Avoid the call to make kernelversion
 	echo "#define PERF_VERSION \"${MY_PV}\"" > PERF-VERSION-FILE