1 |
commit: e23c78ce6df9352f301335fe397543d3ea5f9e0b |
2 |
Author: Patrick McLean <patrick.mclean <AT> sony <DOT> com> |
3 |
AuthorDate: Mon Mar 11 20:29:49 2019 +0000 |
4 |
Commit: Patrick McLean <chutzpah <AT> gentoo <DOT> org> |
5 |
CommitDate: Mon Mar 11 20:31:06 2019 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e23c78ce |
7 |
|
8 |
dev-util/trace-cmd: Revbump to 2.7-r1, fix dynlib and plugin inst |
9 |
|
10 |
Copyright: Sony Interactive Entertainment Inc. |
11 |
Package-Manager: Portage-2.3.62, Repoman-2.3.12 |
12 |
Signed-off-by: Patrick McLean <chutzpah <AT> gentoo.org> |
13 |
|
14 |
dev-util/trace-cmd/files/trace-cmd-2.7-soname.patch | 13 +++++++++++++ |
15 |
...{trace-cmd-2.7.ebuild => trace-cmd-2.7-r1.ebuild} | 20 +++++++++++++------- |
16 |
dev-util/trace-cmd/trace-cmd-9999.ebuild | 18 ++++++++++++------ |
17 |
3 files changed, 38 insertions(+), 13 deletions(-) |
18 |
|
19 |
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 |
20 |
new file mode 100644 |
21 |
index 00000000000..937f0617a4a |
22 |
--- /dev/null |
23 |
+++ b/dev-util/trace-cmd/files/trace-cmd-2.7-soname.patch |
24 |
@@ -0,0 +1,13 @@ |
25 |
+diff --git a/Makefile b/Makefile |
26 |
+index a5d2c38..588809e 100644 |
27 |
+--- a/Makefile |
28 |
++++ b/Makefile |
29 |
+@@ -308,7 +308,7 @@ do_app_build = \ |
30 |
+ |
31 |
+ do_compile_shared_library = \ |
32 |
+ ($(print_shared_lib_compile) \ |
33 |
+- $(CC) --shared $^ -o $@) |
34 |
++ $(CC) --shared $^ -Wl,-soname,$@ -o $@) |
35 |
+ |
36 |
+ do_compile_plugin_obj = \ |
37 |
+ ($(print_plugin_obj_compile) \ |
38 |
|
39 |
diff --git a/dev-util/trace-cmd/trace-cmd-2.7.ebuild b/dev-util/trace-cmd/trace-cmd-2.7-r1.ebuild |
40 |
similarity index 78% |
41 |
rename from dev-util/trace-cmd/trace-cmd-2.7.ebuild |
42 |
rename to dev-util/trace-cmd/trace-cmd-2.7-r1.ebuild |
43 |
index edebefd435b..6fd69e83c23 100644 |
44 |
--- a/dev-util/trace-cmd/trace-cmd-2.7.ebuild |
45 |
+++ b/dev-util/trace-cmd/trace-cmd-2.7-r1.ebuild |
46 |
@@ -1,4 +1,4 @@ |
47 |
-# Copyright 1999-2018 Gentoo Authors |
48 |
+# Copyright 1999-2019 Gentoo Authors |
49 |
# Distributed under the terms of the GNU General Public License v2 |
50 |
|
51 |
EAPI=7 |
52 |
@@ -13,17 +13,18 @@ if [[ ${PV} == *9999 ]] ; then |
53 |
EGIT_REPO_URI="https://git.kernel.org/pub/scm/linux/kernel/git/rostedt/${PN}.git" |
54 |
inherit git-r3 |
55 |
else |
56 |
- SRC_URI="https://git.kernel.org/pub/scm/linux/kernel/git/rostedt/trace-cmd.git/snapshot/${PN}-v${PV}.tar.gz" |
57 |
+ SRC_URI="https://git.kernel.org/pub/scm/linux/kernel/git/rostedt/${PN}.git/snapshot/${PN}-v${PV}.tar.gz" |
58 |
KEYWORDS="~amd64 ~x86" |
59 |
S="${WORKDIR}/${PN}-v${PV}" |
60 |
fi |
61 |
|
62 |
LICENSE="GPL-2+ LGPL-2.1+" |
63 |
SLOT="0" |
64 |
-IUSE="doc gtk python udis86" |
65 |
+IUSE="+audit doc gtk python udis86" |
66 |
REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" |
67 |
|
68 |
-RDEPEND="python? ( ${PYTHON_DEPS} ) |
69 |
+RDEPEND="audit? ( sys-process/audit ) |
70 |
+ python? ( ${PYTHON_DEPS} ) |
71 |
udis86? ( dev-libs/udis86 ) |
72 |
gtk? ( |
73 |
${PYTHON_DEPS} |
74 |
@@ -45,6 +46,7 @@ CONFIG_CHECK=" |
75 |
|
76 |
PATCHES=( |
77 |
"${FILESDIR}"/${PN}-2.7-makefile.patch |
78 |
+ "${FILESDIR}"/${PN}-2.7-soname.patch |
79 |
) |
80 |
|
81 |
pkg_setup() { |
82 |
@@ -53,7 +55,11 @@ pkg_setup() { |
83 |
} |
84 |
|
85 |
src_configure() { |
86 |
- MAKEOPTS+=" prefix=/usr libdir=$(get_libdir) CC=$(tc-getCC) AR=$(tc-getAR)" |
87 |
+ MAKEOPTS+=" prefix=/usr |
88 |
+ libdir=/usr/$(get_libdir) |
89 |
+ CC=$(tc-getCC) |
90 |
+ AR=$(tc-getAR) |
91 |
+ $(usex audit '' '' 'NO_AUDIT=1')" |
92 |
|
93 |
if use python; then |
94 |
MAKEOPTS+=" PYTHON_VERS=${EPYTHON//python/python-}" |
95 |
@@ -66,13 +72,13 @@ src_configure() { |
96 |
} |
97 |
|
98 |
src_compile() { |
99 |
- emake all_cmd |
100 |
+ emake V=1 all_cmd libs |
101 |
use doc && emake doc |
102 |
use gtk && emake -j1 gui |
103 |
} |
104 |
|
105 |
src_install() { |
106 |
- default |
107 |
+ emake DESTDIR="${D}" V=1 install install_libs |
108 |
use doc && emake DESTDIR="${D}" install_doc |
109 |
use gtk && emake DESTDIR="${D}" install_gui |
110 |
} |
111 |
|
112 |
diff --git a/dev-util/trace-cmd/trace-cmd-9999.ebuild b/dev-util/trace-cmd/trace-cmd-9999.ebuild |
113 |
index edebefd435b..f6463fe7257 100644 |
114 |
--- a/dev-util/trace-cmd/trace-cmd-9999.ebuild |
115 |
+++ b/dev-util/trace-cmd/trace-cmd-9999.ebuild |
116 |
@@ -1,4 +1,4 @@ |
117 |
-# Copyright 1999-2018 Gentoo Authors |
118 |
+# Copyright 1999-2019 Gentoo Authors |
119 |
# Distributed under the terms of the GNU General Public License v2 |
120 |
|
121 |
EAPI=7 |
122 |
@@ -20,10 +20,11 @@ fi |
123 |
|
124 |
LICENSE="GPL-2+ LGPL-2.1+" |
125 |
SLOT="0" |
126 |
-IUSE="doc gtk python udis86" |
127 |
+IUSE="+audit doc gtk python udis86" |
128 |
REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" |
129 |
|
130 |
-RDEPEND="python? ( ${PYTHON_DEPS} ) |
131 |
+RDEPEND="audit? ( sys-process/audit ) |
132 |
+ python? ( ${PYTHON_DEPS} ) |
133 |
udis86? ( dev-libs/udis86 ) |
134 |
gtk? ( |
135 |
${PYTHON_DEPS} |
136 |
@@ -45,6 +46,7 @@ CONFIG_CHECK=" |
137 |
|
138 |
PATCHES=( |
139 |
"${FILESDIR}"/${PN}-2.7-makefile.patch |
140 |
+ "${FILESDIR}"/${PN}-2.7-soname.patch |
141 |
) |
142 |
|
143 |
pkg_setup() { |
144 |
@@ -53,7 +55,11 @@ pkg_setup() { |
145 |
} |
146 |
|
147 |
src_configure() { |
148 |
- MAKEOPTS+=" prefix=/usr libdir=$(get_libdir) CC=$(tc-getCC) AR=$(tc-getAR)" |
149 |
+ MAKEOPTS+=" prefix=/usr |
150 |
+ libdir=/usr/$(get_libdir) |
151 |
+ CC=$(tc-getCC) |
152 |
+ AR=$(tc-getAR) |
153 |
+ $(usex audit '' '' 'NO_AUDIT=1')" |
154 |
|
155 |
if use python; then |
156 |
MAKEOPTS+=" PYTHON_VERS=${EPYTHON//python/python-}" |
157 |
@@ -66,13 +72,13 @@ src_configure() { |
158 |
} |
159 |
|
160 |
src_compile() { |
161 |
- emake all_cmd |
162 |
+ emake V=1 all_cmd libs |
163 |
use doc && emake doc |
164 |
use gtk && emake -j1 gui |
165 |
} |
166 |
|
167 |
src_install() { |
168 |
- default |
169 |
+ emake DESTDIR="${D}" V=1 install install_libs |
170 |
use doc && emake DESTDIR="${D}" install_doc |
171 |
use gtk && emake DESTDIR="${D}" install_gui |
172 |
} |