gentoo auto-resync : 20:12:2022 - 07:50:47

4 files changed, 211 insertions, 1 deletions

diff --git a/dev-util/trace-cmd/Manifest b/dev-util/trace-cmd/Manifest
index 2e04946529b7..9cdb1b23bdd5 100644
--- a/dev-util/trace-cmd/Manifest
+++ b/dev-util/trace-cmd/Manifest
@@ -1,9 +1,12 @@
+AUX trace-cmd-3.1.4-hang-make-4.4.patch 3094 BLAKE2B 7e2a83981b214125daff015b464f8c6c233fb91944b2dbae7c38b4440045bb872beb47540d63736b580d45ffedd3345926b14a3733ae9b1d1cc801f09f3c2943 SHA512 ec660038b02b2afed0b06d08be79ad6fbae7ea02caaa88367ac5b8c59b9ea9e52f3f01f77d936188c612c3c2521f6d6925f5e4c5a1de6977586373d0568311d3
 DIST trace-cmd-v2.9.1.tar.gz 4298008 BLAKE2B f7aa2f12b2c90f35390857ed6f5818b74c42be36ce70835d86410f9f4931d27410123baaad007fa2795c1ba1f5bafc739db620f467ccc48021d774ee7be8a68d SHA512 186bfdd8ff1e88e9e6d3ae87b123f049892deaaa8d6a42944b6f8abee6b828946b88774029aa96daf4423a3dfc01b42835508f44f636dd02579ef9a8ef425131
 DIST trace-cmd-v3.0.2.tar.gz 308097 BLAKE2B 109cf260a2bc219c9bef92fb85bdd5abd0698d261ecec35ea31b152986af720aae26720cfa6148f798fca1d33f631ea3e50906a5fc7ef00dbd705c63d3b83f2a SHA512 3f364409f4a8931a09b762b19ee19ae52215b46e7ed90610a0fa4092e71d88d0dae91353ff98ba11f18012c27ef67289097c6c132f0f07193fac459ac52861d0
 DIST trace-cmd-v3.1.2.tar.gz 317611 BLAKE2B 485d62bfd6c7e3dedc5c3a9eb18af4b425bccc03e932854ef87fc0d032ef011e68cb978b34e319d97b85b24bba6d16ce619faaca8d96c77be1b64b1c4ca06e69 SHA512 d894842c11d895e2753fe254a83ecdc6bedcdfe1eceba5d75f1302b5476c9a3114c1fc5acddcba19ab05eaafb30db97e2e9b51b90afb1fd0550f1fbe0f59e0ac
 DIST trace-cmd-v3.1.4.tar.gz 328452 BLAKE2B 6d3c964d1ba585213b75834b1037449464e5d54e5f49ed5b532cc599f6b960b79d0f0327a6af38e38b3471b54316810d9f05ef6cc7a3a4e39ee7eec9864e5ef9 SHA512 93ad775c1767d2a02b72386a29867c3bc141171403c152c0c4cb907da16b5ae69100924279d9529083449c1774c97c35d5b4790b188bcd4930cfa69076cef0b8
+DIST trace-cmd-v3.1.5.tar.gz 328689 BLAKE2B ae77b418505c545ef2b701c484cec944b6d8b9e7b0df9ea0a6475b099d59997a426a4c3f69fc2cfdaaaa4280f5fc53b18caf7a39011cd980fa331122f59feb13 SHA512 7262e69a990986975f0ee9287b16afc48f4f481fcb54ce64ca51dbba2e4c8cbb3c7c7d3d888aba10f3b12ac6b1cf9e612dd98982dc8d48ea221d231e3d16ac4d
 EBUILD trace-cmd-2.9.1.ebuild 2787 BLAKE2B 22b4be76ae6d985733791fe7c47fc274b83e5861695b99d4065e24667e567704591f0e532867e6524e603101c7a7b131eed7ee310beb2fb6f69dc279d7360548 SHA512 589e69f1c0c06887bfd27438617c9038ee59e4c9f21bf0807489aaf1c114b630756ed31a37c2fdda40c5474aa6a2699b88fd71e2eb0d356942b065e75cbabd61
 EBUILD trace-cmd-3.0.2.ebuild 3028 BLAKE2B dca25da4895984203d401b75e79328cfc4e80408f62792ae63c17ef5c41a388f725af9d1054f23f83c20a0cce754b3638eaa02de6b5599f2c7c7be44f9ad189b SHA512 089bc4e6ecd966bf37217bc1bdbe06f883cb9f3116e3b69591a229baec093c9638e3305ff7efac4e2a58cf22fdc44885f7cabeee8760c370ac57cf49ce9903c5
 EBUILD trace-cmd-3.1.2.ebuild 3028 BLAKE2B 2d9f8226f5423bd93bc3af018108bcad3dc19f87b25aa17a30eea44221602a2f57372e020ac7254e08f9f00d9a4d4bff0248ac745ff5aba56fd1d614254269f9 SHA512 d9578451a54a19e52f2a2716543366b69da83c90ccf426f6e01f50b98b90306aef0774d9e239a1405e63fc1157236fb5805e03f72ed20c4d55a23b5a64628cbf
