[gentoo-commits] repo/gentoo:master commit in: dev-util/trace-cmd/, dev-util/trace-cmd/files/
commit: 9b6cc72975fcc8805ee33d1394a92545b9c901d9
Author: jinqiang zhang 0x0 ee>
AuthorDate: Tue Dec 20 00:06:26 2022 +
Commit: Yixun Lan gentoo org>
CommitDate: Tue Dec 20 01:54:30 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9b6cc729
dev-util/trace-cmd: fix compile hangs under make-4.4
expand variables immediately while invoking $(shell ) function
Releated:
* [SV 10593] Export variables to $(shell ...) commands
https://git.savannah.gnu.org/cgit/make.git/commit/?id=98da874c
* [SV 63016] Don't fail exporting to $(shell ...)
https://git.savannah.gnu.org/cgit/make.git/commit/?id=7d484017
Closes: https://bugs.gentoo.org/881605
Closes: https://github.com/gentoo/gentoo/pull/28717
Signed-off-by: jinqiang zhang 0x0.ee>
Signed-off-by: Yixun Lan gentoo.org>
.../files/trace-cmd-3.1.4-hang-make-4.4.patch | 65 ++
dev-util/trace-cmd/trace-cmd-3.1.4.ebuild | 4 ++
2 files changed, 69 insertions(+)
diff --git a/dev-util/trace-cmd/files/trace-cmd-3.1.4-hang-make-4.4.patch
b/dev-util/trace-cmd/files/trace-cmd-3.1.4-hang-make-4.4.patch
new file mode 100644
index ..b65109505873
--- /dev/null
+++ b/dev-util/trace-cmd/files/trace-cmd-3.1.4-hang-make-4.4.patch
@@ -0,0 +1,65 @@
+From e95be06da53eceeac332424d9893463c6c758b3d Mon Sep 17 00:00:00 2001
+From: jinqiang zhang
+Date: Mon, 19 Dec 2022 22:57:32 +
+Subject: [PATCH] Fix compile hangs under make 4.4
+
+And run `make -d` with see below error messages:
+
+Makefile:224: not recursively expanding LIBTRACECMD_SHARED_VERSION to export
to shell function
+Makefile:225: not recursively expanding LIBTRACECMD_SHARED_SO to export to
shell function
+Makefile:237: not recursively expanding LIBTRACEEVENT_CFLAGS to export to
shell function
+Makefile:238: not recursively expanding LIBTRACEEVENT_LDLAGS to export to
shell function
+Makefile:79: not recursively expanding pkgconfig_dir to export to shell
function
+
+Since make 4.4, recursively variables will set as empty string.
+
+Releated:
+ * [SV 10593] Export variables to $(shell ...) commands:
https://git.savannah.gnu.org/cgit/make.git/commit/?id=98da874c
+ * [SV 63016] Don't fail exporting to $(shell ...):
https://git.savannah.gnu.org/cgit/make.git/commit/?id=7d484017
+ * dev-util/trace-cmd-3.1.4 fails to compile: hangs:
https://bugs.gentoo.org/881605
+
+Signed-off-by: jinqiang zhang
+---
+ Makefile | 12 ++--
+ 1 file changed, 6 insertions(+), 6 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index e67cb77..ed98732 100644
+--- a/Makefile
b/Makefile
+@@ -221,8 +221,8 @@ LIBS ?= -ldl
+ LIBTRACECMD_DIR = $(obj)/lib/trace-cmd
+ LIBTRACECMD_STATIC = $(LIBTRACECMD_DIR)/libtracecmd.a
+ LIBTRACECMD_SHARED = $(LIBTRACECMD_DIR)/libtracecmd.so.$(LIBTRACECMD_VERSION)
+-LIBTRACECMD_SHARED_VERSION = $(shell echo $(LIBTRACECMD_SHARED) | sed -e
's/\(\.so\.[0-9]*\).*/\1/')
+-LIBTRACECMD_SHARED_SO = $(shell echo $(LIBTRACECMD_SHARED) | sed -e
's/\(\.so\).*/\1/')
++LIBTRACECMD_SHARED_VERSION := $(shell echo $(LIBTRACECMD_SHARED) | sed -e
's/\(\.so\.[0-9]*\).*/\1/')
++LIBTRACECMD_SHARED_SO := $(shell echo $(LIBTRACECMD_SHARED) | sed -e
's/\(\.so\).*/\1/')
+
+ export LIBTRACECMD_STATIC LIBTRACECMD_SHARED
+ export LIBTRACECMD_SHARED_VERSION LIBTRACECMD_SHARED_SO
+@@ -234,8 +234,8 @@ TEST_LIBTRACEEVENT = $(shell sh -c "$(PKG_CONFIG)
--atleast-version $(LIBTRACEEV
+ TEST_LIBTRACEFS = $(shell sh -c "$(PKG_CONFIG) --atleast-version
$(LIBTRACEFS_MIN_VERSION) $(LIBTRACEFS) > /dev/null 2>&1 && echo y")
+
+ ifeq ("$(TEST_LIBTRACEEVENT)", "y")
+-LIBTRACEEVENT_CFLAGS = $(shell sh -c "$(PKG_CONFIG) --cflags
$(LIBTRACEEVENT)")
+-LIBTRACEEVENT_LDLAGS = $(shell sh -c "$(PKG_CONFIG) --libs $(LIBTRACEEVENT)")
++LIBTRACEEVENT_CFLAGS := $(shell sh -c "$(PKG_CONFIG) --cflags
$(LIBTRACEEVENT)")
++LIBTRACEEVENT_LDLAGS := $(shell sh -c "$(PKG_CONFIG) --libs $(LIBTRACEEVENT)")
+ else
+ .PHONY: warning
+ warning:
+@@ -253,8 +253,8 @@ endif
+ export LIBTRACEEVENT_CFLAGS LIBTRACEEVENT_LDLAGS
+
+ ifeq ("$(TEST_LIBTRACEFS)", "y")
+-LIBTRACEFS_CFLAGS = $(shell sh -c "$(PKG_CONFIG) --cflags $(LIBTRACEFS)")
+-LIBTRACEFS_LDLAGS = $(shell sh -c "$(PKG_CONFIG) --libs $(LIBTRACEFS)")
++LIBTRACEFS_CFLAGS := $(shell sh -c "$(PKG_CONFIG) --cflags $(LIBTRACEFS)")
++LIBTRACEFS_LDLAGS := $(shell sh -c "$(PKG_CONFIG) --libs $(LIBTRACEFS)")
+ else
+ .PHONY: warning
+ warning:
+--
+2.39.0
+
diff --git a/dev-util/trace-cmd/trace-cmd-3.1.4.ebuild
b/dev-util/trace-cmd/trace-cmd-3.1.4.ebuild
index 0d772370332c..f13210697f74 100644
--- a/dev-util/trace-cmd/trace-cmd-3.1.4.ebuild
+++ b/dev-util/trace-cmd/trace-cmd-3.1.4.ebuild
@@ -49,6 +49,10 @@ BDEPEND="
# having trouble getting tests to compile
RESTRICT+=" test"
+PATCHES=(
+ "${FILESDIR}"/${P}-hang-make-4.4.patch
+)
+
pkg_setup() {
local CONFIG_CHECK="
~TRACING
[gentoo-commits] repo/gentoo:master commit in: dev-util/trace-cmd/, dev-util/trace-cmd/files/
commit: 89b8e1a2660868d20af7ca48e34d849ae48957b2 Author: Jakov Smolic sartura hr> AuthorDate: Fri Mar 26 13:23:57 2021 + Commit: David Seifert gentoo org> CommitDate: Fri Mar 26 13:23:57 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=89b8e1a2 dev-util/trace-cmd: Remove old 2.8.3 Closes: https://github.com/gentoo/gentoo/pull/20125 Signed-off-by: Jakov Smolic sartura.hr> Signed-off-by: David Seifert gentoo.org> dev-util/trace-cmd/Manifest| 1 - .../trace-cmd-2.8-python-pkgconfig-name.patch | 27 - .../trace-cmd/files/trace-cmd-2.8.3-gcc10.patch| 104 --- .../files/trace-cmd-2.8.3-python3-warnings.patch | 50 - .../trace-cmd/files/trace-cmd-2.8.3-soname.patch | 13 --- dev-util/trace-cmd/trace-cmd-2.8.3.ebuild | 113 - 6 files changed, 308 deletions(-) diff --git a/dev-util/trace-cmd/Manifest b/dev-util/trace-cmd/Manifest index 53023f987a4..7b96b573b3e 100644 --- a/dev-util/trace-cmd/Manifest +++ b/dev-util/trace-cmd/Manifest @@ -1,2 +1 @@ -DIST trace-cmd-v2.8.3.tar.gz 1996617 BLAKE2B 0ab77649af90a0a9368ff118dc94e6fd003b18ceb2065ae3a4559a1d2cfa93be44d87bfb97e2e2f06898508699ff5ce18face4edefd7e40b3b9cca405a626cff SHA512 51166c4276abda209a099cc6fe9081ad6d403cbfd9d4a53bc5bb068392327e88fe647e9324a527e68730d73d1a5f7f74126718547f94c652bb12e51c7518a58b DIST trace-cmd-v2.9.1.tar.gz 4298008 BLAKE2B f7aa2f12b2c90f35390857ed6f5818b74c42be36ce70835d86410f9f4931d27410123baaad007fa2795c1ba1f5bafc739db620f467ccc48021d774ee7be8a68d SHA512 186bfdd8ff1e88e9e6d3ae87b123f049892deaaa8d6a42944b6f8abee6b828946b88774029aa96daf4423a3dfc01b42835508f44f636dd02579ef9a8ef425131 diff --git a/dev-util/trace-cmd/files/trace-cmd-2.8-python-pkgconfig-name.patch b/dev-util/trace-cmd/files/trace-cmd-2.8-python-pkgconfig-name.patch deleted file mode 100644 index 17c2e693f1c..000 --- a/dev-util/trace-cmd/files/trace-cmd-2.8-python-pkgconfig-name.patch +++ /dev/null @@ -1,27 +0,0 @@ -diff --git a/Makefile b/Makefile -index d34c615..7931c88 100644 a/Makefile -+++ b/Makefile -@@ -115,9 +115,10 @@ PYTHON:= ctracecmd.so - PYTHON_GUI:= ctracecmd.so ctracecmdgui.so - - PYTHON_VERS ?= python -+PYTHON_PKGCONFIG_VERS ?= $(PYTHON_VERS) - - # Can build python? --ifeq ($(shell sh -c "pkg-config --cflags $(PYTHON_VERS) > /dev/null 2>&1 && echo y"), y) -+ifeq ($(shell sh -c "pkg-config --cflags $(PYTHON_PKGCONFIG_VERS) > /dev/null 2>&1 && echo y"), y) - PYTHON_PLUGINS := plugin_python.so - BUILD_PYTHON := $(PYTHON) $(PYTHON_PLUGINS) - BUILD_PYTHON_WORKS := 1 -@@ -372,8 +373,8 @@ report_nopythondev: force - $(Q)echo - - ifndef NO_PYTHON --PYTHON_INCLUDES = `pkg-config --cflags $(PYTHON_VERS)` --PYTHON_LDFLAGS = `pkg-config --libs $(PYTHON_VERS)` \ -+PYTHON_INCLUDES = `pkg-config --cflags $(PYTHON_PKGCONFIG_VERS)` -+PYTHON_LDFLAGS = `pkg-config --libs $(PYTHON_PKGCONFIG_VERS)` \ - $(shell $(PYTHON_VERS)-config --ldflags) - PYGTK_CFLAGS = `pkg-config --cflags pygtk-2.0` - else diff --git a/dev-util/trace-cmd/files/trace-cmd-2.8.3-gcc10.patch b/dev-util/trace-cmd/files/trace-cmd-2.8.3-gcc10.patch deleted file mode 100644 index 709347448df..000 --- a/dev-util/trace-cmd/files/trace-cmd-2.8.3-gcc10.patch +++ /dev/null @@ -1,104 +0,0 @@ -diff --git a/tracecmd/trace-hist.c b/tracecmd/trace-hist.c -index 384a7ff..e0e7c47 100644 a/tracecmd/trace-hist.c -+++ b/tracecmd/trace-hist.c -@@ -27,26 +27,26 @@ static int kernel_stack_type; - - static int long_size; - --struct tep_format_field *common_type_field; --struct tep_format_field *common_pid_field; --struct tep_format_field *sched_wakeup_comm_field; --struct tep_format_field *sched_wakeup_new_comm_field; --struct tep_format_field *sched_wakeup_pid_field; --struct tep_format_field *sched_wakeup_new_pid_field; --struct tep_format_field *sched_switch_prev_field; --struct tep_format_field *sched_switch_next_field; --struct tep_format_field *sched_switch_prev_pid_field; --struct tep_format_field *sched_switch_next_pid_field; --struct tep_format_field *function_ip_field; --struct tep_format_field *function_parent_ip_field; --struct tep_format_field *function_graph_entry_func_field; --struct tep_format_field *function_graph_entry_depth_field; --struct tep_format_field *function_graph_exit_func_field; --struct tep_format_field *function_graph_exit_depth_field; --struct tep_format_field *function_graph_exit_calltime_field; --struct tep_format_field *function_graph_exit_rettime_field; --struct tep_format_field *function_graph_exit_overrun_field; --struct tep_format_field *kernel_stack_caller_field; -+static struct tep_format_field *common_type_hist; -+static struct tep_format_field *common_pid_field; -+static struct tep_format_field *sched_wakeup_comm_field; -+static struct tep_format_field *sched_wakeup_new_comm_field; -+static struct tep_format_field *sched_wakeup_pid_field;
[gentoo-commits] repo/gentoo:master commit in: dev-util/trace-cmd/, dev-util/trace-cmd/files/
commit: 7ba71a3dab311c81360dfc76c38503d85167145b
Author: Patrick McLean gentoo org>
AuthorDate: Sat May 9 04:36:18 2020 +
Commit: Patrick McLean gentoo org>
CommitDate: Sat May 9 04:36:18 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7ba71a3d
dev-util/trace-cmd-2.8.3: Add patch to build with gcc-10
Add a call to python_optimize in python_install as well.
Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Patrick McLean gentoo.org>
.../trace-cmd/files/trace-cmd-2.8.3-gcc10.patch| 104 +
dev-util/trace-cmd/trace-cmd-2.8.3.ebuild | 3 +
2 files changed, 107 insertions(+)
diff --git a/dev-util/trace-cmd/files/trace-cmd-2.8.3-gcc10.patch
b/dev-util/trace-cmd/files/trace-cmd-2.8.3-gcc10.patch
new file mode 100644
index 000..709347448df
--- /dev/null
+++ b/dev-util/trace-cmd/files/trace-cmd-2.8.3-gcc10.patch
@@ -0,0 +1,104 @@
+diff --git a/tracecmd/trace-hist.c b/tracecmd/trace-hist.c
+index 384a7ff..e0e7c47 100644
+--- a/tracecmd/trace-hist.c
b/tracecmd/trace-hist.c
+@@ -27,26 +27,26 @@ static int kernel_stack_type;
+
+ static int long_size;
+
+-struct tep_format_field *common_type_field;
+-struct tep_format_field *common_pid_field;
+-struct tep_format_field *sched_wakeup_comm_field;
+-struct tep_format_field *sched_wakeup_new_comm_field;
+-struct tep_format_field *sched_wakeup_pid_field;
+-struct tep_format_field *sched_wakeup_new_pid_field;
+-struct tep_format_field *sched_switch_prev_field;
+-struct tep_format_field *sched_switch_next_field;
+-struct tep_format_field *sched_switch_prev_pid_field;
+-struct tep_format_field *sched_switch_next_pid_field;
+-struct tep_format_field *function_ip_field;
+-struct tep_format_field *function_parent_ip_field;
+-struct tep_format_field *function_graph_entry_func_field;
+-struct tep_format_field *function_graph_entry_depth_field;
+-struct tep_format_field *function_graph_exit_func_field;
+-struct tep_format_field *function_graph_exit_depth_field;
+-struct tep_format_field *function_graph_exit_calltime_field;
+-struct tep_format_field *function_graph_exit_rettime_field;
+-struct tep_format_field *function_graph_exit_overrun_field;
+-struct tep_format_field *kernel_stack_caller_field;
++static struct tep_format_field *common_type_hist;
++static struct tep_format_field *common_pid_field;
++static struct tep_format_field *sched_wakeup_comm_field;
++static struct tep_format_field *sched_wakeup_new_comm_field;
++static struct tep_format_field *sched_wakeup_pid_field;
++static struct tep_format_field *sched_wakeup_new_pid_field;
++static struct tep_format_field *sched_switch_prev_field;
++static struct tep_format_field *sched_switch_next_field;
++static struct tep_format_field *sched_switch_prev_pid_field;
++static struct tep_format_field *sched_switch_next_pid_field;
++static struct tep_format_field *function_ip_field;
++static struct tep_format_field *function_parent_ip_field;
++static struct tep_format_field *function_graph_entry_func_field;
++static struct tep_format_field *function_graph_entry_depth_field;
++static struct tep_format_field *function_graph_exit_func_field;
++static struct tep_format_field *function_graph_exit_depth_field;
++static struct tep_format_field *function_graph_exit_calltime_field;
++static struct tep_format_field *function_graph_exit_rettime_field;
++static struct tep_format_field *function_graph_exit_overrun_field;
++static struct tep_format_field *kernel_stack_caller_field;
+
+ static int compact;
+
+@@ -568,7 +568,7 @@ process_record(struct tep_handle *pevent, struct
tep_record *record)
+ unsigned long long val;
+ int type;
+
+- tep_read_number_field(common_type_field, record->data, );
++ tep_read_number_field(common_type_hist, record->data, );
+ type = val;
+
+ if (type == function_type)
+@@ -956,8 +956,8 @@ static void do_trace_hist(struct tracecmd_input *handle)
+
+ long_size = tracecmd_long_size(handle);
+
+- common_type_field = tep_find_common_field(event, "common_type");
+- if (!common_type_field)
++ common_type_hist = tep_find_common_field(event, "common_type");
++ if (!common_type_hist)
+ die("Can't find a 'type' field?");
+
+ common_pid_field = tep_find_common_field(event, "common_pid");
+diff --git a/tracecmd/trace-mem.c b/tracecmd/trace-mem.c
+index 078a61b..630aeff 100644
+--- a/tracecmd/trace-mem.c
b/tracecmd/trace-mem.c
+@@ -30,7 +30,7 @@ static int kmem_cache_alloc_type;
+ static int kmem_cache_alloc_node_type;
+ static int kmem_cache_free_type;
+
+-struct tep_format_field *common_type_field;
++static struct tep_format_field *common_type_mem;
+
+ struct tep_format_field *kmalloc_callsite_field;
+ struct tep_format_field *kmalloc_bytes_req_field;
+@@ -369,7 +369,7 @@ process_record(struct tep_handle *pevent, struct
tep_record *record)
+ unsigned long long val;
+ int type;
+
+-
[gentoo-commits] repo/gentoo:master commit in: dev-util/trace-cmd/, dev-util/trace-cmd/files/
commit: 70985feb3fc5e0dbb27fcd557fc2aae76e088017
Author: Patrick McLean sony com>
AuthorDate: Fri Jul 26 00:30:48 2019 +
Commit: Patrick McLean gentoo org>
CommitDate: Fri Jul 26 00:30:48 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=70985feb
dev-util/trace-cmd: Clean up old
Copyright: Sony Interactive Entertainment Inc.
Package-Manager: Portage-2.3.69, Repoman-2.3.16
Signed-off-by: Patrick McLean gentoo.org>
dev-util/trace-cmd/Manifest| 1 -
.../trace-cmd/files/trace-cmd-2.7-makefile.patch | 36 --
.../trace-cmd/files/trace-cmd-2.7-soname.patch | 13
dev-util/trace-cmd/trace-cmd-2.7-r2.ebuild | 83 --
4 files changed, 133 deletions(-)
diff --git a/dev-util/trace-cmd/Manifest b/dev-util/trace-cmd/Manifest
index a058e6d2baa..4c4cec3dacc 100644
--- a/dev-util/trace-cmd/Manifest
+++ b/dev-util/trace-cmd/Manifest
@@ -1,2 +1 @@
-DIST trace-cmd-v2.7.tar.gz 1865571 BLAKE2B
e0df57c78c6505c856381f17cfdecdaa7a4441eee4cfc57af4fff79a0157ca7aa7c76a81428ddf8d9d00d6bb0a5391b99d4bb5f92fadc7e4062a0181facb2cc9
SHA512
e507eb6609f1fd3dddec541e9f69c466f4f3f66c28f0a7f4292615e3984cebaaf42725f3d82b8c625e5c60977d1f9b5e96cce7664b951eb5f99b955cc440efe4
DIST trace-cmd-v2.8.3.tar.gz 1996617 BLAKE2B
0ab77649af90a0a9368ff118dc94e6fd003b18ceb2065ae3a4559a1d2cfa93be44d87bfb97e2e2f06898508699ff5ce18face4edefd7e40b3b9cca405a626cff
SHA512
51166c4276abda209a099cc6fe9081ad6d403cbfd9d4a53bc5bb068392327e88fe647e9324a527e68730d73d1a5f7f74126718547f94c652bb12e51c7518a58b
diff --git a/dev-util/trace-cmd/files/trace-cmd-2.7-makefile.patch
b/dev-util/trace-cmd/files/trace-cmd-2.7-makefile.patch
deleted file mode 100644
index a9d7584dc62..000
--- a/dev-util/trace-cmd/files/trace-cmd-2.7-makefile.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-diff --git a/Makefile b/Makefile
-index a5d2c38..a99e5a4 100644
a/Makefile
-+++ b/Makefile
-@@ -63,7 +63,7 @@ python_dir = $(HOME)/.trace-cmd/python
- var_dir = $(HOME)/.trace-cmd/
- else
- plugin_dir = $(libdir)/trace-cmd/plugins
--python_dir = $(libdir)/trace-cmd/python
-+python_dir ?= $(libdir)/trace-cmd/python
- PLUGIN_DIR = -DPLUGIN_DIR="$(plugin_dir)"
- PYTHON_DIR = -DPYTHON_DIR="$(python_dir)"
- PLUGIN_DIR_SQ = '$(subst ','\'',$(PLUGIN_DIR))'
-@@ -119,8 +119,13 @@ endif # NO_PYTHON
- test-build = $(if $(shell sh -c 'echo "$(1)" | \
- $(CC) -o /dev/null -c -x c - > /dev/null 2>&1 && echo y'), $2)
-
-+ifndef NO_UDIS86
- # have udis86 disassembler library?
--udis86-flags := $(call test-build,\#include ,-DHAVE_UDIS86 -ludis86)
-+udis86-flags := -DHAVE_UDIS86
-+udis86-ldflags := -ludis86
-+else
-+udis86-flags := -UHAVE_UDIS86
-+endif # NO_UDIS86
-
- define BLK_TC_FLUSH_SOURCE
- #include
-@@ -276,6 +281,7 @@ endif
- # Append required CFLAGS
- override CFLAGS += $(CONFIG_FLAGS) $(INCLUDES) $(PLUGIN_DIR_SQ) $(VAR_DIR)
- override CFLAGS += $(udis86-flags) $(blk-flags)
-+override LDFLAGS += $(udis86-ldflags)
-
- ifeq ($(VERBOSE),1)
- Q =
diff --git a/dev-util/trace-cmd/files/trace-cmd-2.7-soname.patch
b/dev-util/trace-cmd/files/trace-cmd-2.7-soname.patch
deleted file mode 100644
index 937f0617a4a..000
--- a/dev-util/trace-cmd/files/trace-cmd-2.7-soname.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/Makefile b/Makefile
-index a5d2c38..588809e 100644
a/Makefile
-+++ b/Makefile
-@@ -308,7 +308,7 @@ do_app_build =
\
-
- do_compile_shared_library = \
- ($(print_shared_lib_compile)\
-- $(CC) --shared $^ -o $@)
-+ $(CC) --shared $^ -Wl,-soname,$@ -o $@)
-
- do_compile_plugin_obj = \
- ($(print_plugin_obj_compile)\
diff --git a/dev-util/trace-cmd/trace-cmd-2.7-r2.ebuild
b/dev-util/trace-cmd/trace-cmd-2.7-r2.ebuild
deleted file mode 100644
index 27b25b7f121..000
--- a/dev-util/trace-cmd/trace-cmd-2.7-r2.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=(python2_7)
-
-inherit linux-info python-single-r1 toolchain-funcs
-
-DESCRIPTION="User-space front-end for Ftrace"
-HOMEPAGE="https://git.kernel.org/cgit/linux/kernel/git/rostedt/trace-cmd.git;
-
-if [[ ${PV} == * ]] ; then
-
EGIT_REPO_URI="https://git.kernel.org/pub/scm/linux/kernel/git/rostedt/${PN}.git;
- inherit git-r3
-else
-
SRC_URI="https://git.kernel.org/pub/scm/linux/kernel/git/rostedt/${PN}.git/snapshot/${PN}-v${PV}.tar.gz;
- KEYWORDS="~amd64 ~x86"
- S="${WORKDIR}/${PN}-v${PV}"
-fi
-
-LICENSE="GPL-2+ LGPL-2.1+"
-SLOT="0"
-IUSE="+audit doc python udis86"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-RDEPEND="audit? ( sys-process/audit )
- python? ( ${PYTHON_DEPS} )
- udis86? ( dev-libs/udis86 )"
-DEPEND="${RDEPEND}
- sys-kernel/linux-headers
- python? (
-
[gentoo-commits] repo/gentoo:master commit in: dev-util/trace-cmd/, dev-util/trace-cmd/files/
commit: f88da30dc2b81a234092373b97efe311a2dd94b4
Author: Patrick McLean sony com>
AuthorDate: Thu Jul 25 01:36:44 2019 +
Commit: Patrick McLean gentoo org>
CommitDate: Thu Jul 25 17:16:59 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f88da30d
dev-util/trace-cmd: Version bump to 2.8.3
Copyright: Sony Interactive Entertainment Inc.
Package-Manager: Portage-2.3.69, Repoman-2.3.16
Signed-off-by: Patrick McLean gentoo.org>
dev-util/trace-cmd/Manifest| 2 +-
.../trace-cmd/files/trace-cmd-2.8-makefile.patch | 48 -
.../files/trace-cmd-2.8-python3-warnings.patch | 111 -
.../files/trace-cmd-2.8.3-python3-warnings.patch | 50 ++
...8-soname.patch => trace-cmd-2.8.3-soname.patch} | 8 +-
...-cmd-2.8.2-r1.ebuild => trace-cmd-2.8.3.ebuild} | 8 +-
dev-util/trace-cmd/trace-cmd-.ebuild | 11 +-
7 files changed, 64 insertions(+), 174 deletions(-)
diff --git a/dev-util/trace-cmd/Manifest b/dev-util/trace-cmd/Manifest
index fe97422853f..a058e6d2baa 100644
--- a/dev-util/trace-cmd/Manifest
+++ b/dev-util/trace-cmd/Manifest
@@ -1,2 +1,2 @@
DIST trace-cmd-v2.7.tar.gz 1865571 BLAKE2B
e0df57c78c6505c856381f17cfdecdaa7a4441eee4cfc57af4fff79a0157ca7aa7c76a81428ddf8d9d00d6bb0a5391b99d4bb5f92fadc7e4062a0181facb2cc9
SHA512
e507eb6609f1fd3dddec541e9f69c466f4f3f66c28f0a7f4292615e3984cebaaf42725f3d82b8c625e5c60977d1f9b5e96cce7664b951eb5f99b955cc440efe4
-DIST trace-cmd-v2.8.2.tar.gz 1996476 BLAKE2B
c605c36f4e6d25b25919839d5888db12e89b693ff35e24be9e6496489b06bafbd19bb610ec465c4f59c77f37051c197876fcd6c003060206f141f3d58ba9b394
SHA512
88bc4167bc86c6abfa0b94b0acc580a92c38518d72e06ec82d34b6ecce48f8641dbcabdc77be3492b16a0ab00247a40fd491932b56889d6d74091cdb27da4376
+DIST trace-cmd-v2.8.3.tar.gz 1996617 BLAKE2B
0ab77649af90a0a9368ff118dc94e6fd003b18ceb2065ae3a4559a1d2cfa93be44d87bfb97e2e2f06898508699ff5ce18face4edefd7e40b3b9cca405a626cff
SHA512
51166c4276abda209a099cc6fe9081ad6d403cbfd9d4a53bc5bb068392327e88fe647e9324a527e68730d73d1a5f7f74126718547f94c652bb12e51c7518a58b
diff --git a/dev-util/trace-cmd/files/trace-cmd-2.8-makefile.patch
b/dev-util/trace-cmd/files/trace-cmd-2.8-makefile.patch
deleted file mode 100644
index f95ffc3b18c..000
--- a/dev-util/trace-cmd/files/trace-cmd-2.8-makefile.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-diff --git a/Makefile b/Makefile
-index ad74a96..3bab851 100644
a/Makefile
-+++ b/Makefile
-@@ -64,7 +64,7 @@ python_dir = $(HOME)/.trace-cmd/python
- var_dir = $(HOME)/.trace-cmd/
- else
- plugin_dir = $(libdir)/trace-cmd/plugins
--python_dir = $(libdir)/trace-cmd/python
-+python_dir ?= $(libdir)/trace-cmd/python
- PLUGIN_DIR = -DPLUGIN_DIR="$(plugin_dir)"
- PYTHON_DIR = -DPYTHON_DIR="$(python_dir)"
- PLUGIN_DIR_SQ = '$(subst ','\'',$(PLUGIN_DIR))'
-@@ -136,8 +136,13 @@ export NO_PYTHON
- test-build = $(if $(shell sh -c 'echo "$(1)" | \
- $(CC) -o /dev/null -c -x c - > /dev/null 2>&1 && echo y'), $2)
-
-+ifndef NO_UDIS86
- # have udis86 disassembler library?
--udis86-flags := $(call test-build,\#include ,-DHAVE_UDIS86 -ludis86)
-+udis86-flags := -DHAVE_UDIS86
-+udis86-ldflags := -ludis86
-+else
-+udis86-flags := -UHAVE_UDIS86
-+endif # NO_UDIS86
-
- define BLK_TC_FLUSH_SOURCE
- #include
-@@ -237,6 +242,7 @@ endif
- # Append required CFLAGS
- override CFLAGS += $(INCLUDES) $(PLUGIN_DIR_SQ) $(VAR_DIR)
- override CFLAGS += $(udis86-flags) $(blk-flags)
-+override LDFLAGS += $(udis86-ldflags)
-
- CMD_TARGETS = trace-cmd $(BUILD_PYTHON)
-
-@@ -339,8 +345,10 @@ install_gui: install_cmd gui
- install_libs: libs
- $(Q)$(call do_install,$(LIBTRACECMD_SHARED),$(libdir_SQ))
- $(Q)$(call do_install,$(LIBTRACEEVENT_SHARED),$(libdir_SQ))
-- $(Q)$(call
do_install,$(src)/include/traceevent/event-parse.h,$(includedir_SQ))
-+ $(Q)$(call
do_install,$(src)/include/traceevent/event-parse.h,$(includedir_SQ)/traceevent)
-+ $(Q)$(call
do_install,$(src)/include/traceevent/trace-seq.h,$(includedir_SQ)/traceevent)
- $(Q)$(call
do_install,$(src)/include/trace-cmd/trace-cmd.h,$(includedir_SQ))
-+ $(Q)$(call
do_install,$(src)/include/trace-cmd/trace-filter-hash.h,$(includedir_SQ))
-
- doc:
- $(MAKE) -C $(src)/Documentation all
diff --git a/dev-util/trace-cmd/files/trace-cmd-2.8-python3-warnings.patch
b/dev-util/trace-cmd/files/trace-cmd-2.8-python3-warnings.patch
deleted file mode 100644
index d66ee35accf..000
--- a/dev-util/trace-cmd/files/trace-cmd-2.8-python3-warnings.patch
+++ /dev/null
@@ -1,111 +0,0 @@
-diff --git a/plugins/plugin_python.c b/plugins/plugin_python.c
-index e725ad8..196b825 100644
a/plugins/plugin_python.c
-+++ b/plugins/plugin_python.c
-@@ -81,7 +81,7 @@ int TEP_PLUGIN_LOADER(struct tep_handle *pevent)
- } else
- Py_DECREF(res);
-
-- str = PyString_FromString("pevent");
-+ str = PyUnicode_FromString("pevent");
- if (!str)
- return
[gentoo-commits] repo/gentoo:master commit in: dev-util/trace-cmd/, dev-util/trace-cmd/files/
commit: e23c78ce6df9352f301335fe397543d3ea5f9e0b
Author: Patrick McLean sony com>
AuthorDate: Mon Mar 11 20:29:49 2019 +
Commit: Patrick McLean gentoo org>
CommitDate: Mon Mar 11 20:31:06 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e23c78ce
dev-util/trace-cmd: Revbump to 2.7-r1, fix dynlib and plugin inst
Copyright: Sony Interactive Entertainment Inc.
Package-Manager: Portage-2.3.62, Repoman-2.3.12
Signed-off-by: Patrick McLean gentoo.org>
dev-util/trace-cmd/files/trace-cmd-2.7-soname.patch | 13 +
...{trace-cmd-2.7.ebuild => trace-cmd-2.7-r1.ebuild} | 20 +---
dev-util/trace-cmd/trace-cmd-.ebuild | 18 --
3 files changed, 38 insertions(+), 13 deletions(-)
diff --git a/dev-util/trace-cmd/files/trace-cmd-2.7-soname.patch
b/dev-util/trace-cmd/files/trace-cmd-2.7-soname.patch
new file mode 100644
index 000..937f0617a4a
--- /dev/null
+++ b/dev-util/trace-cmd/files/trace-cmd-2.7-soname.patch
@@ -0,0 +1,13 @@
+diff --git a/Makefile b/Makefile
+index a5d2c38..588809e 100644
+--- a/Makefile
b/Makefile
+@@ -308,7 +308,7 @@ do_app_build =
\
+
+ do_compile_shared_library = \
+ ($(print_shared_lib_compile)\
+- $(CC) --shared $^ -o $@)
++ $(CC) --shared $^ -Wl,-soname,$@ -o $@)
+
+ do_compile_plugin_obj = \
+ ($(print_plugin_obj_compile)\
diff --git a/dev-util/trace-cmd/trace-cmd-2.7.ebuild
b/dev-util/trace-cmd/trace-cmd-2.7-r1.ebuild
similarity index 78%
rename from dev-util/trace-cmd/trace-cmd-2.7.ebuild
rename to dev-util/trace-cmd/trace-cmd-2.7-r1.ebuild
index edebefd435b..6fd69e83c23 100644
--- a/dev-util/trace-cmd/trace-cmd-2.7.ebuild
+++ b/dev-util/trace-cmd/trace-cmd-2.7-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -13,17 +13,18 @@ if [[ ${PV} == * ]] ; then
EGIT_REPO_URI="https://git.kernel.org/pub/scm/linux/kernel/git/rostedt/${PN}.git;
inherit git-r3
else
-
SRC_URI="https://git.kernel.org/pub/scm/linux/kernel/git/rostedt/trace-cmd.git/snapshot/${PN}-v${PV}.tar.gz;
+
SRC_URI="https://git.kernel.org/pub/scm/linux/kernel/git/rostedt/${PN}.git/snapshot/${PN}-v${PV}.tar.gz;
KEYWORDS="~amd64 ~x86"
S="${WORKDIR}/${PN}-v${PV}"
fi
LICENSE="GPL-2+ LGPL-2.1+"
SLOT="0"
-IUSE="doc gtk python udis86"
+IUSE="+audit doc gtk python udis86"
REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-RDEPEND="python? ( ${PYTHON_DEPS} )
+RDEPEND="audit? ( sys-process/audit )
+ python? ( ${PYTHON_DEPS} )
udis86? ( dev-libs/udis86 )
gtk? (
${PYTHON_DEPS}
@@ -45,6 +46,7 @@ CONFIG_CHECK="
PATCHES=(
"${FILESDIR}"/${PN}-2.7-makefile.patch
+ "${FILESDIR}"/${PN}-2.7-soname.patch
)
pkg_setup() {
@@ -53,7 +55,11 @@ pkg_setup() {
}
src_configure() {
- MAKEOPTS+=" prefix=/usr libdir=$(get_libdir) CC=$(tc-getCC)
AR=$(tc-getAR)"
+ MAKEOPTS+=" prefix=/usr
+ libdir=/usr/$(get_libdir)
+ CC=$(tc-getCC)
+ AR=$(tc-getAR)
+ $(usex audit '' '' 'NO_AUDIT=1')"
if use python; then
MAKEOPTS+=" PYTHON_VERS=${EPYTHON//python/python-}"
@@ -66,13 +72,13 @@ src_configure() {
}
src_compile() {
- emake all_cmd
+ emake V=1 all_cmd libs
use doc && emake doc
use gtk && emake -j1 gui
}
src_install() {
- default
+ emake DESTDIR="${D}" V=1 install install_libs
use doc && emake DESTDIR="${D}" install_doc
use gtk && emake DESTDIR="${D}" install_gui
}
diff --git a/dev-util/trace-cmd/trace-cmd-.ebuild
b/dev-util/trace-cmd/trace-cmd-.ebuild
index edebefd435b..f6463fe7257 100644
--- a/dev-util/trace-cmd/trace-cmd-.ebuild
+++ b/dev-util/trace-cmd/trace-cmd-.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -20,10 +20,11 @@ fi
LICENSE="GPL-2+ LGPL-2.1+"
SLOT="0"
-IUSE="doc gtk python udis86"
+IUSE="+audit doc gtk python udis86"
REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-RDEPEND="python? ( ${PYTHON_DEPS} )
+RDEPEND="audit? ( sys-process/audit )
+ python? ( ${PYTHON_DEPS} )
udis86? ( dev-libs/udis86 )
gtk? (
${PYTHON_DEPS}
@@ -45,6 +46,7 @@ CONFIG_CHECK="
PATCHES=(
"${FILESDIR}"/${PN}-2.7-makefile.patch
+ "${FILESDIR}"/${PN}-2.7-soname.patch
)
pkg_setup() {
@@ -53,7 +55,11 @@ pkg_setup() {
}
src_configure() {
- MAKEOPTS+=" prefix=/usr libdir=$(get_libdir) CC=$(tc-getCC)
AR=$(tc-getAR)"
+ MAKEOPTS+=" prefix=/usr
+ libdir=/usr/$(get_libdir)
+
[gentoo-commits] repo/gentoo:master commit in: dev-util/trace-cmd/, dev-util/trace-cmd/files/
commit: 9fd1e559687ccebdc4ae1d8702940ffa5ec204b9
Author: Craig Andrews gentoo org>
AuthorDate: Tue Nov 13 15:30:48 2018 +
Commit: Craig Andrews gentoo org>
CommitDate: Tue Nov 13 15:31:32 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9fd1e559
dev-util/trace-cmd: 2.7 version bump
Closes: https://bugs.gentoo.org/605284
Package-Manager: Portage-2.3.51, Repoman-2.3.12
Signed-off-by: Craig Andrews gentoo.org>
dev-util/trace-cmd/Manifest| 1 +
.../trace-cmd/files/trace-cmd-2.7-makefile.patch | 33 +
dev-util/trace-cmd/trace-cmd-2.7.ebuild| 78 ++
3 files changed, 112 insertions(+)
diff --git a/dev-util/trace-cmd/Manifest b/dev-util/trace-cmd/Manifest
index 9efdfff4ea5..9848415c771 100644
--- a/dev-util/trace-cmd/Manifest
+++ b/dev-util/trace-cmd/Manifest
@@ -1,2 +1,3 @@
DIST trace-cmd-2.5.1.tar.xz 1577148 BLAKE2B
25436354315bcfe886cca26678017846ac95c8f19877bf9fc7ab24ed543406b61516ad56185e78c3a8d79bbbc672419fca468b205f178cdc01baaf0dfd140702
SHA512
2280eefa130a3914c34798f8bd4097a55f7f4fa4632b3d26ee1317bba54625d259ac61c6576dd3051fb2be48fb593fa54a4203d1828b7fec5fd196de00491ea2
DIST trace-cmd-2.6.tar.xz 1584768 BLAKE2B
42b2b4ac37246d610a2747bf0cb025d0f0ef5954a40c57acb8df8245f71fb516e0c124034b44addfee119ea453f1e732f6a2a73fa5e3bfb18da5ea7e1f920ed5
SHA512
cf479a940825935aa89b282c7a617d56fa5dd1f82e3322a969c4e0a08343ceca16c40058ead5f5878260ce0a003102550808c5475110706580769dffb1897c54
+DIST trace-cmd-v2.7.tar.gz 1865571 BLAKE2B
e0df57c78c6505c856381f17cfdecdaa7a4441eee4cfc57af4fff79a0157ca7aa7c76a81428ddf8d9d00d6bb0a5391b99d4bb5f92fadc7e4062a0181facb2cc9
SHA512
e507eb6609f1fd3dddec541e9f69c466f4f3f66c28f0a7f4292615e3984cebaaf42725f3d82b8c625e5c60977d1f9b5e96cce7664b951eb5f99b955cc440efe4
diff --git a/dev-util/trace-cmd/files/trace-cmd-2.7-makefile.patch
b/dev-util/trace-cmd/files/trace-cmd-2.7-makefile.patch
new file mode 100644
index 000..da1ca62e7c0
--- /dev/null
+++ b/dev-util/trace-cmd/files/trace-cmd-2.7-makefile.patch
@@ -0,0 +1,33 @@
+diff -ur trace-cmd-v2.7.orig/Makefile trace-cmd-v2.7/Makefile
+--- trace-cmd-v2.7.orig/Makefile 2018-02-01 23:35:28.0 +0100
trace-cmd-v2.7/Makefile2018-09-16 16:42:58.445655156 +0200
+@@ -63,7 +63,7 @@
+ var_dir = $(HOME)/.trace-cmd/
+ else
+ plugin_dir = $(libdir)/trace-cmd/plugins
+-python_dir = $(libdir)/trace-cmd/python
++python_dir ?= $(libdir)/trace-cmd/python
+ PLUGIN_DIR = -DPLUGIN_DIR="$(plugin_dir)"
+ PYTHON_DIR = -DPYTHON_DIR="$(python_dir)"
+ PLUGIN_DIR_SQ = '$(subst ','\'',$(PLUGIN_DIR))'
+@@ -119,8 +119,11 @@
+ test-build = $(if $(shell sh -c 'echo "$(1)" | \
+ $(CC) -o /dev/null -c -x c - > /dev/null 2>&1 && echo y'), $2)
+
++ifndef NO_UDIS86
+ # have udis86 disassembler library?
+-udis86-flags := $(call test-build,\#include ,-DHAVE_UDIS86 -ludis86)
++udis86-flags := -DHAVE_UDIS86
++udis86-ldflags := -ludis86
++endif # NO_UDIS86
+
+ define BLK_TC_FLUSH_SOURCE
+ #include
+@@ -276,6 +279,7 @@
+ # Append required CFLAGS
+ override CFLAGS += $(CONFIG_FLAGS) $(INCLUDES) $(PLUGIN_DIR_SQ) $(VAR_DIR)
+ override CFLAGS += $(udis86-flags) $(blk-flags)
++override LDFLAGS += $(udis86-ldflags)
+
+ ifeq ($(VERBOSE),1)
+ Q =
diff --git a/dev-util/trace-cmd/trace-cmd-2.7.ebuild
b/dev-util/trace-cmd/trace-cmd-2.7.ebuild
new file mode 100644
index 000..edebefd435b
--- /dev/null
+++ b/dev-util/trace-cmd/trace-cmd-2.7.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=(python2_7)
+
+inherit linux-info python-single-r1 toolchain-funcs
+
+DESCRIPTION="User-space front-end for Ftrace"
+HOMEPAGE="https://git.kernel.org/cgit/linux/kernel/git/rostedt/trace-cmd.git;
+
+if [[ ${PV} == * ]] ; then
+
EGIT_REPO_URI="https://git.kernel.org/pub/scm/linux/kernel/git/rostedt/${PN}.git;
+ inherit git-r3
+else
+
SRC_URI="https://git.kernel.org/pub/scm/linux/kernel/git/rostedt/trace-cmd.git/snapshot/${PN}-v${PV}.tar.gz;
+ KEYWORDS="~amd64 ~x86"
+ S="${WORKDIR}/${PN}-v${PV}"
+fi
+
+LICENSE="GPL-2+ LGPL-2.1+"
+SLOT="0"
+IUSE="doc gtk python udis86"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+RDEPEND="python? ( ${PYTHON_DEPS} )
+ udis86? ( dev-libs/udis86 )
+ gtk? (
+ ${PYTHON_DEPS}
+ dev-python/pygtk:2[${PYTHON_USEDEP}]
+ )"
+DEPEND="${RDEPEND}
+ sys-kernel/linux-headers
+ python? (
+ virtual/pkgconfig
+ dev-lang/swig
+ )
+ gtk? ( virtual/pkgconfig )
+ doc? ( app-text/asciidoc )"
+
+CONFIG_CHECK="
+ ~TRACING
+ ~FTRACE
+ ~BLK_DEV_IO_TRACE"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-2.7-makefile.patch
+)
+
+pkg_setup() {
+ linux-info_pkg_setup
+ use python && python-single-r1_pkg_setup
+}
+
+src_configure() {
+ MAKEOPTS+=" prefix=/usr
