diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2019-04-28 09:54:45 +0100 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2019-04-28 09:54:45 +0100 |
commit | b7ebc951da8800f711142f69d9d958bde67a112d (patch) | |
tree | e318514216845acb8f2e49fff7a5cba4027e9d91 /dev-util/trace-cmd | |
parent | dc7cbdfa65fd814b3b9aa3c56257da201109e807 (diff) |
gentoo resync : 28.04.2019
Diffstat (limited to 'dev-util/trace-cmd')
-rw-r--r-- | dev-util/trace-cmd/Manifest | 6 | ||||
-rw-r--r-- | dev-util/trace-cmd/files/trace-cmd-2.7-makefile.patch | 15 | ||||
-rw-r--r-- | dev-util/trace-cmd/trace-cmd-2.7-r2.ebuild | 31 | ||||
-rw-r--r-- | dev-util/trace-cmd/trace-cmd-9999.ebuild | 31 |
4 files changed, 46 insertions, 37 deletions
diff --git a/dev-util/trace-cmd/Manifest b/dev-util/trace-cmd/Manifest index d005d9f9e94a..d5a304b33d09 100644 --- a/dev-util/trace-cmd/Manifest +++ b/dev-util/trace-cmd/Manifest @@ -1,6 +1,6 @@ -AUX trace-cmd-2.7-makefile.patch 1164 BLAKE2B f3bd1f27d473d9f71eb81cb5d635a798b520a21e25f1bc47f9b78c35c056b74c3644812ee06fb5c49b6cb84d442f2b8a68f230f60da955b1f631e0a2200621cf SHA512 fb96207c85f32d72a28466c9c7c145dea76d39b91fb024cf1d6b8a9dec4f07832d17f1e1d454628ab9535d376ad055fbc5bb00666dcc355aad64fc259a7d2ab2 +AUX trace-cmd-2.7-makefile.patch 1162 BLAKE2B e53e6f5c93445cb4bfbe8dd15bcd01972968fb27d1ca6ed45944f383fabf08cc1850686ca5526fb1de78103e5a49dc756279da91fd75136c56d3cd55c59aa013 SHA512 af6c8c11b13737c6e4e8926bbcc250c19fae22268b05727b2d9cd4e853b43735106b6e4439ccea89f038641f8c4a93494428c41756adc411526030c74d8f3aad AUX trace-cmd-2.7-soname.patch 339 BLAKE2B b89d513caa361cfcab00d821e09ae47ce84527add57ce94199262f660f8df5ff436b8ca1d47707d5939c7df760cdfda71c6163d8c4e71ad983328aee5b6f2a20 SHA512 a64a8f6ec1745a1221380b35e779b22d9044df007798eaed5617ea81a391ed0e1baba1f74af9bed280805f748c829b7ca3cc0f7fb773adf791c33373dde3c662 DIST trace-cmd-v2.7.tar.gz 1865571 BLAKE2B e0df57c78c6505c856381f17cfdecdaa7a4441eee4cfc57af4fff79a0157ca7aa7c76a81428ddf8d9d00d6bb0a5391b99d4bb5f92fadc7e4062a0181facb2cc9 SHA512 e507eb6609f1fd3dddec541e9f69c466f4f3f66c28f0a7f4292615e3984cebaaf42725f3d82b8c625e5c60977d1f9b5e96cce7664b951eb5f99b955cc440efe4 -EBUILD trace-cmd-2.7-r2.ebuild 1712 BLAKE2B 03502141565b64c9c589e46ac8fa436d6734c120ea5ad15427ee16095d2a84242428aeb81ccf9546a4fe057da06641dc8058327e67283db926c3c1ad6f970397 SHA512 cc968b5d8347869e3503ea3fe696432df1fbd52c77841ea29634ddc447ab7cc74afe908f262d6b27a7f07e4b347bc2cef802de9d2e08082c2bfef88b10207165 -EBUILD trace-cmd-9999.ebuild 1712 BLAKE2B 03502141565b64c9c589e46ac8fa436d6734c120ea5ad15427ee16095d2a84242428aeb81ccf9546a4fe057da06641dc8058327e67283db926c3c1ad6f970397 SHA512 cc968b5d8347869e3503ea3fe696432df1fbd52c77841ea29634ddc447ab7cc74afe908f262d6b27a7f07e4b347bc2cef802de9d2e08082c2bfef88b10207165 +EBUILD trace-cmd-2.7-r2.ebuild 1777 BLAKE2B a77c5ae330fa91888f0140184012f7c52220fff7c09f15a533d972c5c95c6c690085f7a9fab6c7a0d3a97b80ec24a9816baff058a12bd7e048dd614f7d25eb70 SHA512 3c4bf7a879bb2a8efa5cb7077927bf996b6fa2590b2decfacbf1f2f6a0c69a03805324f82238048874835854fb52d2ddaa1a58e3e07cafa5faa79edde8bf992a +EBUILD trace-cmd-9999.ebuild 1777 BLAKE2B a77c5ae330fa91888f0140184012f7c52220fff7c09f15a533d972c5c95c6c690085f7a9fab6c7a0d3a97b80ec24a9816baff058a12bd7e048dd614f7d25eb70 SHA512 3c4bf7a879bb2a8efa5cb7077927bf996b6fa2590b2decfacbf1f2f6a0c69a03805324f82238048874835854fb52d2ddaa1a58e3e07cafa5faa79edde8bf992a 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 index da1ca62e7c04..a9d7584dc625 100644 --- a/dev-util/trace-cmd/files/trace-cmd-2.7-makefile.patch +++ b/dev-util/trace-cmd/files/trace-cmd-2.7-makefile.patch @@ -1,7 +1,8 @@ -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 @@ +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 @@ -10,7 +11,7 @@ diff -ur trace-cmd-v2.7.orig/Makefile trace-cmd-v2.7/Makefile PLUGIN_DIR = -DPLUGIN_DIR="$(plugin_dir)" PYTHON_DIR = -DPYTHON_DIR="$(python_dir)" PLUGIN_DIR_SQ = '$(subst ','\'',$(PLUGIN_DIR))' -@@ -119,8 +119,11 @@ +@@ -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) @@ -19,11 +20,13 @@ diff -ur trace-cmd-v2.7.orig/Makefile trace-cmd-v2.7/Makefile -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 +279,7 @@ +@@ -276,6 +281,7 @@ endif # Append required CFLAGS override CFLAGS += $(CONFIG_FLAGS) $(INCLUDES) $(PLUGIN_DIR_SQ) $(VAR_DIR) override CFLAGS += $(udis86-flags) $(blk-flags) diff --git a/dev-util/trace-cmd/trace-cmd-2.7-r2.ebuild b/dev-util/trace-cmd/trace-cmd-2.7-r2.ebuild index d38e2e55b21e..27b25b7f1212 100644 --- a/dev-util/trace-cmd/trace-cmd-2.7-r2.ebuild +++ b/dev-util/trace-cmd/trace-cmd-2.7-r2.ebuild @@ -41,8 +41,8 @@ CONFIG_CHECK=" ~BLK_DEV_IO_TRACE" PATCHES=( - "${FILESDIR}"/${PN}-2.7-makefile.patch - "${FILESDIR}"/${PN}-2.7-soname.patch + "${FILESDIR}"/trace-cmd-2.7-makefile.patch + "${FILESDIR}"/trace-cmd-2.7-soname.patch ) pkg_setup() { @@ -51,30 +51,33 @@ pkg_setup() { } src_configure() { - MAKEOPTS+=" prefix=/usr - libdir=/usr/$(get_libdir) - CC=$(tc-getCC) - AR=$(tc-getAR) - $(usex audit '' '' 'NO_AUDIT=1')" + 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 - MAKEOPTS+=" PYTHON_VERS=${EPYTHON//python/python-}" - MAKEOPTS+=" python_dir=$(python_get_sitedir)/${PN}" + EMAKE_FLAGS+=( + "PYTHON_VERS=${EPYTHON//python/python-}" + "python_dir=$(python_get_sitedir)/${PN}" + ) else - MAKEOPTS+=" NO_PYTHON=1" + EMAKE_FLAGS+=("NO_PYTHON=1") fi - - use udis86 || MAKEOPTS+=" NO_UDIS86=1" } src_compile() { - emake V=1 all_cmd libs + emake "${EMAKE_FLAGS[@]}" all_cmd libs use doc && emake doc } src_install() { - emake DESTDIR="${D}" V=1 install install_libs + emake "${EMAKE_FLAGS[@]}" DESTDIR="${D}" V=1 install install_libs use doc && emake DESTDIR="${D}" install_doc } diff --git a/dev-util/trace-cmd/trace-cmd-9999.ebuild b/dev-util/trace-cmd/trace-cmd-9999.ebuild index d38e2e55b21e..27b25b7f1212 100644 --- a/dev-util/trace-cmd/trace-cmd-9999.ebuild +++ b/dev-util/trace-cmd/trace-cmd-9999.ebuild @@ -41,8 +41,8 @@ CONFIG_CHECK=" ~BLK_DEV_IO_TRACE" PATCHES=( - "${FILESDIR}"/${PN}-2.7-makefile.patch - "${FILESDIR}"/${PN}-2.7-soname.patch + "${FILESDIR}"/trace-cmd-2.7-makefile.patch + "${FILESDIR}"/trace-cmd-2.7-soname.patch ) pkg_setup() { @@ -51,30 +51,33 @@ pkg_setup() { } src_configure() { - MAKEOPTS+=" prefix=/usr - libdir=/usr/$(get_libdir) - CC=$(tc-getCC) - AR=$(tc-getAR) - $(usex audit '' '' 'NO_AUDIT=1')" + 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 - MAKEOPTS+=" PYTHON_VERS=${EPYTHON//python/python-}" - MAKEOPTS+=" python_dir=$(python_get_sitedir)/${PN}" + EMAKE_FLAGS+=( + "PYTHON_VERS=${EPYTHON//python/python-}" + "python_dir=$(python_get_sitedir)/${PN}" + ) else - MAKEOPTS+=" NO_PYTHON=1" + EMAKE_FLAGS+=("NO_PYTHON=1") fi - - use udis86 || MAKEOPTS+=" NO_UDIS86=1" } src_compile() { - emake V=1 all_cmd libs + emake "${EMAKE_FLAGS[@]}" all_cmd libs use doc && emake doc } src_install() { - emake DESTDIR="${D}" V=1 install install_libs + emake "${EMAKE_FLAGS[@]}" DESTDIR="${D}" V=1 install install_libs use doc && emake DESTDIR="${D}" install_doc } |