From 40cbcbd9b3cacd2d90576080d9a2d806320f71d7 Mon Sep 17 00:00:00 2001 From: Patrick McLean Date: Fri, 19 Jul 2019 19:03:35 -0700 Subject: dev-util/trace-cmd: Revbump, soname fix and install missing headers Copyright: Sony Interactive Entertainment Inc. Package-Manager: Portage-2.3.69, Repoman-2.3.16 Signed-off-by: Patrick McLean --- .../trace-cmd/files/trace-cmd-2.8-makefile.patch | 48 +++++++++ .../trace-cmd/files/trace-cmd-2.8-soname.patch | 6 +- dev-util/trace-cmd/trace-cmd-2.8.2-r1.ebuild | 110 +++++++++++++++++++++ dev-util/trace-cmd/trace-cmd-2.8.2.ebuild | 110 --------------------- 4 files changed, 161 insertions(+), 113 deletions(-) create mode 100644 dev-util/trace-cmd/files/trace-cmd-2.8-makefile.patch create mode 100644 dev-util/trace-cmd/trace-cmd-2.8.2-r1.ebuild delete mode 100644 dev-util/trace-cmd/trace-cmd-2.8.2.ebuild (limited to 'dev-util/trace-cmd') 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 new file mode 100644 index 000000000000..f95ffc3b18c3 --- /dev/null +++ b/dev-util/trace-cmd/files/trace-cmd-2.8-makefile.patch @@ -0,0 +1,48 @@ +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 ,-DHAVE_UDIS86 -ludis86) ++udis86-flags := -DHAVE_UDIS86 ++udis86-ldflags := -ludis86 ++else ++udis86-flags := -UHAVE_UDIS86 ++endif # NO_UDIS86 + + define BLK_TC_FLUSH_SOURCE + #include +@@ -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-soname.patch b/dev-util/trace-cmd/files/trace-cmd-2.8-soname.patch index 523f2d44467e..b869080fb013 100644 --- a/dev-util/trace-cmd/files/trace-cmd-2.8-soname.patch +++ b/dev-util/trace-cmd/files/trace-cmd-2.8-soname.patch @@ -3,11 +3,11 @@ index 260023a..9eb127d 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.2-r1.ebuild new file mode 100644 index 000000000000..5fdce8d46d53 --- /dev/null +++ b/dev-util/trace-cmd/trace-cmd-2.8.2-r1.ebuild @@ -0,0 +1,110 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 +PYTHON_COMPAT=( python2_7 python3_{6,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 ~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-makefile.patch" + "${FILESDIR}/trace-cmd-2.8-python-pkgconfig-name.patch" + "${FILESDIR}/trace-cmd-2.8-soname.patch" +) + +pkg_setup() { + linux-info_pkg_setup +} + +src_configure() { + EMAKE_FLAGS=( + "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 libs + + 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 + python_is_python3 && eapply "${FILESDIR}/trace-cmd-2.8-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 +} diff --git a/dev-util/trace-cmd/trace-cmd-2.8.2.ebuild b/dev-util/trace-cmd/trace-cmd-2.8.2.ebuild deleted file mode 100644 index 33ae834f1ac4..000000000000 --- a/dev-util/trace-cmd/trace-cmd-2.8.2.ebuild +++ /dev/null @@ -1,110 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -PYTHON_COMPAT=( python2_7 python3_{6,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 ~x86" - S="${WORKDIR}/${PN}-v${PV}" -fi - -LICENSE="GPL-2+ LGPL-2.1+" -SLOT="0" -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.7-makefile.patch" - "${FILESDIR}/trace-cmd-2.8-python-pkgconfig-name.patch" - "${FILESDIR}/trace-cmd-2.8-soname.patch" -) - -pkg_setup() { - linux-info_pkg_setup -} - -src_configure() { - EMAKE_FLAGS=( - "prefix=/usr" - "libdir=/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 libs - - 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 - python_is_python3 && eapply "${FILESDIR}/trace-cmd-2.8-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 -} -- cgit v1.2.3-65-gdbad