diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2021-03-27 06:06:27 +0000 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2021-03-27 06:06:27 +0000 |
commit | 8d5dbd847cbc704a6a06405856e94b461011afe3 (patch) | |
tree | 4d26462d027b14926335894749d2e01d982234d0 /dev-util/trace-cmd | |
parent | 5bb9ff1ee56d2b5e75e01a7f066d8b0cec84ec02 (diff) |
gentoo resync : 27.03.2021
Diffstat (limited to 'dev-util/trace-cmd')
-rw-r--r-- | dev-util/trace-cmd/Manifest | 8 | ||||
-rw-r--r-- | dev-util/trace-cmd/files/trace-cmd-2.8-python-pkgconfig-name.patch | 27 | ||||
-rw-r--r-- | dev-util/trace-cmd/files/trace-cmd-2.8.3-gcc10.patch | 104 | ||||
-rw-r--r-- | dev-util/trace-cmd/files/trace-cmd-2.8.3-python3-warnings.patch | 50 | ||||
-rw-r--r-- | dev-util/trace-cmd/files/trace-cmd-2.8.3-soname.patch | 13 | ||||
-rw-r--r-- | dev-util/trace-cmd/trace-cmd-2.8.3.ebuild | 113 | ||||
-rw-r--r-- | dev-util/trace-cmd/trace-cmd-2.9.1.ebuild | 4 |
7 files changed, 3 insertions, 316 deletions
diff --git a/dev-util/trace-cmd/Manifest b/dev-util/trace-cmd/Manifest index bf788caccf0f..968c674963f7 100644 --- a/dev-util/trace-cmd/Manifest +++ b/dev-util/trace-cmd/Manifest @@ -1,9 +1,3 @@ -AUX trace-cmd-2.8-python-pkgconfig-name.patch 987 BLAKE2B b7fcb2f8813f924692647f16252c5b576ec1a25089e5f03f5ab5d4240f8d7cb8a8cec49cb674f1a75ee562dee0112d17fbe5527b27e72445d8c246a8f535869d SHA512 9677cb02d336accc136911240c16723ca676d5f245f34dc657d6662ff20df47db14f7370becd1bb2c118a38f83c80a13d062597a0e1a8af9dc96dc6d88804991 -AUX trace-cmd-2.8.3-gcc10.patch 4431 BLAKE2B 5a764507af7b88de0732728a4d401360c78edb764779d5747ba7a8015aba84152a168329446e9d8719737ecfc054581d59cd9d47e5752375cd52483f4bcd1674 SHA512 3bee6e226b731011c1dc1acaa2e324fbd44c7743773f6176087e542778cc79b1c6960868454cf6138519fcbaa00eed0b63de8203857fba7bc137c4213ef5a084 -AUX trace-cmd-2.8.3-python3-warnings.patch 1281 BLAKE2B 66540f016d1ca3a7f5a803bd0753ac9c458fcee43056ec05e420fbeaee8b21cd0c4d38e67286d86ddeb6e478fa1e82d45203f538921bd066aa4ef2ad1222e4d7 SHA512 5446a13e82c9be3c6ed2bdc17b91495499b9f28eaa4045869bbf847ca14953cf36411e86136133b22bba05dae46325b522c00939c33943d5135c17e845fad94a -AUX trace-cmd-2.8.3-soname.patch 392 BLAKE2B 334e2289dd1132798b1b704b071868715b38ad9308e1ab13abc7417ef55d06f9c07dd62fa3380e55d07020ffafe7d1adea10be6013b731c46583ed21d2cc1f33 SHA512 37096da570d3a926f06ef08731ff4adecc5cdaa2d3035668aa62d813db9facaa5b78189a2a7c9066c4291a90460978886e7f24759a865514335cd3ba1680b6f2 -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 -EBUILD trace-cmd-2.8.3.ebuild 2505 BLAKE2B 8e31ae8d2d0114b071539b4938cba6d75319a5b0eb06c1af01b639d800fa183eac98696c72c4a2b61d868371eed5d3c015decd1c8633e8f22309aed630afd825 SHA512 15cfd6341c528a5ce4f8f6eb1f2dd0f821ef42b96a77891380a33faa93cbf8e7d0a78aa1c5bf7d8272f7eaeddaec08abbfffb3448cac300a4f80ded8c624822b -EBUILD trace-cmd-2.9.1.ebuild 2788 BLAKE2B 954a41724116ce1770e3725c92b417058142a67d3aa0b39a9b564f985349e724f72036956935e23d4f879d090f983cfea23c28349305ec6265d3f9f00cb11eb8 SHA512 b7ad0fd44890b52b81226c221238311935f77c840cc409734670a2215e80e4169f945b5228662e5a68af9e71e7ea6c7b4aae0b9b67da11a21d4e70daa722caf1 +EBUILD trace-cmd-2.9.1.ebuild 2787 BLAKE2B 22b4be76ae6d985733791fe7c47fc274b83e5861695b99d4065e24667e567704591f0e532867e6524e603101c7a7b131eed7ee310beb2fb6f69dc279d7360548 SHA512 589e69f1c0c06887bfd27438617c9038ee59e4c9f21bf0807489aaf1c114b630756ed31a37c2fdda40c5474aa6a2699b88fd71e2eb0d356942b065e75cbabd61 MISC metadata.xml 349 BLAKE2B 1e1c9812f4cfe7bb90e2637dcf21947f2702244cabc78ac2283112af7a51064d5a4732db71aaa360e6f111f5e6e5b8492e04252e84379cd21424113d2779ea71 SHA512 0a6322fba3de56559284a0f1e4abc83791cf089a74cb369d167b30dadaa019353c8eef0e09e91ad84b130f0660c1dfa665e4252987903884029f4d08fe80c552 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 17c2e693f1c0..000000000000 --- 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 709347448df2..000000000000 --- 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 72dd3de64f90..000000000000 --- 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 10aaf076161d..000000000000 --- 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 999b9d19c03c..000000000000 --- 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 -} diff --git a/dev-util/trace-cmd/trace-cmd-2.9.1.ebuild b/dev-util/trace-cmd/trace-cmd-2.9.1.ebuild index 6a057a44df34..f34720f3ae29 100644 --- a/dev-util/trace-cmd/trace-cmd-2.9.1.ebuild +++ b/dev-util/trace-cmd/trace-cmd-2.9.1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -15,7 +15,7 @@ if [[ ${PV} == *9999 ]] ; then 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" + KEYWORDS="amd64 ~arm64 ~x86" S="${WORKDIR}/${PN}-v${PV}" fi |