Gentoo Archives: gentoo-commits

From: Sam James <sam@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: sys-devel/gdb/
Date: Thu, 26 May 2022 05:48:19
Message-Id: 1653544084.ad59e0be0c0db446573c97fe46c4826131a467ed.sam@gentoo
1 commit: ad59e0be0c0db446573c97fe46c4826131a467ed
2 Author: Sam James <sam <AT> gentoo <DOT> org>
3 AuthorDate: Mon Apr 25 00:47:17 2022 +0000
4 Commit: Sam James <sam <AT> gentoo <DOT> org>
5 CommitDate: Thu May 26 05:48:04 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ad59e0be
7
8 sys-devel/gdb: modernise ebuild a bit
9
10 Signed-off-by: Sam James <sam <AT> gentoo.org>
11 Closes: https://github.com/gentoo/gentoo/pull/25188
12 Signed-off-by: Sam James <sam <AT> gentoo.org>
13
14 sys-devel/gdb/gdb-11.2.ebuild | 15 ++++++++-------
15 sys-devel/gdb/gdb-9999.ebuild | 14 +++++++++-----
16 2 files changed, 17 insertions(+), 12 deletions(-)
17
18 diff --git a/sys-devel/gdb/gdb-11.2.ebuild b/sys-devel/gdb/gdb-11.2.ebuild
19 index 9b5d95603631..393a0a0bf8c6 100644
20 --- a/sys-devel/gdb/gdb-11.2.ebuild
21 +++ b/sys-devel/gdb/gdb-11.2.ebuild
22 @@ -53,10 +53,10 @@ fi
23 IUSE="cet guile lzma multitarget nls +python +server source-highlight test vanilla xml xxhash"
24 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
25
26 -# ia64 kernel crashes when gdb testsuite is running
27 -# in fact, gdb's test suite needs some work to get passing.
28 +# In fact, gdb's test suite needs some work to get passing.
29 # See e.g. https://sourceware.org/gdb/wiki/TestingGDB.
30 # As of 11.2, on amd64: "# of unexpected failures 8600"
31 +# ia64 kernel crashes when gdb testsuite is running
32 RESTRICT="
33 ia64? ( test )
34 !test? ( test )
35 @@ -103,9 +103,8 @@ src_prepare() {
36 default
37
38 strip-linguas -u bfd/po opcodes/po
39 - export CC_FOR_BUILD="$(tc-getBUILD_CC)"
40
41 - # avoid using ancient termcap from host on Prefix systems
42 + # Avoid using ancient termcap from host on Prefix systems
43 sed -i -e 's/termcap tinfow/tinfow/g' \
44 gdb/configure{.ac,} || die
45 }
46 @@ -134,7 +133,7 @@ src_configure() {
47 --with-pkgversion="$(gdb_branding)"
48 --with-bugurl='https://bugs.gentoo.org/'
49 --disable-werror
50 - # Disable modules that are in a combined binutils/gdb tree. #490566
51 + # Disable modules that are in a combined binutils/gdb tree. bug #490566
52 --disable-{binutils,etc,gas,gold,gprof,ld}
53
54 # avoid automagic dependency on (currently prefix) systems
55 @@ -197,6 +196,8 @@ src_configure() {
56 # source-highlight is detected with pkg-config: bug #716558
57 export ac_cv_path_pkg_config_prog_path="$(tc-getPKG_CONFIG)"
58
59 + export CC_FOR_BUILD="$(tc-getBUILD_CC)"
60 +
61 # ensure proper compiler is detected for Clang builds: bug #831202
62 export GCC_FOR_TARGET="${CC_FOR_TARGET:-$(tc-getCC)}"
63
64 @@ -208,7 +209,7 @@ src_install() {
65
66 find "${ED}"/usr -name libiberty.a -delete || die
67
68 - # Delete translations that conflict with binutils-libs. #528088
69 + # Delete translations that conflict with binutils-libs. bug #528088
70 # Note: Should figure out how to store these in an internal gdb dir.
71 if use nls ; then
72 find "${ED}" \
73 @@ -252,7 +253,7 @@ src_install() {
74 # Remove shared info pages
75 rm -f "${ED}"/usr/share/info/{annotate,bfd,configure,standards}.info*
76
77 - if use python; then
78 + if use python ; then
79 python_optimize "${ED}"/usr/share/gdb/python/gdb
80 fi
81 }
82
83 diff --git a/sys-devel/gdb/gdb-9999.ebuild b/sys-devel/gdb/gdb-9999.ebuild
84 index 8e18279f8752..41ac0f8d0737 100644
85 --- a/sys-devel/gdb/gdb-9999.ebuild
86 +++ b/sys-devel/gdb/gdb-9999.ebuild
87 @@ -53,6 +53,9 @@ fi
88 IUSE="cet guile lzma multitarget nls +python +server source-highlight test vanilla xml xxhash"
89 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
90
91 +# In fact, gdb's test suite needs some work to get passing.
92 +# See e.g. https://sourceware.org/gdb/wiki/TestingGDB.
93 +# As of 11.2, on amd64: "# of unexpected failures 8600"
94 # ia64 kernel crashes when gdb testsuite is running
95 # in fact, gdb's test suite needs some work to get passing.
96 # See e.g. https://sourceware.org/gdb/wiki/TestingGDB.
97 @@ -103,9 +106,8 @@ src_prepare() {
98 default
99
100 strip-linguas -u bfd/po opcodes/po
101 - export CC_FOR_BUILD="$(tc-getBUILD_CC)"
102
103 - # avoid using ancient termcap from host on Prefix systems
104 + # Avoid using ancient termcap from host on Prefix systems
105 sed -i -e 's/termcap tinfow/tinfow/g' \
106 gdb/configure{.ac,} || die
107 }
108 @@ -134,7 +136,7 @@ src_configure() {
109 --with-pkgversion="$(gdb_branding)"
110 --with-bugurl='https://bugs.gentoo.org/'
111 --disable-werror
112 - # Disable modules that are in a combined binutils/gdb tree. #490566
113 + # Disable modules that are in a combined binutils/gdb tree. bug #490566
114 --disable-{binutils,etc,gas,gold,gprof,ld}
115
116 # avoid automagic dependency on (currently prefix) systems
117 @@ -197,6 +199,8 @@ src_configure() {
118 # source-highlight is detected with pkg-config: bug #716558
119 export ac_cv_path_pkg_config_prog_path="$(tc-getPKG_CONFIG)"
120
121 + export CC_FOR_BUILD="$(tc-getBUILD_CC)"
122 +
123 # ensure proper compiler is detected for Clang builds: bug #831202
124 export GCC_FOR_TARGET="${CC_FOR_TARGET:-$(tc-getCC)}"
125
126 @@ -208,7 +212,7 @@ src_install() {
127
128 find "${ED}"/usr -name libiberty.a -delete || die
129
130 - # Delete translations that conflict with binutils-libs. #528088
131 + # Delete translations that conflict with binutils-libs. bug #528088
132 # Note: Should figure out how to store these in an internal gdb dir.
133 if use nls ; then
134 find "${ED}" \
135 @@ -252,7 +256,7 @@ src_install() {
136 # Remove shared info pages
137 rm -f "${ED}"/usr/share/info/{annotate,bfd,configure,ctf-spec,standards}.info*
138
139 - if use python; then
140 + if use python ; then
141 python_optimize "${ED}"/usr/share/gdb/python/gdb
142 fi
143 }