-EBUILD trace-cmd-3.1.4.ebuild 3028 BLAKE2B 2d9f8226f5423bd93bc3af018108bcad3dc19f87b25aa17a30eea44221602a2f57372e020ac7254e08f9f00d9a4d4bff0248ac745ff5aba56fd1d614254269f9 SHA512 d9578451a54a19e52f2a2716543366b69da83c90ccf426f6e01f50b98b90306aef0774d9e239a1405e63fc1157236fb5805e03f72ed20c4d55a23b5a64628cbf
+EBUILD trace-cmd-3.1.4.ebuild 3081 BLAKE2B 5240fbef847d2c86a45a992f320fb99d321812600aa3f354c673e2d61bcd1cc5174c94e4e9e4d593d27c8e3f92230be6d8cae7872c515322d881950c814918b4 SHA512 143bcb1330bb5e6e3527323b9f5b90148d027f5fdb40a6d4be9355498b7d497393c1585e139bb634ce49a8b4c339a06ada4d7a204043a1c4ad72749c29c3e7e7
+EBUILD trace-cmd-3.1.5.ebuild 3088 BLAKE2B 67119ab40718dbff25ec08a1c80ec9c29f03234ea41ab2d7f8bdc1e858f7b3bf8dcdc508820dd1c22628fb4e901109a363aba673c7ad940e5470daddc5cb4ba3 SHA512 ea287655bf0274038407eebbe1e2527a7958da09e82432051c4c713295e8d148f8408e94c57dfce841be7f4a13deddb92208f8b002d3995ba5028ba71adfcbd3
 MISC metadata.xml 462 BLAKE2B 60ccc0b91ad64f83db4df7cafd5af9355192c5f60139cc523f2c0d1bd287a75501822773443995b0e6f51986aa504a473a74e87c4db78ed9780e24816128f91e SHA512 9a8f02d6b9b23aa4350d7ce48a6aca9541ec5fcde82437c6c9ff1cfc950c8843994eb31133b67d678a9babaa8a15230c00cfba65c45f5db4d4859db0198cb554
