diff options
author | Patrick McLean <patrick.mclean@sony.com> | 2019-07-25 17:30:48 -0700 |
---|---|---|
committer | Patrick McLean <chutzpah@gentoo.org> | 2019-07-25 17:30:48 -0700 |
commit | 70985feb3fc5e0dbb27fcd557fc2aae76e088017 (patch) | |
tree | 75e7f1aff638f47172cb1476d2acbbb37d425ea7 /dev-util | |
parent | dev-util/trace-cmd: Update 9999 to work with current git (diff) | |
download | gentoo-70985feb3fc5e0dbb27fcd557fc2aae76e088017.tar.gz gentoo-70985feb3fc5e0dbb27fcd557fc2aae76e088017.tar.bz2 gentoo-70985feb3fc5e0dbb27fcd557fc2aae76e088017.zip |
dev-util/trace-cmd: Clean up old
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')
-rw-r--r-- | dev-util/trace-cmd/Manifest | 1 | ||||
-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/trace-cmd-2.7-r2.ebuild | 83 |
4 files changed, 0 insertions, 133 deletions
diff --git a/dev-util/trace-cmd/Manifest b/dev-util/trace-cmd/Manifest index a058e6d2baa4..4c4cec3dacce 100644 --- a/dev-util/trace-cmd/Manifest +++ b/dev-util/trace-cmd/Manifest @@ -1,2 +1 @@ -DIST trace-cmd-v2.7.tar.gz 1865571 BLAKE2B e0df57c78c6505c856381f17cfdecdaa7a4441eee4cfc57af4fff79a0157ca7aa7c76a81428ddf8d9d00d6bb0a5391b99d4bb5f92fadc7e4062a0181facb2cc9 SHA512 e507eb6609f1fd3dddec541e9f69c466f4f3f66c28f0a7f4292615e3984cebaaf42725f3d82b8c625e5c60977d1f9b5e96cce7664b951eb5f99b955cc440efe4 DIST trace-cmd-v2.8.3.tar.gz 1996617 BLAKE2B 0ab77649af90a0a9368ff118dc94e6fd003b18ceb2065ae3a4559a1d2cfa93be44d87bfb97e2e2f06898508699ff5ce18face4edefd7e40b3b9cca405a626cff SHA512 51166c4276abda209a099cc6fe9081ad6d403cbfd9d4a53bc5bb068392327e88fe647e9324a527e68730d73d1a5f7f74126718547f94c652bb12e51c7518a58b 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/trace-cmd-2.7-r2.ebuild b/dev-util/trace-cmd/trace-cmd-2.7-r2.ebuild deleted file mode 100644 index 27b25b7f1212..000000000000 --- a/dev-util/trace-cmd/trace-cmd-2.7-r2.ebuild +++ /dev/null @@ -1,83 +0,0 @@ -# Copyright 1999-2019 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/${PN}.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.7-soname.patch -) - -pkg_setup() { - linux-info_pkg_setup - use python && python-single-r1_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') - ) - - if use python; then - EMAKE_FLAGS+=( - "PYTHON_VERS=${EPYTHON//python/python-}" - "python_dir=$(python_get_sitedir)/${PN}" - ) - else - EMAKE_FLAGS+=("NO_PYTHON=1") - fi -} - -src_compile() { - emake "${EMAKE_FLAGS[@]}" all_cmd libs - use doc && emake doc - -} - -src_install() { - emake "${EMAKE_FLAGS[@]}" DESTDIR="${D}" V=1 install install_libs - use doc && emake DESTDIR="${D}" install_doc - -} |