commit: 89b8e1a2660868d20af7ca48e34d849ae48957b2 Author: Jakov Smolic <jakov.smolic <AT> sartura <DOT> hr> AuthorDate: Fri Mar 26 13:23:57 2021 +0000 Commit: David Seifert <soap <AT> gentoo <DOT> org> CommitDate: Fri Mar 26 13:23:57 2021 +0000 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 <jakov.smolic <AT> sartura.hr> Signed-off-by: David Seifert <soap <AT> 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..00000000000 --- 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..00000000000 --- 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; -+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, &val); -+ tep_read_number_field(common_type_hist, record->data, &val); - 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; - -- tep_read_number_field(common_type_field, record->data, &val); -+ tep_read_number_field(common_type_mem, record->data, &val); - type = val; - - if (type == kmalloc_type) -@@ -490,8 +490,8 @@ static void do_trace_mem(struct tracecmd_input *handle) - ret = tep_data_type(pevent, record); - event = tep_find_event(pevent, ret); - -- common_type_field = tep_find_common_field(event, "common_type"); -- if (!common_type_field) -+ common_type_mem = tep_find_common_field(event, "common_type"); -+ if (!common_type_mem) - die("Can't find a 'type' field?"); - - update_kmalloc(pevent); diff --git a/dev-util/trace-cmd/files/trace-cmd-2.8.3-python3-warnings.patch b/dev-util/trace-cmd/files/trace-cmd-2.8.3-python3-warnings.patch deleted file mode 100644 index 72dd3de64f9..00000000000 --- a/dev-util/trace-cmd/files/trace-cmd-2.8.3-python3-warnings.patch +++ /dev/null @@ -1,50 +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 -ENOMEM; - -diff --git a/python/ctracecmd.i b/python/ctracecmd.i -index 2601d39..01cd0d5 100644 ---- a/python/ctracecmd.i -+++ b/python/ctracecmd.i -@@ -16,6 +16,7 @@ - %{ - #include "trace-cmd.h" - #include "event-utils.h" -+#include <Python.h> - %} - - -diff --git a/python/ctracecmdgui.i b/python/ctracecmdgui.i -index 1dcdab0..8ca38f7 100644 ---- a/python/ctracecmdgui.i -+++ b/python/ctracecmdgui.i -@@ -7,6 +7,7 @@ - #include <pygobject.h> - #include <pyglib.h> - #include <Python.h> -+#include <memoryobject.h> - - extern GtkTreeModel *trace_view_store_as_gtk_tree_model(struct trace_view_store *store); - -@@ -37,10 +38,10 @@ pytype_from_gtype(GType gtype) - - /* help swig cope with g* types */ - %typemap(in) gint { -- $1 = PyInt_AsLong($input); -+ $1 = PyLong_AsLong($input); - } - %typemap(out) gint { -- $result = PyInt_FromLong($1); -+ $result = PyLong_FromLong($1); - } - %typemap(in) guint { - $1 = PyLong_AsUnsignedLong($input); diff --git a/dev-util/trace-cmd/files/trace-cmd-2.8.3-soname.patch b/dev-util/trace-cmd/files/trace-cmd-2.8.3-soname.patch deleted file mode 100644 index 10aaf076161..00000000000 --- a/dev-util/trace-cmd/files/trace-cmd-2.8.3-soname.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/scripts/utils.mk b/scripts/utils.mk -index 9eb127d..98d7b3c 100644 ---- a/scripts/utils.mk -+++ b/scripts/utils.mk -@@ -54,7 +54,7 @@ do_build_static_lib = \ - - do_compile_shared_library = \ - ($(print_shared_lib_compile) \ -- $(CC) --shared $^ -Wl,-soname,$@ -o $@) -+ $(CC) --shared $^ -Wl,-soname,$(@F) -o $@) - - do_compile_plugin_obj = \ - ($(print_plugin_obj_compile) \ diff --git a/dev-util/trace-cmd/trace-cmd-2.8.3.ebuild b/dev-util/trace-cmd/trace-cmd-2.8.3.ebuild deleted file mode 100644 index 999b9d19c03..00000000000 --- a/dev-util/trace-cmd/trace-cmd-2.8.3.ebuild +++ /dev/null @@ -1,113 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -PYTHON_COMPAT=( python3_7 ) -DISTUTILS_OPTIONAL=1 - -inherit linux-info python-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} == *9999 ]] ; 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/utils/trace-cmd/trace-cmd.git/snapshot/${PN}-v${PV}.tar.gz"; - KEYWORDS="amd64 ~arm64 ~x86" - S="${WORKDIR}/${PN}-v${PV}" -fi - -LICENSE="GPL-2+ LGPL-2.1+" -SLOT="0/${PV}" -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? ( - virtual/pkgconfig - dev-lang/swig - ) - - doc? ( app-text/asciidoc )" - -CONFIG_CHECK=" - ~TRACING - ~FTRACE - ~BLK_DEV_IO_TRACE" - -PATCHES=( - "${FILESDIR}/trace-cmd-2.8-python-pkgconfig-name.patch" - "${FILESDIR}/trace-cmd-2.8.3-soname.patch" - "${FILESDIR}/trace-cmd-2.8.3-gcc10.patch" -) - -pkg_setup() { - linux-info_pkg_setup -} - -src_configure() { - EMAKE_FLAGS=( - BUILD_OUTPUT="${WORKDIR}/${P}_build" - "prefix=${EPREFIX}/usr" - "libdir=${EPREFIX}/usr/$(get_libdir)" - "CC=$(tc-getCC)" - "AR=$(tc-getAR)" - $(usex audit '' '' '' 'NO_AUDIT=1') - $(usex udis86 '' '' '' 'NO_UDIS86=1') - VERBOSE=1 - ) -} - -src_compile() { - emake "${EMAKE_FLAGS[@]}" NO_PYTHON=1 \ - trace-cmd - - if use python; then - python_copy_sources - python_foreach_impl python_compile - fi - - use doc && emake doc -} - -python_compile() { - pushd "${BUILD_DIR}" > /dev/null || die - eapply "${FILESDIR}/trace-cmd-2.8.3-python3-warnings.patch" - - emake "${EMAKE_FLAGS[@]}" \ - PYTHON_VERS="${EPYTHON}" \ - PYTHON_PKGCONFIG_VERS="${EPYTHON//python/python-}" \ - python_dir=$(python_get_sitedir)/${PN} \ - python python-plugin - - popd > /dev/null || die -} - -src_install() { - emake "${EMAKE_FLAGS[@]}" NO_PYTHON=1 \ - DESTDIR="${D}" \ - install install_libs - - use doc && emake DESTDIR="${D}" install_doc - use python && python_foreach_impl python_install -} - -python_install() { - pushd "${BUILD_DIR}" > /dev/null || die - - emake "${EMAKE_FLAGS[@]}" DESTDIR="${D}" \ - PYTHON_VERS="${EPYTHON}" \ - PYTHON_PKGCONFIG_VERS="${EPYTHON//python/python-}" \ - python_dir=$(python_get_sitedir)/${PN} \ - install_python - - popd > /dev/null || die - - python_optimize -}
