1 |
commit: 2aa76f92308d2b745bf47b9ca94937f125301691 |
2 |
Author: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org> |
3 |
AuthorDate: Tue Feb 9 14:08:24 2021 +0000 |
4 |
Commit: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org> |
5 |
CommitDate: Tue Feb 9 14:08:51 2021 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2aa76f92 |
7 |
|
8 |
sys-devel/gdb: force USE=client on |
9 |
|
10 |
From gcc-10 gdbserver requires top-level gnulib. That broke |
11 |
USE="server -client" case which was implemented in a hacky |
12 |
way in Gentoo ebuild. |
13 |
|
14 |
Instead of trying to fix it we resort to always enabling |
15 |
USE=client. It's a heavyweight workaround. |
16 |
|
17 |
Reported-by: Oleh Kravchenko |
18 |
Closes: https://bugs.gentoo.org/768237 |
19 |
Package-Manager: Portage-3.0.14, Repoman-3.0.2 |
20 |
Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org> |
21 |
|
22 |
sys-devel/gdb/gdb-10.1.ebuild | 115 +++++++++++++++++------------------------- |
23 |
sys-devel/gdb/gdb-9999.ebuild | 115 +++++++++++++++++------------------------- |
24 |
sys-devel/gdb/metadata.xml | 1 - |
25 |
3 files changed, 94 insertions(+), 137 deletions(-) |
26 |
|
27 |
diff --git a/sys-devel/gdb/gdb-10.1.ebuild b/sys-devel/gdb/gdb-10.1.ebuild |
28 |
index 940b142caef..68826d3db64 100644 |
29 |
--- a/sys-devel/gdb/gdb-10.1.ebuild |
30 |
+++ b/sys-devel/gdb/gdb-10.1.ebuild |
31 |
@@ -46,10 +46,9 @@ SLOT="0" |
32 |
if [[ ${PV} != 9999* ]] ; then |
33 |
KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" |
34 |
fi |
35 |
-IUSE="cet +client lzma multitarget nls +python +server source-highlight test vanilla xml xxhash" |
36 |
+IUSE="cet lzma multitarget nls +python +server source-highlight test vanilla xml xxhash" |
37 |
REQUIRED_USE=" |
38 |
python? ( ${PYTHON_REQUIRED_USE} ) |
39 |
- || ( client server ) |
40 |
" |
41 |
|
42 |
# ia64 kernel crashes when gdb testsuite is running |
43 |
@@ -60,15 +59,13 @@ RESTRICT=" |
44 |
" |
45 |
|
46 |
RDEPEND=" |
47 |
- client? ( |
48 |
- dev-libs/mpfr:0= |
49 |
- >=sys-libs/ncurses-5.2-r2:0= |
50 |
- >=sys-libs/readline-7:0= |
51 |
- lzma? ( app-arch/xz-utils ) |
52 |
- python? ( ${PYTHON_DEPS} ) |
53 |
- xml? ( dev-libs/expat ) |
54 |
- sys-libs/zlib |
55 |
- ) |
56 |
+ dev-libs/mpfr:0= |
57 |
+ >=sys-libs/ncurses-5.2-r2:0= |
58 |
+ >=sys-libs/readline-7:0= |
59 |
+ sys-libs/zlib |
60 |
+ lzma? ( app-arch/xz-utils ) |
61 |
+ python? ( ${PYTHON_DEPS} ) |
62 |
+ xml? ( dev-libs/expat ) |
63 |
source-highlight? ( |
64 |
dev-util/source-highlight |
65 |
) |
66 |
@@ -80,11 +77,10 @@ DEPEND="${RDEPEND}" |
67 |
BDEPEND=" |
68 |
app-arch/xz-utils |
69 |
sys-apps/texinfo |
70 |
- client? ( |
71 |
- virtual/yacc |
72 |
- test? ( dev-util/dejagnu ) |
73 |
- nls? ( sys-devel/gettext ) |
74 |
- )" |
75 |
+ virtual/yacc |
76 |
+ nls? ( sys-devel/gettext ) |
77 |
+ test? ( dev-util/dejagnu ) |
78 |
+" |
79 |
|
80 |
PATCHES=( |
81 |
"${FILESDIR}"/${PN}-8.3.1-verbose-build.patch |
82 |
@@ -146,49 +142,39 @@ src_configure() { |
83 |
--with-gdb-datadir="\${datadir}/gdb/${CTARGET}" |
84 |
) |
85 |
|
86 |
- if use server && ! use client ; then |
87 |
- # just configure+build in the gdbserver subdir to speed things up |
88 |
- cd gdbserver |
89 |
- myconf+=( --program-transform-name='' ) |
90 |
- else |
91 |
- # gdbserver only works for native targets (CHOST==CTARGET). |
92 |
- # it also doesn't support all targets, so rather than duplicate |
93 |
- # the target list (which changes between versions), use the |
94 |
- # "auto" value when things are turned on, which is triggered |
95 |
- # whenever no --enable or --disable is given |
96 |
- if is_cross || use !server ; then |
97 |
- myconf+=( --disable-gdbserver ) |
98 |
- fi |
99 |
+ # gdbserver only works for native targets (CHOST==CTARGET). |
100 |
+ # it also doesn't support all targets, so rather than duplicate |
101 |
+ # the target list (which changes between versions), use the |
102 |
+ # "auto" value when things are turned on, which is triggered |
103 |
+ # whenever no --enable or --disable is given |
104 |
+ if is_cross || use !server ; then |
105 |
+ myconf+=( --disable-gdbserver ) |
106 |
fi |
107 |
|
108 |
- if ! ( use server && ! use client ) ; then |
109 |
- # if we are configuring in the top level, then use all |
110 |
- # the additional global options |
111 |
- myconf+=( |
112 |
- --enable-64-bit-bfd |
113 |
- --disable-install-libbfd |
114 |
- --disable-install-libiberty |
115 |
- # Disable guile for now as it requires guile-2.x #562902 |
116 |
- --without-guile |
117 |
- --enable-obsolete |
118 |
- # This only disables building in the readline subdir. |
119 |
- # For gdb itself, it'll use the system version. |
120 |
- --disable-readline |
121 |
- --with-system-readline |
122 |
- # This only disables building in the zlib subdir. |
123 |
- # For gdb itself, it'll use the system version. |
124 |
- --without-zlib |
125 |
- --with-system-zlib |
126 |
- --with-separate-debug-dir="${EPREFIX}"/usr/lib/debug |
127 |
- $(use_with xml expat) |
128 |
- $(use_with lzma) |
129 |
- $(use_enable nls) |
130 |
- $(use_enable source-highlight) |
131 |
- $(use multitarget && echo --enable-targets=all) |
132 |
- $(use_with python python "${EPYTHON}") |
133 |
- $(use_with xxhash) |
134 |
- ) |
135 |
- fi |
136 |
+ myconf+=( |
137 |
+ --enable-64-bit-bfd |
138 |
+ --disable-install-libbfd |
139 |
+ --disable-install-libiberty |
140 |
+ # Disable guile for now as it requires guile-2.x #562902 |
141 |
+ --without-guile |
142 |
+ --enable-obsolete |
143 |
+ # This only disables building in the readline subdir. |
144 |
+ # For gdb itself, it'll use the system version. |
145 |
+ --disable-readline |
146 |
+ --with-system-readline |
147 |
+ # This only disables building in the zlib subdir. |
148 |
+ # For gdb itself, it'll use the system version. |
149 |
+ --without-zlib |
150 |
+ --with-system-zlib |
151 |
+ --with-separate-debug-dir="${EPREFIX}"/usr/lib/debug |
152 |
+ $(use_with xml expat) |
153 |
+ $(use_with lzma) |
154 |
+ $(use_enable nls) |
155 |
+ $(use_enable source-highlight) |
156 |
+ $(use multitarget && echo --enable-targets=all) |
157 |
+ $(use_with python python "${EPYTHON}") |
158 |
+ $(use_with xxhash) |
159 |
+ ) |
160 |
if use sparc-solaris || use x86-solaris ; then |
161 |
# disable largefile support |
162 |
# https://sourceware.org/ml/gdb-patches/2014-12/msg00058.html |
163 |
@@ -202,13 +188,8 @@ src_configure() { |
164 |
} |
165 |
|
166 |
src_install() { |
167 |
- if use server && ! use client; then |
168 |
- cd gdbserver || die |
169 |
- fi |
170 |
default |
171 |
- if use client; then |
172 |
- find "${ED}"/usr -name libiberty.a -delete || die |
173 |
- fi |
174 |
+ find "${ED}"/usr -name libiberty.a -delete || die |
175 |
|
176 |
# Delete translations that conflict with binutils-libs. #528088 |
177 |
# Note: Should figure out how to store these in an internal gdb dir. |
178 |
@@ -235,11 +216,9 @@ src_install() { |
179 |
# notes in src_configure above). |
180 |
[[ -e gdbserver/gdbreplay ]] && dobin gdbserver/gdbreplay |
181 |
|
182 |
- if use client ; then |
183 |
- docinto gdb |
184 |
- dodoc gdb/CONTRIBUTE gdb/README gdb/MAINTAINERS \ |
185 |
- gdb/NEWS gdb/ChangeLog gdb/PROBLEMS |
186 |
- fi |
187 |
+ docinto gdb |
188 |
+ dodoc gdb/CONTRIBUTE gdb/README gdb/MAINTAINERS \ |
189 |
+ gdb/NEWS gdb/ChangeLog gdb/PROBLEMS |
190 |
docinto sim |
191 |
dodoc sim/{ChangeLog,MAINTAINERS,README-HACKING} |
192 |
if use server ; then |
193 |
|
194 |
diff --git a/sys-devel/gdb/gdb-9999.ebuild b/sys-devel/gdb/gdb-9999.ebuild |
195 |
index bcbe6b1cd2a..ceab3a731e8 100644 |
196 |
--- a/sys-devel/gdb/gdb-9999.ebuild |
197 |
+++ b/sys-devel/gdb/gdb-9999.ebuild |
198 |
@@ -46,10 +46,9 @@ SLOT="0" |
199 |
if [[ ${PV} != 9999* ]] ; then |
200 |
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" |
201 |
fi |
202 |
-IUSE="cet +client lzma multitarget nls +python +server source-highlight test vanilla xml xxhash" |
203 |
+IUSE="cet lzma multitarget nls +python +server source-highlight test vanilla xml xxhash" |
204 |
REQUIRED_USE=" |
205 |
python? ( ${PYTHON_REQUIRED_USE} ) |
206 |
- || ( client server ) |
207 |
" |
208 |
|
209 |
# ia64 kernel crashes when gdb testsuite is running |
210 |
@@ -60,15 +59,13 @@ RESTRICT=" |
211 |
" |
212 |
|
213 |
RDEPEND=" |
214 |
- client? ( |
215 |
- dev-libs/mpfr:0= |
216 |
- >=sys-libs/ncurses-5.2-r2:0= |
217 |
- >=sys-libs/readline-7:0= |
218 |
- lzma? ( app-arch/xz-utils ) |
219 |
- python? ( ${PYTHON_DEPS} ) |
220 |
- xml? ( dev-libs/expat ) |
221 |
- sys-libs/zlib |
222 |
- ) |
223 |
+ dev-libs/mpfr:0= |
224 |
+ >=sys-libs/ncurses-5.2-r2:0= |
225 |
+ >=sys-libs/readline-7:0= |
226 |
+ sys-libs/zlib |
227 |
+ lzma? ( app-arch/xz-utils ) |
228 |
+ python? ( ${PYTHON_DEPS} ) |
229 |
+ xml? ( dev-libs/expat ) |
230 |
source-highlight? ( |
231 |
dev-util/source-highlight |
232 |
) |
233 |
@@ -80,11 +77,10 @@ DEPEND="${RDEPEND}" |
234 |
BDEPEND=" |
235 |
app-arch/xz-utils |
236 |
sys-apps/texinfo |
237 |
- client? ( |
238 |
- virtual/yacc |
239 |
- test? ( dev-util/dejagnu ) |
240 |
- nls? ( sys-devel/gettext ) |
241 |
- )" |
242 |
+ virtual/yacc |
243 |
+ nls? ( sys-devel/gettext ) |
244 |
+ test? ( dev-util/dejagnu ) |
245 |
+" |
246 |
|
247 |
PATCHES=( |
248 |
"${FILESDIR}"/${PN}-8.3.1-verbose-build.patch |
249 |
@@ -146,49 +142,39 @@ src_configure() { |
250 |
--with-gdb-datadir="\${datadir}/gdb/${CTARGET}" |
251 |
) |
252 |
|
253 |
- if use server && ! use client ; then |
254 |
- # just configure+build in the gdbserver subdir to speed things up |
255 |
- cd gdbserver |
256 |
- myconf+=( --program-transform-name='' ) |
257 |
- else |
258 |
- # gdbserver only works for native targets (CHOST==CTARGET). |
259 |
- # it also doesn't support all targets, so rather than duplicate |
260 |
- # the target list (which changes between versions), use the |
261 |
- # "auto" value when things are turned on, which is triggered |
262 |
- # whenever no --enable or --disable is given |
263 |
- if is_cross || use !server ; then |
264 |
- myconf+=( --disable-gdbserver ) |
265 |
- fi |
266 |
+ # gdbserver only works for native targets (CHOST==CTARGET). |
267 |
+ # it also doesn't support all targets, so rather than duplicate |
268 |
+ # the target list (which changes between versions), use the |
269 |
+ # "auto" value when things are turned on, which is triggered |
270 |
+ # whenever no --enable or --disable is given |
271 |
+ if is_cross || use !server ; then |
272 |
+ myconf+=( --disable-gdbserver ) |
273 |
fi |
274 |
|
275 |
- if ! ( use server && ! use client ) ; then |
276 |
- # if we are configuring in the top level, then use all |
277 |
- # the additional global options |
278 |
- myconf+=( |
279 |
- --enable-64-bit-bfd |
280 |
- --disable-install-libbfd |
281 |
- --disable-install-libiberty |
282 |
- # Disable guile for now as it requires guile-2.x #562902 |
283 |
- --without-guile |
284 |
- --enable-obsolete |
285 |
- # This only disables building in the readline subdir. |
286 |
- # For gdb itself, it'll use the system version. |
287 |
- --disable-readline |
288 |
- --with-system-readline |
289 |
- # This only disables building in the zlib subdir. |
290 |
- # For gdb itself, it'll use the system version. |
291 |
- --without-zlib |
292 |
- --with-system-zlib |
293 |
- --with-separate-debug-dir="${EPREFIX}"/usr/lib/debug |
294 |
- $(use_with xml expat) |
295 |
- $(use_with lzma) |
296 |
- $(use_enable nls) |
297 |
- $(use_enable source-highlight) |
298 |
- $(use multitarget && echo --enable-targets=all) |
299 |
- $(use_with python python "${EPYTHON}") |
300 |
- $(use_with xxhash) |
301 |
- ) |
302 |
- fi |
303 |
+ myconf+=( |
304 |
+ --enable-64-bit-bfd |
305 |
+ --disable-install-libbfd |
306 |
+ --disable-install-libiberty |
307 |
+ # Disable guile for now as it requires guile-2.x #562902 |
308 |
+ --without-guile |
309 |
+ --enable-obsolete |
310 |
+ # This only disables building in the readline subdir. |
311 |
+ # For gdb itself, it'll use the system version. |
312 |
+ --disable-readline |
313 |
+ --with-system-readline |
314 |
+ # This only disables building in the zlib subdir. |
315 |
+ # For gdb itself, it'll use the system version. |
316 |
+ --without-zlib |
317 |
+ --with-system-zlib |
318 |
+ --with-separate-debug-dir="${EPREFIX}"/usr/lib/debug |
319 |
+ $(use_with xml expat) |
320 |
+ $(use_with lzma) |
321 |
+ $(use_enable nls) |
322 |
+ $(use_enable source-highlight) |
323 |
+ $(use multitarget && echo --enable-targets=all) |
324 |
+ $(use_with python python "${EPYTHON}") |
325 |
+ $(use_with xxhash) |
326 |
+ ) |
327 |
if use sparc-solaris || use x86-solaris ; then |
328 |
# disable largefile support |
329 |
# https://sourceware.org/ml/gdb-patches/2014-12/msg00058.html |
330 |
@@ -202,13 +188,8 @@ src_configure() { |
331 |
} |
332 |
|
333 |
src_install() { |
334 |
- if use server && ! use client; then |
335 |
- cd gdbserver || die |
336 |
- fi |
337 |
default |
338 |
- if use client; then |
339 |
- find "${ED}"/usr -name libiberty.a -delete || die |
340 |
- fi |
341 |
+ find "${ED}"/usr -name libiberty.a -delete || die |
342 |
|
343 |
# Delete translations that conflict with binutils-libs. #528088 |
344 |
# Note: Should figure out how to store these in an internal gdb dir. |
345 |
@@ -235,11 +216,9 @@ src_install() { |
346 |
# notes in src_configure above). |
347 |
[[ -e gdbserver/gdbreplay ]] && dobin gdbserver/gdbreplay |
348 |
|
349 |
- if use client ; then |
350 |
- docinto gdb |
351 |
- dodoc gdb/CONTRIBUTE gdb/README gdb/MAINTAINERS \ |
352 |
- gdb/NEWS gdb/ChangeLog gdb/PROBLEMS |
353 |
- fi |
354 |
+ docinto gdb |
355 |
+ dodoc gdb/CONTRIBUTE gdb/README gdb/MAINTAINERS \ |
356 |
+ gdb/NEWS gdb/ChangeLog gdb/PROBLEMS |
357 |
docinto sim |
358 |
dodoc sim/{ChangeLog,MAINTAINERS,README-HACKING} |
359 |
if use server ; then |
360 |
|
361 |
diff --git a/sys-devel/gdb/metadata.xml b/sys-devel/gdb/metadata.xml |
362 |
index 9595bbc9f45..36cae41ca5c 100644 |
363 |
--- a/sys-devel/gdb/metadata.xml |
364 |
+++ b/sys-devel/gdb/metadata.xml |
365 |
@@ -7,7 +7,6 @@ |
366 |
</maintainer> |
367 |
<use> |
368 |
<flag name="cet">Enable Intel Control-flow Enforcement Technology.</flag> |
369 |
- <flag name="client">Install the main "gdb" program (most people want this)</flag> |
370 |
<flag name="lzma">Support lzma compression in ELF debug info</flag> |
371 |
<flag name="multitarget">Support all known targets in one gdb binary</flag> |
372 |
<flag name="python">Enable support for the new internal scripting language, as well as extended pretty printers</flag> |