1 |
commit: 96ce056a7c6e298cf8f595899b295a7f246e4af0 |
2 |
Author: Sam James <sam <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sun Sep 19 02:01:05 2021 +0000 |
4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
5 |
CommitDate: Sun Sep 19 02:24:16 2021 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=96ce056a |
7 |
|
8 |
sys-devel/gdb: add 11.1 |
9 |
|
10 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
11 |
|
12 |
sys-devel/gdb/Manifest | 1 + |
13 |
sys-devel/gdb/{gdb-9999.ebuild => gdb-11.1.ebuild} | 56 +++++++++++++--------- |
14 |
sys-devel/gdb/gdb-9999.ebuild | 56 +++++++++++++--------- |
15 |
3 files changed, 67 insertions(+), 46 deletions(-) |
16 |
|
17 |
diff --git a/sys-devel/gdb/Manifest b/sys-devel/gdb/Manifest |
18 |
index 563fc11c108..b8e17615d04 100644 |
19 |
--- a/sys-devel/gdb/Manifest |
20 |
+++ b/sys-devel/gdb/Manifest |
21 |
@@ -1,2 +1,3 @@ |
22 |
DIST gdb-10.1.tar.xz 21507112 BLAKE2B 69d79cd667ecb6e936b41a03817ade5dd9b761f97bc123d668b5f968d123c37d048fc8ec1289151e989f01bb01a43cc3d8b5b54f1807f1e3eb5f43e6bf0aa55b SHA512 0dc54380435c6853db60f1e388b94836d294dfa9ad7f518385a27db4edd03cb970f8717d5f1e9c9a0d4a33d7fcf91bc2e5d6c9cf9e4b561dcc74e65b806c1537 |
23 |
DIST gdb-10.2.tar.xz 21518900 BLAKE2B c5d31d80d2b454767d6f844e8471b012ad437c3872391b618fd7b14c5cf251b78e55d28c12e81382fd600f67e2f618ff5dbe3a7b737a5d5161ceb3542afbb90b SHA512 3653762ac008e065c37cd641653184c9ff7ce51ee2222ade1122bec9d6cc64dffd4fb74888ef11ac1942064a08910e96b7865112ad37f4602eb0a16bed074caa |
24 |
+DIST gdb-11.1.tar.xz 22040696 BLAKE2B 6a639f6533f4008bfb469c23a26c4fcd039f1bc5dd33745f4876344451beb595d7a8843caeb5db70214924624c5b999f8831237d459bebf1cb2d2866f8b41ee2 SHA512 c40bf970e2f7c2107b29c5aa6a7150daa709d75ddadb73ac20742419d4637d158e3063a4c6ff6e47fae8ca8e1d36253973f85ea15445d004be6d5d7a2dd9bd46 |
25 |
|
26 |
diff --git a/sys-devel/gdb/gdb-9999.ebuild b/sys-devel/gdb/gdb-11.1.ebuild |
27 |
similarity index 90% |
28 |
copy from sys-devel/gdb/gdb-9999.ebuild |
29 |
copy to sys-devel/gdb/gdb-11.1.ebuild |
30 |
index fde1ad99243..8b1a81f909e 100644 |
31 |
--- a/sys-devel/gdb/gdb-9999.ebuild |
32 |
+++ b/sys-devel/gdb/gdb-11.1.ebuild |
33 |
@@ -2,34 +2,36 @@ |
34 |
# Distributed under the terms of the GNU General Public License v2 |
35 |
|
36 |
EAPI=7 |
37 |
-PYTHON_COMPAT=( python3_{7,8,9,10} ) |
38 |
|
39 |
-inherit eutils flag-o-matic python-single-r1 toolchain-funcs |
40 |
+PYTHON_COMPAT=( python3_{8,9,10} ) |
41 |
+inherit flag-o-matic python-single-r1 strip-linguas toolchain-funcs |
42 |
|
43 |
export CTARGET=${CTARGET:-${CHOST}} |
44 |
+ |
45 |
if [[ ${CTARGET} == ${CHOST} ]] ; then |
46 |
if [[ ${CATEGORY} == cross-* ]] ; then |
47 |
export CTARGET=${CATEGORY#cross-} |
48 |
fi |
49 |
fi |
50 |
+ |
51 |
is_cross() { [[ ${CHOST} != ${CTARGET} ]] ; } |
52 |
|
53 |
case ${PV} in |
54 |
-9999*) |
55 |
- # live git tree |
56 |
- EGIT_REPO_URI="https://sourceware.org/git/binutils-gdb.git" |
57 |
- inherit git-r3 |
58 |
- SRC_URI="" |
59 |
- ;; |
60 |
-*.*.50.2???????) |
61 |
- # weekly snapshots |
62 |
- SRC_URI="ftp://sourceware.org/pub/gdb/snapshots/current/gdb-weekly-${PV}.tar.xz" |
63 |
- ;; |
64 |
-*) |
65 |
- # Normal upstream release |
66 |
- SRC_URI="mirror://gnu/gdb/${P}.tar.xz |
67 |
- ftp://sourceware.org/pub/gdb/releases/${P}.tar.xz" |
68 |
- ;; |
69 |
+ 9999*) |
70 |
+ # live git tree |
71 |
+ EGIT_REPO_URI="https://sourceware.org/git/binutils-gdb.git" |
72 |
+ inherit git-r3 |
73 |
+ SRC_URI="" |
74 |
+ ;; |
75 |
+ *.*.50.2???????) |
76 |
+ # weekly snapshots |
77 |
+ SRC_URI="ftp://sourceware.org/pub/gdb/snapshots/current/gdb-weekly-${PV}.tar.xz" |
78 |
+ ;; |
79 |
+ *) |
80 |
+ # Normal upstream release |
81 |
+ SRC_URI="mirror://gnu/gdb/${P}.tar.xz |
82 |
+ ftp://sourceware.org/pub/gdb/releases/${P}.tar.xz" |
83 |
+ ;; |
84 |
esac |
85 |
|
86 |
PATCH_VER="" |
87 |
@@ -43,23 +45,23 @@ SRC_URI="${SRC_URI} |
88 |
|
89 |
LICENSE="GPL-2 LGPL-2" |
90 |
SLOT="0" |
91 |
+ |
92 |
if [[ ${PV} != 9999* ]] ; then |
93 |
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" |
94 |
fi |
95 |
+ |
96 |
IUSE="cet guile lzma multitarget nls +python +server source-highlight test vanilla xml xxhash" |
97 |
-REQUIRED_USE=" |
98 |
- python? ( ${PYTHON_REQUIRED_USE} ) |
99 |
-" |
100 |
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" |
101 |
|
102 |
# ia64 kernel crashes when gdb testsuite is running |
103 |
RESTRICT=" |
104 |
ia64? ( test ) |
105 |
- |
106 |
!test? ( test ) |
107 |
" |
108 |
|
109 |
RDEPEND=" |
110 |
dev-libs/mpfr:0= |
111 |
+ dev-libs/gmp:= |
112 |
>=sys-libs/ncurses-5.2-r2:0= |
113 |
>=sys-libs/readline-7:0= |
114 |
sys-libs/zlib |
115 |
@@ -105,11 +107,13 @@ src_prepare() { |
116 |
|
117 |
gdb_branding() { |
118 |
printf "Gentoo ${PV} " |
119 |
+ |
120 |
if ! use vanilla && [[ -n ${PATCH_VER} ]] ; then |
121 |
printf "p${PATCH_VER}" |
122 |
else |
123 |
printf "vanilla" |
124 |
fi |
125 |
+ |
126 |
[[ -n ${EGIT_COMMIT} ]] && printf " ${EGIT_COMMIT}" |
127 |
} |
128 |
|
129 |
@@ -137,7 +141,9 @@ src_configure() { |
130 |
# But the check does not quite work on i686: bug #760926. |
131 |
$(use_enable cet) |
132 |
) |
133 |
+ |
134 |
local sysroot="${EPREFIX}/usr/${CTARGET}" |
135 |
+ |
136 |
is_cross && myconf+=( |
137 |
--with-sysroot="${sysroot}" |
138 |
--includedir="${sysroot}/usr/include" |
139 |
@@ -176,8 +182,9 @@ src_configure() { |
140 |
$(use_with xxhash) |
141 |
$(use_with guile) |
142 |
) |
143 |
+ |
144 |
if use sparc-solaris || use x86-solaris ; then |
145 |
- # disable largefile support |
146 |
+ # Disable largefile support |
147 |
# https://sourceware.org/ml/gdb-patches/2014-12/msg00058.html |
148 |
myconf+=( --disable-largefile ) |
149 |
fi |
150 |
@@ -190,6 +197,7 @@ src_configure() { |
151 |
|
152 |
src_install() { |
153 |
default |
154 |
+ |
155 |
find "${ED}"/usr -name libiberty.a -delete || die |
156 |
|
157 |
# Delete translations that conflict with binutils-libs. #528088 |
158 |
@@ -211,6 +219,7 @@ src_install() { |
159 |
done |
160 |
return 0 |
161 |
fi |
162 |
+ |
163 |
# Install it by hand for now: |
164 |
# https://sourceware.org/ml/gdb-patches/2011-12/msg00915.html |
165 |
# Only install if it exists due to the twisted behavior (see |
166 |
@@ -222,6 +231,7 @@ src_install() { |
167 |
gdb/NEWS gdb/ChangeLog gdb/PROBLEMS |
168 |
docinto sim |
169 |
dodoc sim/{ChangeLog,MAINTAINERS,README-HACKING} |
170 |
+ |
171 |
if use server ; then |
172 |
docinto gdbserver |
173 |
dodoc gdbserver/{ChangeLog,README} |
174 |
@@ -245,7 +255,7 @@ src_install() { |
175 |
} |
176 |
|
177 |
pkg_postinst() { |
178 |
- # portage sucks and doesnt unmerge files in /etc |
179 |
+ # Portage doesn't unmerge files in /etc |
180 |
rm -vf "${EROOT}"/etc/skel/.gdbinit |
181 |
|
182 |
if use prefix && [[ ${CHOST} == *-darwin* ]] ; then |
183 |
|
184 |
diff --git a/sys-devel/gdb/gdb-9999.ebuild b/sys-devel/gdb/gdb-9999.ebuild |
185 |
index fde1ad99243..8b1a81f909e 100644 |
186 |
--- a/sys-devel/gdb/gdb-9999.ebuild |
187 |
+++ b/sys-devel/gdb/gdb-9999.ebuild |
188 |
@@ -2,34 +2,36 @@ |
189 |
# Distributed under the terms of the GNU General Public License v2 |
190 |
|
191 |
EAPI=7 |
192 |
-PYTHON_COMPAT=( python3_{7,8,9,10} ) |
193 |
|
194 |
-inherit eutils flag-o-matic python-single-r1 toolchain-funcs |
195 |
+PYTHON_COMPAT=( python3_{8,9,10} ) |
196 |
+inherit flag-o-matic python-single-r1 strip-linguas toolchain-funcs |
197 |
|
198 |
export CTARGET=${CTARGET:-${CHOST}} |
199 |
+ |
200 |
if [[ ${CTARGET} == ${CHOST} ]] ; then |
201 |
if [[ ${CATEGORY} == cross-* ]] ; then |
202 |
export CTARGET=${CATEGORY#cross-} |
203 |
fi |
204 |
fi |
205 |
+ |
206 |
is_cross() { [[ ${CHOST} != ${CTARGET} ]] ; } |
207 |
|
208 |
case ${PV} in |
209 |
-9999*) |
210 |
- # live git tree |
211 |
- EGIT_REPO_URI="https://sourceware.org/git/binutils-gdb.git" |
212 |
- inherit git-r3 |
213 |
- SRC_URI="" |
214 |
- ;; |
215 |
-*.*.50.2???????) |
216 |
- # weekly snapshots |
217 |
- SRC_URI="ftp://sourceware.org/pub/gdb/snapshots/current/gdb-weekly-${PV}.tar.xz" |
218 |
- ;; |
219 |
-*) |
220 |
- # Normal upstream release |
221 |
- SRC_URI="mirror://gnu/gdb/${P}.tar.xz |
222 |
- ftp://sourceware.org/pub/gdb/releases/${P}.tar.xz" |
223 |
- ;; |
224 |
+ 9999*) |
225 |
+ # live git tree |
226 |
+ EGIT_REPO_URI="https://sourceware.org/git/binutils-gdb.git" |
227 |
+ inherit git-r3 |
228 |
+ SRC_URI="" |
229 |
+ ;; |
230 |
+ *.*.50.2???????) |
231 |
+ # weekly snapshots |
232 |
+ SRC_URI="ftp://sourceware.org/pub/gdb/snapshots/current/gdb-weekly-${PV}.tar.xz" |
233 |
+ ;; |
234 |
+ *) |
235 |
+ # Normal upstream release |
236 |
+ SRC_URI="mirror://gnu/gdb/${P}.tar.xz |
237 |
+ ftp://sourceware.org/pub/gdb/releases/${P}.tar.xz" |
238 |
+ ;; |
239 |
esac |
240 |
|
241 |
PATCH_VER="" |
242 |
@@ -43,23 +45,23 @@ SRC_URI="${SRC_URI} |
243 |
|
244 |
LICENSE="GPL-2 LGPL-2" |
245 |
SLOT="0" |
246 |
+ |
247 |
if [[ ${PV} != 9999* ]] ; then |
248 |
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" |
249 |
fi |
250 |
+ |
251 |
IUSE="cet guile lzma multitarget nls +python +server source-highlight test vanilla xml xxhash" |
252 |
-REQUIRED_USE=" |
253 |
- python? ( ${PYTHON_REQUIRED_USE} ) |
254 |
-" |
255 |
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" |
256 |
|
257 |
# ia64 kernel crashes when gdb testsuite is running |
258 |
RESTRICT=" |
259 |
ia64? ( test ) |
260 |
- |
261 |
!test? ( test ) |
262 |
" |
263 |
|
264 |
RDEPEND=" |
265 |
dev-libs/mpfr:0= |
266 |
+ dev-libs/gmp:= |
267 |
>=sys-libs/ncurses-5.2-r2:0= |
268 |
>=sys-libs/readline-7:0= |
269 |
sys-libs/zlib |
270 |
@@ -105,11 +107,13 @@ src_prepare() { |
271 |
|
272 |
gdb_branding() { |
273 |
printf "Gentoo ${PV} " |
274 |
+ |
275 |
if ! use vanilla && [[ -n ${PATCH_VER} ]] ; then |
276 |
printf "p${PATCH_VER}" |
277 |
else |
278 |
printf "vanilla" |
279 |
fi |
280 |
+ |
281 |
[[ -n ${EGIT_COMMIT} ]] && printf " ${EGIT_COMMIT}" |
282 |
} |
283 |
|
284 |
@@ -137,7 +141,9 @@ src_configure() { |
285 |
# But the check does not quite work on i686: bug #760926. |
286 |
$(use_enable cet) |
287 |
) |
288 |
+ |
289 |
local sysroot="${EPREFIX}/usr/${CTARGET}" |
290 |
+ |
291 |
is_cross && myconf+=( |
292 |
--with-sysroot="${sysroot}" |
293 |
--includedir="${sysroot}/usr/include" |
294 |
@@ -176,8 +182,9 @@ src_configure() { |
295 |
$(use_with xxhash) |
296 |
$(use_with guile) |
297 |
) |
298 |
+ |
299 |
if use sparc-solaris || use x86-solaris ; then |
300 |
- # disable largefile support |
301 |
+ # Disable largefile support |
302 |
# https://sourceware.org/ml/gdb-patches/2014-12/msg00058.html |
303 |
myconf+=( --disable-largefile ) |
304 |
fi |
305 |
@@ -190,6 +197,7 @@ src_configure() { |
306 |
|
307 |
src_install() { |
308 |
default |
309 |
+ |
310 |
find "${ED}"/usr -name libiberty.a -delete || die |
311 |
|
312 |
# Delete translations that conflict with binutils-libs. #528088 |
313 |
@@ -211,6 +219,7 @@ src_install() { |
314 |
done |
315 |
return 0 |
316 |
fi |
317 |
+ |
318 |
# Install it by hand for now: |
319 |
# https://sourceware.org/ml/gdb-patches/2011-12/msg00915.html |
320 |
# Only install if it exists due to the twisted behavior (see |
321 |
@@ -222,6 +231,7 @@ src_install() { |
322 |
gdb/NEWS gdb/ChangeLog gdb/PROBLEMS |
323 |
docinto sim |
324 |
dodoc sim/{ChangeLog,MAINTAINERS,README-HACKING} |
325 |
+ |
326 |
if use server ; then |
327 |
docinto gdbserver |
328 |
dodoc gdbserver/{ChangeLog,README} |
329 |
@@ -245,7 +255,7 @@ src_install() { |
330 |
} |
331 |
|
332 |
pkg_postinst() { |
333 |
- # portage sucks and doesnt unmerge files in /etc |
334 |
+ # Portage doesn't unmerge files in /etc |
335 |
rm -vf "${EROOT}"/etc/skel/.gdbinit |
336 |
|
337 |
if use prefix && [[ ${CHOST} == *-darwin* ]] ; then |