diff options
author | Patrick McLean <patrick.mclean@sony.com> | 2019-07-24 18:36:44 -0700 |
---|---|---|
committer | Patrick McLean <chutzpah@gentoo.org> | 2019-07-25 10:16:59 -0700 |
commit | f88da30dc2b81a234092373b97efe311a2dd94b4 (patch) | |
tree | 49bbb7bcbca7416950186f6193f0509f5f1f14f1 /dev-util/trace-cmd | |
parent | Provide better dock support bug #571572 (diff) | |
download | gentoo-f88da30dc2b81a234092373b97efe311a2dd94b4.tar.gz gentoo-f88da30dc2b81a234092373b97efe311a2dd94b4.tar.bz2 gentoo-f88da30dc2b81a234092373b97efe311a2dd94b4.zip |
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 <chutzpah@gentoo.org>
Diffstat (limited to 'dev-util/trace-cmd')
-rw-r--r-- | dev-util/trace-cmd/Manifest | 2 | ||||
-rw-r--r-- | dev-util/trace-cmd/files/trace-cmd-2.8-makefile.patch | 48 | ||||
-rw-r--r-- | dev-util/trace-cmd/files/trace-cmd-2.8-python3-warnings.patch | 111 | ||||
-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 (renamed from dev-util/trace-cmd/files/trace-cmd-2.8-soname.patch) | 8 | ||||
-rw-r--r-- | dev-util/trace-cmd/trace-cmd-2.8.3.ebuild (renamed from dev-util/trace-cmd/trace-cmd-2.8.2-r1.ebuild) | 8 | ||||
-rw-r--r-- | dev-util/trace-cmd/trace-cmd-9999.ebuild | 11 |
7 files changed, 64 insertions, 174 deletions
diff --git a/dev-util/trace-cmd/Manifest b/dev-util/trace-cmd/Manifest index fe97422853f7..a058e6d2baa4 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 f95ffc3b18c3..000000000000 --- 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 <udis86.h>,-DHAVE_UDIS86 -ludis86) -+udis86-flags := -DHAVE_UDIS86 -+udis86-ldflags := -ludis86 -+else -+udis86-flags := -UHAVE_UDIS86 -+endif # NO_UDIS86 - - define BLK_TC_FLUSH_SOURCE - #include <linux/blktrace_api.h> -@@ -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 d66ee35accf9..000000000000 --- 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 -ENOMEM; - -diff --git a/python/ctracecmd.i b/python/ctracecmd.i -index 65a3d51..031e462 100644 ---- a/python/ctracecmd.i -+++ b/python/ctracecmd.i -@@ -16,6 +16,7 @@ - %{ - #include "trace-cmd.h" - #include "event-utils.h" -+#include <Python.h> - %} - - -@@ -108,7 +109,7 @@ static PyObject *py_field_get_stack(struct tep_handle *pevent, - ((int)addr == -1)) - break; - func = tep_find_function(event->tep, addr); -- if (PyList_Append(list, PyString_FromString(func))) { -+ if (PyList_Append(list, PyUnicode_FromString(func))) { - Py_DECREF(list); - return NULL; - } -@@ -137,10 +138,10 @@ static PyObject *py_field_get_data(struct tep_format_field *f, struct tep_record - offset = val & 0xffff; - len = val >> 16; - -- return PyBuffer_FromMemory((char *)r->data + offset, len); -+ return PyMemoryView_FromMemory((char *)r->data + offset, len, PyBUF_READ); - } - -- return PyBuffer_FromMemory((char *)r->data + f->offset, f->size); -+ return PyMemoryView_FromMemory((char *)r->data + f->offset, f->size, PyBUF_READ); - } - - static PyObject *py_field_get_str(struct tep_format_field *f, struct tep_record *r) -@@ -162,10 +163,10 @@ static PyObject *py_field_get_str(struct tep_format_field *f, struct tep_record - */ - offset = val & 0xffff; - -- return PyString_FromString((char *)r->data + offset); -+ return PyUnicode_FromString((char *)r->data + offset); - } - -- return PyString_FromStringAndSize((char *)r->data + f->offset, -+ return PyUnicode_FromStringAndSize((char *)r->data + f->offset, - strnlen((char *)r->data + f->offset, f->size)); - } - -@@ -177,7 +178,7 @@ static PyObject *py_format_get_keys(struct tep_event *ef) - list = PyList_New(0); - - for (f = ef->format.fields; f; f = f->next) { -- if (PyList_Append(list, PyString_FromString(f->name))) { -+ if (PyList_Append(list, PyUnicode_FromString(f->name))) { - Py_DECREF(list); - return NULL; - } -@@ -210,14 +211,14 @@ static int python_callback(struct trace_seq *s, - result = PyEval_CallObject(context, arglist); - Py_XDECREF(arglist); - if (result && result != Py_None) { -- if (!PyInt_Check(result)) { -+ if (!PyLong_Check(result)) { - PyErr_SetString(PyExc_TypeError, - "callback must return int"); - PyErr_Print(); - Py_XDECREF(result); - return 0; - } -- r = PyInt_AS_LONG(result); -+ r = PyLong_AsLong(result); - } else if (result == Py_None) - r = 0; - else -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-python3-warnings.patch b/dev-util/trace-cmd/files/trace-cmd-2.8.3-python3-warnings.patch new file mode 100644 index 000000000000..72dd3de64f90 --- /dev/null +++ b/dev-util/trace-cmd/files/trace-cmd-2.8.3-python3-warnings.patch @@ -0,0 +1,50 @@ +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-soname.patch b/dev-util/trace-cmd/files/trace-cmd-2.8.3-soname.patch index b869080fb013..10aaf076161d 100644 --- a/dev-util/trace-cmd/files/trace-cmd-2.8-soname.patch +++ b/dev-util/trace-cmd/files/trace-cmd-2.8.3-soname.patch @@ -1,13 +1,13 @@ diff --git a/scripts/utils.mk b/scripts/utils.mk -index 260023a..9eb127d 100644 +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 $^ -o $@) +- $(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.2-r1.ebuild b/dev-util/trace-cmd/trace-cmd-2.8.3.ebuild index 5fdce8d46d53..81b74d429056 100644 --- a/dev-util/trace-cmd/trace-cmd-2.8.2-r1.ebuild +++ b/dev-util/trace-cmd/trace-cmd-2.8.3.ebuild @@ -42,9 +42,8 @@ CONFIG_CHECK=" ~BLK_DEV_IO_TRACE" PATCHES=( - "${FILESDIR}/trace-cmd-2.8-makefile.patch" "${FILESDIR}/trace-cmd-2.8-python-pkgconfig-name.patch" - "${FILESDIR}/trace-cmd-2.8-soname.patch" + "${FILESDIR}/trace-cmd-2.8.3-soname.patch" ) pkg_setup() { @@ -53,6 +52,7 @@ pkg_setup() { src_configure() { EMAKE_FLAGS=( + BUILD_OUTPUT="${WORKDIR}/${P}_build" "prefix=${EPREFIX}/usr" "libdir=${EPREFIX}/usr/$(get_libdir)" "CC=$(tc-getCC)" @@ -65,7 +65,7 @@ src_configure() { src_compile() { emake "${EMAKE_FLAGS[@]}" NO_PYTHON=1 \ - trace-cmd libs + trace-cmd if use python; then python_copy_sources @@ -77,7 +77,7 @@ src_compile() { python_compile() { pushd "${BUILD_DIR}" > /dev/null || die - python_is_python3 && eapply "${FILESDIR}/trace-cmd-2.8-python3-warnings.patch" + python_is_python3 && eapply "${FILESDIR}/trace-cmd-2.8.3-python3-warnings.patch" emake "${EMAKE_FLAGS[@]}" \ PYTHON_VERS="${EPYTHON}" \ diff --git a/dev-util/trace-cmd/trace-cmd-9999.ebuild b/dev-util/trace-cmd/trace-cmd-9999.ebuild index 33ae834f1ac4..343d1b85ed5c 100644 --- a/dev-util/trace-cmd/trace-cmd-9999.ebuild +++ b/dev-util/trace-cmd/trace-cmd-9999.ebuild @@ -20,7 +20,7 @@ else fi LICENSE="GPL-2+ LGPL-2.1+" -SLOT="0" +SLOT="0/${PV}" IUSE="+audit doc python udis86" REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" @@ -42,9 +42,7 @@ CONFIG_CHECK=" ~BLK_DEV_IO_TRACE" PATCHES=( - "${FILESDIR}/trace-cmd-2.7-makefile.patch" "${FILESDIR}/trace-cmd-2.8-python-pkgconfig-name.patch" - "${FILESDIR}/trace-cmd-2.8-soname.patch" ) pkg_setup() { @@ -53,8 +51,9 @@ pkg_setup() { src_configure() { EMAKE_FLAGS=( - "prefix=/usr" - "libdir=/usr/$(get_libdir)" + BUILD_OUTPUT="${WORKDIR}/${P}_build" + "prefix=${EPREFIX}/usr" + "libdir=${EPREFIX}/usr/$(get_libdir)" "CC=$(tc-getCC)" "AR=$(tc-getAR)" $(usex audit '' '' '' 'NO_AUDIT=1') @@ -77,7 +76,7 @@ src_compile() { python_compile() { pushd "${BUILD_DIR}" > /dev/null || die - python_is_python3 && eapply "${FILESDIR}/trace-cmd-2.8-python3-warnings.patch" + python_is_python3 && eapply "${FILESDIR}/trace-cmd-2.8.3-python3-warnings.patch" emake "${EMAKE_FLAGS[@]}" \ PYTHON_VERS="${EPYTHON}" \ |