diff --git a/dev-util/trace-cmd/files/trace-cmd-3.1.4-hang-make-4.4.patch b/dev-util/trace-cmd/files/trace-cmd-3.1.4-hang-make-4.4.patch
new file mode 100644
index 000000000000..b65109505873
--- /dev/null
+++ b/dev-util/trace-cmd/files/trace-cmd-3.1.4-hang-make-4.4.patch
@@ -0,0 +1,65 @@
+From e95be06da53eceeac332424d9893463c6c758b3d Mon Sep 17 00:00:00 2001
+From: jinqiang zhang <peeweep@0x0.ee>
+Date: Mon, 19 Dec 2022 22:57:32 +0000
+Subject: [PATCH] Fix compile hangs under make 4.4
+
+And run `make -d` with see below error messages:
+
+Makefile:224: not recursively expanding LIBTRACECMD_SHARED_VERSION to export to shell function
+Makefile:225: not recursively expanding LIBTRACECMD_SHARED_SO to export to shell function
+Makefile:237: not recursively expanding LIBTRACEEVENT_CFLAGS to export to shell function
+Makefile:238: not recursively expanding LIBTRACEEVENT_LDLAGS to export to shell function
+Makefile:79: not recursively expanding pkgconfig_dir to export to shell function
+
+Since make 4.4, recursively variables will set as empty string.
+
+Releated:
+  * [SV 10593] Export variables to $(shell ...) commands: https://git.savannah.gnu.org/cgit/make.git/commit/?id=98da874c
+  * [SV 63016] Don't fail exporting to $(shell ...): https://git.savannah.gnu.org/cgit/make.git/commit/?id=7d484017
+  * dev-util/trace-cmd-3.1.4 fails to compile: hangs: https://bugs.gentoo.org/881605
+
+Signed-off-by: jinqiang zhang <peeweep@0x0.ee>
+---
+ Makefile | 12 ++++++------
+ 1 file changed, 6 insertions(+), 6 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index e67cb77..ed98732 100644
+--- a/Makefile
++++ b/Makefile
+@@ -221,8 +221,8 @@ LIBS ?= -ldl
+ LIBTRACECMD_DIR = $(obj)/lib/trace-cmd
+ LIBTRACECMD_STATIC = $(LIBTRACECMD_DIR)/libtracecmd.a
+ LIBTRACECMD_SHARED = $(LIBTRACECMD_DIR)/libtracecmd.so.$(LIBTRACECMD_VERSION)
+-LIBTRACECMD_SHARED_VERSION = $(shell echo $(LIBTRACECMD_SHARED) | sed -e 's/\(\.so\.[0-9]*\).*/\1/')
+-LIBTRACECMD_SHARED_SO = $(shell echo $(LIBTRACECMD_SHARED) | sed -e 's/\(\.so\).*/\1/')
++LIBTRACECMD_SHARED_VERSION := $(shell echo $(LIBTRACECMD_SHARED) | sed -e 's/\(\.so\.[0-9]*\).*/\1/')
++LIBTRACECMD_SHARED_SO := $(shell echo $(LIBTRACECMD_SHARED) | sed -e 's/\(\.so\).*/\1/')
+ 
+ export LIBTRACECMD_STATIC LIBTRACECMD_SHARED
+ export LIBTRACECMD_SHARED_VERSION LIBTRACECMD_SHARED_SO
+@@ -234,8 +234,8 @@ TEST_LIBTRACEEVENT = $(shell sh -c "$(PKG_CONFIG) --atleast-version $(LIBTRACEEV
+ TEST_LIBTRACEFS = $(shell sh -c "$(PKG_CONFIG) --atleast-version $(LIBTRACEFS_MIN_VERSION) $(LIBTRACEFS) > /dev/null 2>&1 && echo y")
+ 
+ ifeq ("$(TEST_LIBTRACEEVENT)", "y")
+-LIBTRACEEVENT_CFLAGS = $(shell sh -c "$(PKG_CONFIG) --cflags $(LIBTRACEEVENT)")
+-LIBTRACEEVENT_LDLAGS = $(shell sh -c "$(PKG_CONFIG) --libs $(LIBTRACEEVENT)")
++LIBTRACEEVENT_CFLAGS := $(shell sh -c "$(PKG_CONFIG) --cflags $(LIBTRACEEVENT)")
++LIBTRACEEVENT_LDLAGS := $(shell sh -c "$(PKG_CONFIG) --libs $(LIBTRACEEVENT)")
+ else
+ .PHONY: warning
+ warning:
+@@ -253,8 +253,8 @@ endif
+ export LIBTRACEEVENT_CFLAGS LIBTRACEEVENT_LDLAGS
+ 
+ ifeq ("$(TEST_LIBTRACEFS)", "y")
+-LIBTRACEFS_CFLAGS = $(shell sh -c "$(PKG_CONFIG) --cflags $(LIBTRACEFS)")
+-LIBTRACEFS_LDLAGS = $(shell sh -c "$(PKG_CONFIG) --libs $(LIBTRACEFS)")
++LIBTRACEFS_CFLAGS := $(shell sh -c "$(PKG_CONFIG) --cflags $(LIBTRACEFS)")
++LIBTRACEFS_LDLAGS := $(shell sh -c "$(PKG_CONFIG) --libs $(LIBTRACEFS)")
+ else
+ .PHONY: warning
+ warning:
+-- 
+2.39.0
+
diff --git a/dev-util/trace-cmd/trace-cmd-3.1.4.ebuild b/dev-util/trace-cmd/trace-cmd-3.1.4.ebuild
index 0d772370332c..f13210697f74 100644
--- a/dev-util/trace-cmd/trace-cmd-3.1.4.ebuild
+++ b/dev-util/trace-cmd/trace-cmd-3.1.4.ebuild
@@ -49,6 +49,10 @@ BDEPEND="
 # having trouble getting tests to compile
 RESTRICT+=" test"
 
+PATCHES=(
+	"${FILESDIR}"/${P}-hang-make-4.4.patch
+)
+
 pkg_setup() {
 	local CONFIG_CHECK="
 		~TRACING
diff --git a/dev-util/trace-cmd/trace-cmd-3.1.5.ebuild b/dev-util/trace-cmd/trace-cmd-3.1.5.ebuild
new file mode 100644
index 000000000000..0937536ff732
--- /dev/null
+++ b/dev-util/trace-cmd/trace-cmd-3.1.5.ebuild
@@ -0,0 +1,138 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+PYTHON_COMPAT=( python3_{8..11} )
+DISTUTILS_OPTIONAL=1
+
+inherit linux-info bash-completion-r1 python-r1 toolchain-funcs
+
+DESCRIPTION="User-space front-end for Ftrace"
+HOMEPAGE="https://git.kernel.org/pub/scm/utils/trace-cmd/trace-cmd.git"
+
+if [[ ${PV} == *9999 ]] ; then
+	EGIT_REPO_URI="https://git.kernel.org/pub/scm/utils/trace-cmd/${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 ~arm64 ~x86"
+	S="${WORKDIR}/${PN}-v${PV}"
+fi
+
+LICENSE="GPL-2+ LGPL-2.1+"
+SLOT="0/${PV}"
+IUSE="+audit doc python test udis86 +zstd"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+RESTRICT="!test? ( test )"
+
+# XXX trace-cmd autodetects this without configurability. This might cause
+# issues if the libraries are picked up with the useflag disabled and later
+# uninstalled
+RDEPEND="
+	audit? ( sys-process/audit )
+	python? ( ${PYTHON_DEPS} )
+	udis86? ( dev-libs/udis86 )
+	zstd? ( >=app-arch/zstd-1.4 )
+	>=dev-libs/libtracefs-1.6
+	>=dev-libs/libtraceevent-1.5
+"
+DEPEND="${RDEPEND}
+	sys-kernel/linux-headers
+	test? ( dev-util/cunit )
+"
+BDEPEND="
+	virtual/pkgconfig
+	python? ( dev-lang/swig )
+	doc? ( app-text/asciidoc )
+"
+
+# having trouble getting tests to compile
+RESTRICT+=" test"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-3.1.4-hang-make-4.4.patch
+)
+
+pkg_setup() {
+	local CONFIG_CHECK="
+		~TRACING
+		~FTRACE
+		~BLK_DEV_IO_TRACE"
+
+	linux-info_pkg_setup
+}
+
+src_prepare() {
+	default
+	sed -r -e 's:([[:space:]]+)install_bash_completion($|[[:space:]]+):\1:' \
+		-i Makefile || die "sed failed"
+}
+
+src_configure() {
+	EMAKE_FLAGS=(
+		BUILD_OUTPUT="${WORKDIR}/${P}_build"
+		"prefix=${EPREFIX}/usr"
+		"libdir=${EPREFIX}/usr/$(get_libdir)"
+		"CC=$(tc-getCC)"
+		"AR=$(tc-getAR)"
+		"BASH_COMPLETE_DIR=$(get_bashcompdir)"
+		"etcdir=/etc"
+		$(usex audit '' 'NO_AUDIT=' '' '1')
+		$(usex test 'CUNIT_INSTALLED=' '' '1' '')
+		$(usex udis86 '' 'NO_UDIS86=' '' '1')
+		VERBOSE=1
+	)
+}
+
+src_compile() {
+	emake "${EMAKE_FLAGS[@]}" NO_PYTHON=1 \
+		trace-cmd
+
+	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
+
+	emake "${EMAKE_FLAGS[@]}" \
+		PYTHON_VERS="${EPYTHON}" \
+		PYTHON_PKGCONFIG_VERS="${EPYTHON//python/python-}" \
+		python_dir=$(python_get_sitedir)/${PN} \
+		python ctracecmd.so
+
+	popd > /dev/null || die
+}
+
+src_test() {
+	emake "${EMAKE_FLAGS[@]}" test
+}
+
+src_install() {
+	emake "${EMAKE_FLAGS[@]}" NO_PYTHON=1 \
+		DESTDIR="${D}" \
+		install install_libs
+
+	newbashcomp tracecmd/trace-cmd.bash "${PN}"
+
+	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
+
+	python_optimize
+}