[gentoo-commits] repo/gentoo:master commit in: dev-util/perf/

[Mike Frysinger]

commit:     0c386fa287ecc474995b49e492fe5ec4184bed4a
Author:     Mike Frysinger <vapier <AT> chromium <DOT> org>
AuthorDate: Thu Jan 11 01:31:47 2018 +0000
Commit:     Mike Frysinger <vapier <AT> gentoo <DOT> org>
CommitDate: Thu Jan 11 01:33:54 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0c386fa2

dev-util/perf: clean up -Werror usage

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

 dev-util/perf/perf-4.9.13.ebuild | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/dev-util/perf/perf-4.9.13.ebuild b/dev-util/perf/perf-4.9.13.ebuild
index 99c34d5b4c5..f63b5111580 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