commit: e23c78ce6df9352f301335fe397543d3ea5f9e0b
Author: Patrick McLean <patrick.mclean <AT> sony <DOT> com>
AuthorDate: Mon Mar 11 20:29:49 2019 +0000
Commit: Patrick McLean <chutzpah <AT> gentoo <DOT> org>
CommitDate: Mon Mar 11 20:31:06 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e23c78ce
dev-util/trace-cmd: Revbump to 2.7-r1, fix dynlib and plugin inst
Copyright: Sony Interactive Entertainment Inc.
Package-Manager: Portage-2.3.62, Repoman-2.3.12
Signed-off-by: Patrick McLean <chutzpah <AT> gentoo.org>
dev-util/trace-cmd/files/trace-cmd-2.7-soname.patch | 13 +++++++++++++
...{trace-cmd-2.7.ebuild => trace-cmd-2.7-r1.ebuild} | 20 +++++++++++++-------
dev-util/trace-cmd/trace-cmd-9999.ebuild | 18 ++++++++++++------
3 files changed, 38 insertions(+), 13 deletions(-)
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
new file mode 100644
index 00000000000..937f0617a4a
--- /dev/null
+++ b/dev-util/trace-cmd/files/trace-cmd-2.7-soname.patch
@@ -0,0 +1,13 @@
+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.ebuild
b/dev-util/trace-cmd/trace-cmd-2.7-r1.ebuild
similarity index 78%
rename from dev-util/trace-cmd/trace-cmd-2.7.ebuild
rename to dev-util/trace-cmd/trace-cmd-2.7-r1.ebuild
index edebefd435b..6fd69e83c23 100644
--- a/dev-util/trace-cmd/trace-cmd-2.7.ebuild
+++ b/dev-util/trace-cmd/trace-cmd-2.7-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -13,17 +13,18 @@ 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";
+
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="doc gtk python udis86"
+IUSE="+audit doc gtk python udis86"
REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-RDEPEND="python? ( ${PYTHON_DEPS} )
+RDEPEND="audit? ( sys-process/audit )
+ python? ( ${PYTHON_DEPS} )
udis86? ( dev-libs/udis86 )
gtk? (
${PYTHON_DEPS}
@@ -45,6 +46,7 @@ CONFIG_CHECK="
PATCHES=(
"${FILESDIR}"/${PN}-2.7-makefile.patch
+ "${FILESDIR}"/${PN}-2.7-soname.patch
)
pkg_setup() {
@@ -53,7 +55,11 @@ pkg_setup() {
}
src_configure() {
- MAKEOPTS+=" prefix=/usr libdir=$(get_libdir) CC=$(tc-getCC)
AR=$(tc-getAR)"
+ MAKEOPTS+=" prefix=/usr
+ libdir=/usr/$(get_libdir)
+ CC=$(tc-getCC)
+ AR=$(tc-getAR)
+ $(usex audit '' '' 'NO_AUDIT=1')"
if use python; then
MAKEOPTS+=" PYTHON_VERS=${EPYTHON//python/python-}"
@@ -66,13 +72,13 @@ src_configure() {
}
src_compile() {
- emake all_cmd
+ emake V=1 all_cmd libs
use doc && emake doc
use gtk && emake -j1 gui
}
src_install() {
- default
+ emake DESTDIR="${D}" V=1 install install_libs
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
index edebefd435b..f6463fe7257 100644
--- a/dev-util/trace-cmd/trace-cmd-9999.ebuild
+++ b/dev-util/trace-cmd/trace-cmd-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -20,10 +20,11 @@ fi
LICENSE="GPL-2+ LGPL-2.1+"
SLOT="0"
-IUSE="doc gtk python udis86"
+IUSE="+audit doc gtk python udis86"
REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-RDEPEND="python? ( ${PYTHON_DEPS} )
+RDEPEND="audit? ( sys-process/audit )
+ python? ( ${PYTHON_DEPS} )
udis86? ( dev-libs/udis86 )
gtk? (
${PYTHON_DEPS}
@@ -45,6 +46,7 @@ CONFIG_CHECK="
PATCHES=(
"${FILESDIR}"/${PN}-2.7-makefile.patch
+ "${FILESDIR}"/${PN}-2.7-soname.patch
)
pkg_setup() {
@@ -53,7 +55,11 @@ pkg_setup() {
}
src_configure() {
- MAKEOPTS+=" prefix=/usr libdir=$(get_libdir) CC=$(tc-getCC)
AR=$(tc-getAR)"
+ MAKEOPTS+=" prefix=/usr
+ libdir=/usr/$(get_libdir)
+ CC=$(tc-getCC)
+ AR=$(tc-getAR)
+ $(usex audit '' '' 'NO_AUDIT=1')"
if use python; then
MAKEOPTS+=" PYTHON_VERS=${EPYTHON//python/python-}"
@@ -66,13 +72,13 @@ src_configure() {
}
src_compile() {
- emake all_cmd
+ emake V=1 all_cmd libs
use doc && emake doc
use gtk && emake -j1 gui
}
src_install() {
- default
+ emake DESTDIR="${D}" V=1 install install_libs
use doc && emake DESTDIR="${D}" install_doc
use gtk && emake DESTDIR="${D}" install_gui
}
