From 536c3711867ec947c1738f2c4b96f22e4863322d Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 18 Nov 2018 09:38:27 +0000 Subject: gentoo resync : 18.11.2018 --- dev-util/trace-cmd/Manifest | 4 ++ .../trace-cmd/files/trace-cmd-2.7-makefile.patch | 33 +++++++++ dev-util/trace-cmd/trace-cmd-2.7.ebuild | 78 ++++++++++++++++++++++ dev-util/trace-cmd/trace-cmd-9999.ebuild | 78 ++++++++++++++++++++++ 4 files changed, 193 insertions(+) create mode 100644 dev-util/trace-cmd/files/trace-cmd-2.7-makefile.patch create mode 100644 dev-util/trace-cmd/trace-cmd-2.7.ebuild create mode 100644 dev-util/trace-cmd/trace-cmd-9999.ebuild (limited to 'dev-util/trace-cmd') diff --git a/dev-util/trace-cmd/Manifest b/dev-util/trace-cmd/Manifest index 42e09ba53b6a..95db1ff37d51 100644 --- a/dev-util/trace-cmd/Manifest +++ b/dev-util/trace-cmd/Manifest @@ -1,6 +1,10 @@ AUX trace-cmd-2.5.1-makefile.patch 1152 BLAKE2B fc44b06f2d59d2c02ba7c1f9145d06c4b256177cf9cf2f1b9928b2f08d49a719e675a543ffcbdbe5c08e00d9f27eec01052d278d90fedb294296be68d61b1bf4 SHA512 e74742d3c050f9e7bdb566a82a5212e6474b34ee6fc46e9ffa313ad3f2c323f55b63521ec857ae44f39ef168135fcdf733314fb3e04709e51f03ef7aed99c416 +AUX trace-cmd-2.7-makefile.patch 1164 BLAKE2B f3bd1f27d473d9f71eb81cb5d635a798b520a21e25f1bc47f9b78c35c056b74c3644812ee06fb5c49b6cb84d442f2b8a68f230f60da955b1f631e0a2200621cf SHA512 fb96207c85f32d72a28466c9c7c145dea76d39b91fb024cf1d6b8a9dec4f07832d17f1e1d454628ab9535d376ad055fbc5bb00666dcc355aad64fc259a7d2ab2 DIST trace-cmd-2.5.1.tar.xz 1577148 BLAKE2B 25436354315bcfe886cca26678017846ac95c8f19877bf9fc7ab24ed543406b61516ad56185e78c3a8d79bbbc672419fca468b205f178cdc01baaf0dfd140702 SHA512 2280eefa130a3914c34798f8bd4097a55f7f4fa4632b3d26ee1317bba54625d259ac61c6576dd3051fb2be48fb593fa54a4203d1828b7fec5fd196de00491ea2 DIST trace-cmd-2.6.tar.xz 1584768 BLAKE2B 42b2b4ac37246d610a2747bf0cb025d0f0ef5954a40c57acb8df8245f71fb516e0c124034b44addfee119ea453f1e732f6a2a73fa5e3bfb18da5ea7e1f920ed5 SHA512 cf479a940825935aa89b282c7a617d56fa5dd1f82e3322a969c4e0a08343ceca16c40058ead5f5878260ce0a003102550808c5475110706580769dffb1897c54 +DIST trace-cmd-v2.7.tar.gz 1865571 BLAKE2B e0df57c78c6505c856381f17cfdecdaa7a4441eee4cfc57af4fff79a0157ca7aa7c76a81428ddf8d9d00d6bb0a5391b99d4bb5f92fadc7e4062a0181facb2cc9 SHA512 e507eb6609f1fd3dddec541e9f69c466f4f3f66c28f0a7f4292615e3984cebaaf42725f3d82b8c625e5c60977d1f9b5e96cce7664b951eb5f99b955cc440efe4 EBUILD trace-cmd-2.5.1.ebuild 1519 BLAKE2B 85aa750902bd3d6ba16431f78c2ed2a829b3ec03e257a466e91f3a4e824256c32b41ae246dec989abab19fbbe92b4c3cfff14ee443c4262fcb5b1ff388e19a1d SHA512 564125aa45004c07e27a83d2e78fbbfd9670c4079c7d8afc679c9c3445ceca54370bd168dcccbf65101752bfb8a5b9b7f04264f172d7b12be917d1388d2e5c5b EBUILD trace-cmd-2.6.ebuild 1500 BLAKE2B 04764f54ccb207b141349af6a3d1c2e976eccb3eb80d24ce929c3964ebf3f9d4aa2a8be034e3f85284c96725de30eb901e999078e070fffe398c9d42b7121167 SHA512 866ac85fd69cac13215ca03f3044bf2214a46c0d711c6e4305acab224e7df6dd8258189a1c11155ab385c76d1592834b5ff79b1a6e8619c8940100c2c91c522d +EBUILD trace-cmd-2.7.ebuild 1715 BLAKE2B 31e68124a5048736e04d4d69d9b262eecb3baeaf8a4c46da8d2ab7706a6fa490289b42fdf1cb284873823e0657a06ac695f384b7f5eb854d815cd93d8f33c120 SHA512 f2f4cfd9d579b9cc63ecf1a60d3c9eaa0b436a418afdc33e7a8c6b7364ed7d7e2077f04bba7d4ec3486f61e971dc3bfffbcc1b1b57df92aae4732a4fd56e9781 +EBUILD trace-cmd-9999.ebuild 1715 BLAKE2B 31e68124a5048736e04d4d69d9b262eecb3baeaf8a4c46da8d2ab7706a6fa490289b42fdf1cb284873823e0657a06ac695f384b7f5eb854d815cd93d8f33c120 SHA512 f2f4cfd9d579b9cc63ecf1a60d3c9eaa0b436a418afdc33e7a8c6b7364ed7d7e2077f04bba7d4ec3486f61e971dc3bfffbcc1b1b57df92aae4732a4fd56e9781 MISC metadata.xml 349 BLAKE2B 1e1c9812f4cfe7bb90e2637dcf21947f2702244cabc78ac2283112af7a51064d5a4732db71aaa360e6f111f5e6e5b8492e04252e84379cd21424113d2779ea71 SHA512 0a6322fba3de56559284a0f1e4abc83791cf089a74cb369d167b30dadaa019353c8eef0e09e91ad84b130f0660c1dfa665e4252987903884029f4d08fe80c552 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 new file mode 100644 index 000000000000..da1ca62e7c04 --- /dev/null +++ b/dev-util/trace-cmd/files/trace-cmd-2.7-makefile.patch @@ -0,0 +1,33 @@ +diff -ur trace-cmd-v2.7.orig/Makefile trace-cmd-v2.7/Makefile +--- trace-cmd-v2.7.orig/Makefile 2018-02-01 23:35:28.000000000 +0100 ++++ trace-cmd-v2.7/Makefile 2018-09-16 16:42:58.445655156 +0200 +@@ -63,7 +63,7 @@ + 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,11 @@ + 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 ++endif # NO_UDIS86 + + define BLK_TC_FLUSH_SOURCE + #include +@@ -276,6 +279,7 @@ + # 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/trace-cmd-2.7.ebuild b/dev-util/trace-cmd/trace-cmd-2.7.ebuild new file mode 100644 index 000000000000..edebefd435ba --- /dev/null +++ b/dev-util/trace-cmd/trace-cmd-2.7.ebuild @@ -0,0 +1,78 @@ +# Copyright 1999-2018 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 +PYTHON_COMPAT=(python2_7) + +inherit linux-info python-single-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/linux/kernel/git/rostedt/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="doc gtk python udis86" +REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" + +RDEPEND="python? ( ${PYTHON_DEPS} ) + udis86? ( dev-libs/udis86 ) + gtk? ( + ${PYTHON_DEPS} + dev-python/pygtk:2[${PYTHON_USEDEP}] + )" +DEPEND="${RDEPEND} + sys-kernel/linux-headers + python? ( + virtual/pkgconfig + dev-lang/swig + ) + gtk? ( virtual/pkgconfig ) + doc? ( app-text/asciidoc )" + +CONFIG_CHECK=" + ~TRACING + ~FTRACE + ~BLK_DEV_IO_TRACE" + +PATCHES=( + "${FILESDIR}"/${PN}-2.7-makefile.patch +) + +pkg_setup() { + linux-info_pkg_setup + use python && python-single-r1_pkg_setup +} + +src_configure() { + MAKEOPTS+=" prefix=/usr libdir=$(get_libdir) CC=$(tc-getCC) AR=$(tc-getAR)" + + if use python; then + MAKEOPTS+=" PYTHON_VERS=${EPYTHON//python/python-}" + MAKEOPTS+=" python_dir=$(python_get_sitedir)/${PN}" + else + MAKEOPTS+=" NO_PYTHON=1" + fi + + use udis86 || MAKEOPTS+=" NO_UDIS86=1" +} + +src_compile() { + emake all_cmd + use doc && emake doc + use gtk && emake -j1 gui +} + +src_install() { + default + use doc && emake DESTDIR="${D}" install_doc + use gtk && emake DESTDIR="${D}" install_gui +} diff --git a/dev-util/trace-cmd/trace-cmd-9999.ebuild b/dev-util/trace-cmd/trace-cmd-9999.ebuild new file mode 100644 index 000000000000..edebefd435ba --- /dev/null +++ b/dev-util/trace-cmd/trace-cmd-9999.ebuild @@ -0,0 +1,78 @@ +# Copyright 1999-2018 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 +PYTHON_COMPAT=(python2_7) + +inherit linux-info python-single-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/linux/kernel/git/rostedt/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="doc gtk python udis86" +REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" + +RDEPEND="python? ( ${PYTHON_DEPS} ) + udis86? ( dev-libs/udis86 ) + gtk? ( + ${PYTHON_DEPS} + dev-python/pygtk:2[${PYTHON_USEDEP}] + )" +DEPEND="${RDEPEND} + sys-kernel/linux-headers + python? ( + virtual/pkgconfig + dev-lang/swig + ) + gtk? ( virtual/pkgconfig ) + doc? ( app-text/asciidoc )" + +CONFIG_CHECK=" + ~TRACING + ~FTRACE + ~BLK_DEV_IO_TRACE" + +PATCHES=( + "${FILESDIR}"/${PN}-2.7-makefile.patch +) + +pkg_setup() { + linux-info_pkg_setup + use python && python-single-r1_pkg_setup +} + +src_configure() { + MAKEOPTS+=" prefix=/usr libdir=$(get_libdir) CC=$(tc-getCC) AR=$(tc-getAR)" + + if use python; then + MAKEOPTS+=" PYTHON_VERS=${EPYTHON//python/python-}" + MAKEOPTS+=" python_dir=$(python_get_sitedir)/${PN}" + else + MAKEOPTS+=" NO_PYTHON=1" + fi + + use udis86 || MAKEOPTS+=" NO_UDIS86=1" +} + +src_compile() { + emake all_cmd + use doc && emake doc + use gtk && emake -j1 gui +} + +src_install() { + default + use doc && emake DESTDIR="${D}" install_doc + use gtk && emake DESTDIR="${D}" install_gui +} -- cgit v1.2.3