--- /dev/null
+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
fi
LICENSE="GPL-2+ LGPL-2.1+"
-SLOT="0"
+SLOT="0/${PV}"
IUSE="+audit doc python udis86"
REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
~BLK_DEV_IO_TRACE"
PATCHES=(
- "${FILESDIR}/trace-cmd-2.7-makefile.patch"
+ "${FILESDIR}/trace-cmd-2.8-makefile.patch"
"${FILESDIR}/trace-cmd-2.8-python-pkgconfig-name.patch"
"${FILESDIR}/trace-cmd-2.8-soname.patch"
)
src_configure() {
EMAKE_FLAGS=(
- "prefix=/usr"
- "libdir=/usr/$(get_libdir)"
+ "prefix=${EPREFIX}/usr"
+ "libdir=${EPREFIX}/usr/$(get_libdir)"
"CC=$(tc-getCC)"
"AR=$(tc-getAR)"
$(usex audit '' '' '' 'NO_AUDIT=1')