diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2019-08-02 19:14:55 +0100 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2019-08-02 19:14:55 +0100 |
commit | b24bd25253fe093f722ab576d29fdc41d04cb1ee (patch) | |
tree | 0fcf2afd9f852c4d4c291cf8afaa2c244d598105 /dev-util/trace-cmd/files | |
parent | 121ed4eec41fbf03e1998d09eede1bf449da63b9 (diff) |
gentoo resync : 02.08.2019
Diffstat (limited to 'dev-util/trace-cmd/files')
-rw-r--r-- | dev-util/trace-cmd/files/trace-cmd-2.7-makefile.patch | 36 | ||||
-rw-r--r-- | dev-util/trace-cmd/files/trace-cmd-2.7-soname.patch | 13 | ||||
-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) | 6 |
5 files changed, 53 insertions, 163 deletions
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 a9d7584dc625..000000000000 --- 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 <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> -@@ -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 937f0617a4a4..000000000000 --- 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/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 523f2d44467e..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,$@ -o $@) ++ $(CC) --shared $^ -Wl,-soname,$(@F) -o $@) do_compile_plugin_obj = \ ($(print_plugin_obj_compile) \ |