diff options
Diffstat (limited to 'dev-util/perf')
| -rw-r--r-- | dev-util/perf/Manifest | 1 | ||||
| -rw-r--r-- | dev-util/perf/files/perf-4.1.5-prefix.patch | 43 |
2 files changed, 0 insertions, 44 deletions
diff --git a/dev-util/perf/Manifest b/dev-util/perf/Manifest index f07e29d3370b..80eaa194e143 100644 --- a/dev-util/perf/Manifest +++ b/dev-util/perf/Manifest @@ -1,4 +1,3 @@ -AUX perf-4.1.5-prefix.patch 1637 BLAKE2B 8fdccb3d6d8f2955118e96edf4990e4d9a172524d49f36d757254dd983733c81f82d3920c21f40b6dd5e4df3d5ec2b799bb163c44dc5340f4128c5560430bb4d SHA512 ff7179d7b06513a83f0909723ad47774c07ad089079f43750c24a1dca685745048bce5ea6b0766e65e48b75b50d5a26866e827a89b0206800769ea2779355d6b DIST linux-4.14.tar.xz 100770500 BLAKE2B 85dc4aa953fe65e273a24473d8de98e4f204f97c43be9fc87cf5be01f796f94cfde5c8f9c84619751f1cac51f83ce0b4681fb19c5f2965a72d4a94fe5577846a SHA512 77e43a02d766c3d73b7e25c4aafb2e931d6b16e870510c22cef0cdb05c3acb7952b8908ebad12b10ef982c6efbe286364b1544586e715cf38390e483927904d8 DIST linux-4.20.tar.xz 104257836 BLAKE2B fb52cad2897da319299486fa8c3b9415cd0aee0842dbf353a5b269720dcb902db407bb55dd95a77b212dcb4a488c15363d561f3649d6bd16885561f2466d90b1 SHA512 e282399beea5da539701aed2bc131abd5bc74a970dcd344163e9d295106dfd700180e672ed546ae5e55bc6b9ac95efd5ca1de2039015c1b7a6fc9c01ea6583d4 DIST patch-4.14.33.xz 905284 BLAKE2B e67bd9a96708aaaf65eb0aa852493b2323c9e237bfcc6fa837f795e481943ead3e2d5005ee72e40fc247df01c50877d9da3848a05aba3c999c3cfb7678cbdbc9 SHA512 5c76be5171709c2df7df7d5a8e8f3d0f7ede47b433da3b0f1710f262c8fcf5cf6c744a96d4336ea397c2c88a5f0a7507a5ab08c7c82f08deeb7a6f887ad77cfd diff --git a/dev-util/perf/files/perf-4.1.5-prefix.patch b/dev-util/perf/files/perf-4.1.5-prefix.patch deleted file mode 100644 index 0c4dff011306..000000000000 --- a/dev-util/perf/files/perf-4.1.5-prefix.patch +++ /dev/null @@ -1,43 +0,0 @@ -commit 75e84ab906ef8935cff3df3d8929f1bafea81599 -Author: Lukas Wunner <lukas@wunner.de> -Date: Thu Jun 18 13:00:32 2015 +0200 - - perf tools: Fix build breakage if prefix= is specified - - Invoking Makefile.perf with prefix= breaks the build since Makefile.perf - hands that variable down to Makefile.build where it overrides - - prefix := $(subst ./,,$(OUTPUT)$(dir)/) - - leading to errors like this: - - No rule to make target '/usrabspath.o', needed by '/usrlibperf-in.o' - - Signed-off-by: Lukas Wunner <lukas@wunner.de> - Acked-by: Jiri Olsa <jolsa@kernel.org> - Cc: David Ahern <dsahern@gmail.com> - Fixes: c819e2cf2eb6f65d3208d195d7a0edef6108d5 - Link: http://lkml.kernel.org/r/5582c48a.84a22b0a.a918.5285SMTPIN_ADDED_MISSING@mx.google.com - Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com> - -diff --git a/tools/build/Makefile.build b/tools/build/Makefile.build -index 10df572..98cfc38 100644 ---- a/tools/build/Makefile.build -+++ b/tools/build/Makefile.build -@@ -94,12 +94,12 @@ obj-y := $(patsubst %/, %/$(obj)-in.o, $(obj-y)) - subdir-obj-y := $(filter %/$(obj)-in.o, $(obj-y)) - - # '$(OUTPUT)/dir' prefix to all objects --prefix := $(subst ./,,$(OUTPUT)$(dir)/) --obj-y := $(addprefix $(prefix),$(obj-y)) --subdir-obj-y := $(addprefix $(prefix),$(subdir-obj-y)) -+objprefix := $(subst ./,,$(OUTPUT)$(dir)/) -+obj-y := $(addprefix $(objprefix),$(obj-y)) -+subdir-obj-y := $(addprefix $(objprefix),$(subdir-obj-y)) - - # Final '$(obj)-in.o' object --in-target := $(prefix)$(obj)-in.o -+in-target := $(objprefix)$(obj)-in.o - - PHONY += $(subdir-y) - |