Gentoo Archives: gentoo-commits

From: Aaron Bauman <bman@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-util/perf/files/
Date: Mon, 04 Mar 2019 03:14:23
Message-Id: 1551669050.d1c490b9c9c522f663e841e4a59baabdac8f5c45.bman@gentoo
1 commit: d1c490b9c9c522f663e841e4a59baabdac8f5c45
2 Author: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com>
3 AuthorDate: Sun Mar 3 15:57:42 2019 +0000
4 Commit: Aaron Bauman <bman <AT> gentoo <DOT> org>
5 CommitDate: Mon Mar 4 03:10:50 2019 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d1c490b9
7
8 dev-util/perf: remove unused patch(es)
9
10 Signed-off-by: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail.com>
11 Closes: https://github.com/gentoo/gentoo/pull/11236
12 Signed-off-by: Aaron Bauman <bman <AT> gentoo.org>
13
14 dev-util/perf/files/perf-4.1.5-prefix.patch | 43 -----------------------------
15 1 file changed, 43 deletions(-)
16
17 diff --git a/dev-util/perf/files/perf-4.1.5-prefix.patch b/dev-util/perf/files/perf-4.1.5-prefix.patch
18 deleted file mode 100644
19 index 0c4dff01130..00000000000
20 --- a/dev-util/perf/files/perf-4.1.5-prefix.patch
21 +++ /dev/null
22 @@ -1,43 +0,0 @@
23 -commit 75e84ab906ef8935cff3df3d8929f1bafea81599
24 -Author: Lukas Wunner <lukas@××××××.de>
25 -Date: Thu Jun 18 13:00:32 2015 +0200
26 -
27 - perf tools: Fix build breakage if prefix= is specified
28 -
29 - Invoking Makefile.perf with prefix= breaks the build since Makefile.perf
30 - hands that variable down to Makefile.build where it overrides
31 -
32 - prefix := $(subst ./,,$(OUTPUT)$(dir)/)
33 -
34 - leading to errors like this:
35 -
36 - No rule to make target '/usrabspath.o', needed by '/usrlibperf-in.o'
37 -
38 - Signed-off-by: Lukas Wunner <lukas@××××××.de>
39 - Acked-by: Jiri Olsa <jolsa@××××××.org>
40 - Cc: David Ahern <dsahern@×××××.com>
41 - Fixes: c819e2cf2eb6f65d3208d195d7a0edef6108d5
42 - Link: http://lkml.kernel.org/r/5582c48a.84a22b0a.a918.5285SMTPIN_ADDED_MISSING@×××××××××.com
43 - Signed-off-by: Arnaldo Carvalho de Melo <acme@××××××.com>
44 -
45 -diff --git a/tools/build/Makefile.build b/tools/build/Makefile.build
46 -index 10df572..98cfc38 100644
47 ---- a/tools/build/Makefile.build
48 -+++ b/tools/build/Makefile.build
49 -@@ -94,12 +94,12 @@ obj-y := $(patsubst %/, %/$(obj)-in.o, $(obj-y))
50 - subdir-obj-y := $(filter %/$(obj)-in.o, $(obj-y))
51 -
52 - # '$(OUTPUT)/dir' prefix to all objects
53 --prefix := $(subst ./,,$(OUTPUT)$(dir)/)
54 --obj-y := $(addprefix $(prefix),$(obj-y))
55 --subdir-obj-y := $(addprefix $(prefix),$(subdir-obj-y))
56 -+objprefix := $(subst ./,,$(OUTPUT)$(dir)/)
57 -+obj-y := $(addprefix $(objprefix),$(obj-y))
58 -+subdir-obj-y := $(addprefix $(objprefix),$(subdir-obj-y))
59 -
60 - # Final '$(obj)-in.o' object
61 --in-target := $(prefix)$(obj)-in.o
62 -+in-target := $(objprefix)$(obj)-in.o
63 -
64 - PHONY += $(subdir-y)
65 -