Gentoo Archives: gentoo-commits

From: Patrick McLean <chutzpah@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-util/trace-cmd/files/
Date: Wed, 13 Mar 2019 00:36:34
Message-Id: 1552437370.1dc904d0637228ce15ab42d9ce30fac059950d73.chutzpah@gentoo
1 commit: 1dc904d0637228ce15ab42d9ce30fac059950d73
2 Author: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com>
3 AuthorDate: Tue Mar 12 17:36:39 2019 +0000
4 Commit: Patrick McLean <chutzpah <AT> gentoo <DOT> org>
5 CommitDate: Wed Mar 13 00:36:10 2019 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1dc904d0
7
8 dev-util/trace-cmd: remove unused patch
9
10 Signed-off-by: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail.com>
11 Closes: https://github.com/gentoo/gentoo/pull/11348
12 Signed-off-by: Patrick McLean <chutzpah <AT> gentoo.org>
13
14 .../trace-cmd/files/trace-cmd-2.5.1-makefile.patch | 34 ----------------------
15 1 file changed, 34 deletions(-)
16
17 diff --git a/dev-util/trace-cmd/files/trace-cmd-2.5.1-makefile.patch b/dev-util/trace-cmd/files/trace-cmd-2.5.1-makefile.patch
18 deleted file mode 100644
19 index ec9fb1774a3..00000000000
20 --- a/dev-util/trace-cmd/files/trace-cmd-2.5.1-makefile.patch
21 +++ /dev/null
22 @@ -1,34 +0,0 @@
23 -diff --git a/Makefile b/Makefile
24 -index 186e245..9127f23 100644
25 ---- a/Makefile
26 -+++ b/Makefile
27 -@@ -58,7 +58,7 @@ plugin_dir = $(HOME)/.trace-cmd/plugins
28 - python_dir = $(HOME)/.trace-cmd/python
29 - else
30 - plugin_dir = $(prefix)/$(libdir)/trace-cmd/plugins
31 --python_dir = $(prefix)/$(libdir)/trace-cmd/python
32 -+python_dir ?= $(prefix)/$(libdir)/trace-cmd/python
33 - PLUGIN_DIR = -DPLUGIN_DIR="$(plugin_dir)"
34 - PYTHON_DIR = -DPYTHON_DIR="$(python_dir)"
35 - PLUGIN_DIR_SQ = '$(subst ','\'',$(PLUGIN_DIR))'
36 -@@ -98,8 +98,11 @@ endif # NO_PYTHON
37 - test-build = $(if $(shell sh -c 'echo "$(1)" | \
38 - $(CC) -o /dev/null -c -x c - > /dev/null 2>&1 && echo y'), $2)
39 -
40 -+ifndef NO_UDIS86
41 - # have udis86 disassembler library?
42 --udis86-flags := $(call test-build,\#include <udis86.h>,-DHAVE_UDIS86 -ludis86)
43 -+udis86-flags := -DHAVE_UDIS86
44 -+udis86-ldflags := -ludis86
45 -+endif # NO_UDIS86
46 -
47 - define BLK_TC_FLUSH_SOURCE
48 - #include <linux/blktrace_api.h>
49 -@@ -242,6 +245,7 @@ endif
50 - # Append required CFLAGS
51 - override CFLAGS += $(CONFIG_FLAGS) $(INCLUDES) $(PLUGIN_DIR_SQ)
52 - override CFLAGS += $(udis86-flags) $(blk-flags)
53 -+override LDFLAGS += $(udis86-ldflags)
54 -
55 - ifeq ($(VERBOSE),1)
56 - Q =