gdb: clean up templates #29382

unspecd · 2021-03-10T17:12:30Z

Improved consistency across templates.

Also:

Fixed post_install in srcpkgs/avr-gdb.
Added build option for Guile.
Updated avr-gdb, cross-arm-none-eabi-gdb to 10.2.

General

This is a new package and it conforms to the quality requirements

Have the results of the proposed changes been tested?

I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
I generally don't use the affected packages but briefly tested this PR

Does it build and run successfully?

(Please choose at least one native build and, if supported, at least one cross build. More are better.)

srcpkgs/gdb/template

srcpkgs/avr-gdb/template

srcpkgs/cross-arm-none-eabi-gdb/template

srcpkgs/gdb/template

ericonr · 2021-04-14T05:07:34Z

srcpkgs/avr-gdb/template

 replaces="cross-avr-gdb>=0"

 if [ "${CROSS_BUILD}" ]; then
 	# Make python3.x detection work in cross builds
 	CFLAGS="-I${XBPS_CROSS_BASE}/${py3_inc}"
 	CXXFLAGS="-I${XBPS_CROSS_BASE}/${py3_inc}"
+	makedepends+=" libatomic_ops-devel" # guile


makedepends should be unconditional (regarding cross builds), most of the time. Are you sure this isn't because you were cross building for a target like armv6l, which fits under our XBPS_TARGET_NO_ATOMIC8 conditional?

Anyway, if this is guile related it should also be hidden behind vopt_if

Here is what I get without libatomic_ops-devel:

$ ./xbps-src -a aarch64-musl -o guile pkg gdb … configure: error: in `/builddir/gdb-10.1/gdb': configure: error: linking guile version guile-2.2 test program failed See `config.log' for more details make[1]: *** [Makefile:9734: configure-gdb] Error 1 make[1]: *** Waiting for unfinished jobs.... $ grep -C1 'cannot find -latomic_ops' masterdir/builddir/gdb-10.1/gdb/config.log configure:11330: aarch64-linux-musl-gcc -o conftest -fstack-clash-protection -D_FORTIFY_SOURCE=2 -O2 -pipe -march=armv8-a -I/usr/aarch64-linux-musl/usr/include/python3.9 -g -I/usr/aarch64-linux-musl/usr/include -I/usr/aarch64-linux-musl/usr/include -I/usr/aarch64-linux-musl/usr/include/guile/2.2 -Wl,-z,relro -Wl,-z,now -Wl,--as-needed -L/usr/aarch64-linux-musl/usr/lib conftest.c -lncursesw -lm -lguile-2.2 -latomic_ops -lgc >&5 /usr/lib/gcc/aarch64-linux-musl/10.2.1/../../../../aarch64-linux-musl/bin/ld: cannot find -latomic_ops collect2: error: ld returned 1 exit status -- configure:11339: aarch64-linux-musl-gcc -o conftest -fstack-clash-protection -D_FORTIFY_SOURCE=2 -O2 -pipe -march=armv8-a -I/usr/aarch64-linux-musl/usr/include/python3.9 -g -I/usr/aarch64-linux-musl/usr/include -I/usr/aarch64-linux-musl/usr/include -I/usr/aarch64-linux-musl/usr/include/guile/2.2 -Wl,-z,relro -Wl,-z,now -Wl,--as-needed -L/usr/aarch64-linux-musl/usr/lib conftest.c -lncursesw -lm -lguile-2.2 -latomic_ops -lgc >&5 /usr/lib/gcc/aarch64-linux-musl/10.2.1/../../../../aarch64-linux-musl/bin/ld: cannot find -latomic_ops collect2: error: ld returned 1 exit status

So, pkgconfig on armv6l says:

Libs: -L${libdir} -lguile-2.2 -latomic_ops -lgc

I'd suggest adding libatomic_ops-devel as a dependency of guile-devel instead :)

Do I understand correctly that you suggest the following patch:

File: srcpkgs/guile/template

@@ -40,7 +40,7 @@ libguile_package() { guile-devel_package() { short_desc+=" - development files" - depends="gmp-devel gc-devel guile>=${version}_${revision}" + depends="gmp-devel gc-devel guile>=${version}_${revision} libatomic_ops-devel" pkg_install() { vmove usr/bin/guile-config vmove usr/include

Oh, no, there is the same bug as in #27320.

https://github.com/void-linux/void-packages/pull/29382/checks?check_run_id=2478214035

… FAIL: numbers.test: Number-theoretic division: euclidean/: mixed types: (130.0 10/7) FAIL: numbers.test: Number-theoretic division: euclidean/: mixed types: (130.0 -10/7) FAIL: numbers.test: Number-theoretic division: floor/: mixed types: (130.0 10/7) FAIL: numbers.test: Number-theoretic division: floor/: mixed types: (-130.0 -10/7) FAIL: numbers.test: Number-theoretic division: ceiling/: mixed types: (130.0 -10/7) FAIL: numbers.test: Number-theoretic division: ceiling/: mixed types: (-130.0 10/7) FAIL: numbers.test: Number-theoretic division: truncate/: mixed types: (130.0 10/7) FAIL: numbers.test: Number-theoretic division: truncate/: mixed types: (130.0 -10/7) FAIL: numbers.test: Number-theoretic division: truncate/: mixed types: (-130.0 10/7) FAIL: numbers.test: Number-theoretic division: truncate/: mixed types: (-130.0 -10/7) …

srcpkgs/avr-gdb/template

srcpkgs/cross-arm-none-eabi-gdb/template

srcpkgs/avr-gdb/template

srcpkgs/cross-arm-none-eabi-gdb/template

srcpkgs/gdb/patches/gdb-mips-linux-nat.patch

srcpkgs/guile/template

ericonr · 2021-05-04T11:47:12Z

Missing a revbump for gdb itself.

ericonr

Seems to be working fine, thanks! Will wait if anyone else has reviews.

ericonr

The cross gdbs are missing gdbserver now, so add configure arg --enable-gdbserver.

ericonr · 2021-05-04T20:05:59Z

srcpkgs/cross-arm-none-eabi-gdb/template

- $(vopt_if python 'python3-devel gettext-devel')"
-short_desc="GNU Debugger"
+configure_args="--target=arm-none-eabi --disable-werror --disable-nls --with-system-readline
+ --with-system-gdbinit=/etc/gdb/gdbinit --with-system-zlib --without-isl


Why does avr-gdb not have without-isl?

I honestly don't know. I am not sure why this library is needed here.

The cross gdbs are missing gdbserver now

With --enable-gdbserver:

$ ./xbps-src pkg avr-gdb ... /builddir/gdb-10.2/gdbserver/remote-utils.cc:1235: undefined reference to `using_threads' /usr/bin/ld: server.o: in function `main': /builddir/gdb-10.2/gdbserver/server.cc:3826: undefined reference to `initialize_low()' ...

I don't think that gdbserver makes sense for avr and arm-none-eabi.

Argh, sorry. My mind was in previous revisions of this PR.

Indeed, neither of those packages have gdbserver currently.

ericonr · 2021-05-04T20:07:29Z

srcpkgs/gdb/template

-	export gl_cv_func_gettimeofday_clobber=no
-	export gl_cv_func_working_strerror=yes
-	export gl_cv_func_strerror_0_works=yes


In the commit message please mention that you could eliminate the gnulib env var overrides because they now guess correctly that musl behaves.

Piraty · 2021-05-05T06:55:51Z

srcpkgs/gdb/template

- $(vopt_if debuginfod elfutils-devel)"
+hostmakedepends="pkg-config texinfo $(vopt_if python python3-devel) $(vopt_if guile guile)"
+makedepends="expat-devel ncurses-devel readline-devel zlib-devel $(vopt_if guile guile-devel)
+ $(vopt_if python 'python3-devel gettext-devel') $(vopt_if debuginfod elfutils-devel)"


i see you sorted the deps, so please sort the build options as well while at it

Also added build option for Guile. gnulib now detects musl correctly, so we don't need the overrides. Co-authored-by: Evgeny Ermakov <evgeny.v.ermakov@gmail.com>

Also added build option for Guile. Co-authored-by: Evgeny Ermakov <evgeny.v.ermakov@gmail.com>

Co-authored-by: Evgeny Ermakov <evgeny.v.ermakov@gmail.com>

ericonr · 2021-10-03T08:17:48Z

I made a bunch of changes and update stuff. Thanks!

unspecd marked this pull request as ready for review March 10, 2021 17:37

sgn reviewed Mar 11, 2021

View reviewed changes

srcpkgs/gdb/template Show resolved Hide resolved

unspecd force-pushed the gdb branch from aaad379 to 23be88e Compare March 11, 2021 05:45

unspecd requested a review from sgn March 12, 2021 10:23

unspecd force-pushed the gdb branch 2 times, most recently from 4696799 to 90d8ade Compare March 18, 2021 09:46

unspecd force-pushed the gdb branch from 90d8ade to 6305813 Compare March 28, 2021 00:46

ericonr reviewed Apr 4, 2021

View reviewed changes

srcpkgs/avr-gdb/template Outdated Show resolved Hide resolved

ericonr reviewed Apr 11, 2021

View reviewed changes

unspecd force-pushed the gdb branch 2 times, most recently from 9c9c6c1 to 0237a33 Compare April 14, 2021 04:04

ericonr reviewed Apr 14, 2021

View reviewed changes

unspecd force-pushed the gdb branch 2 times, most recently from 4355408 to 0d7306c Compare April 15, 2021 02:45

unspecd force-pushed the gdb branch 3 times, most recently from fe9b63e to 01bae33 Compare April 30, 2021 18:35

ericonr reviewed Apr 30, 2021

View reviewed changes

srcpkgs/guile/template Show resolved Hide resolved

unspecd force-pushed the gdb branch from 01bae33 to 5876a5d Compare April 30, 2021 19:47

unspecd force-pushed the gdb branch from 5876a5d to 405eb82 Compare May 4, 2021 11:52

ericonr approved these changes May 4, 2021

View reviewed changes

ericonr requested changes May 4, 2021

View reviewed changes

Piraty reviewed May 5, 2021

View reviewed changes

unspecd and others added 4 commits October 3, 2021 03:39

guile: devel needs dependency on libatomic_ops-devel on some targets

890ef56

gdb: update to 11.1 and clean up.

8965a4a

Also added build option for Guile. gnulib now detects musl correctly, so we don't need the overrides. Co-authored-by: Evgeny Ermakov <evgeny.v.ermakov@gmail.com>

avr-gdb: update to 11.1 and clean up.

a499326

Also added build option for Guile. Co-authored-by: Evgeny Ermakov <evgeny.v.ermakov@gmail.com>

cross-arm-none-eabi-gdb: update to 11.1 and clean up.

57913bf

Co-authored-by: Evgeny Ermakov <evgeny.v.ermakov@gmail.com>

ericonr force-pushed the gdb branch from 405eb82 to 57913bf Compare October 3, 2021 08:16

ericonr merged commit beb3d45 into void-linux:master Oct 3, 2021

ericonr mentioned this pull request Oct 3, 2021

Update GDBs to 11.1 #32949

Closed

3 tasks

unspecd deleted the gdb branch October 3, 2021 13:36

github-actions bot locked as resolved and limited conversation to collaborators Jan 1, 2022

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

gdb: clean up templates #29382

gdb: clean up templates #29382

unspecd commented Mar 10, 2021 •

edited

ericonr Apr 14, 2021 •

edited

unspecd Apr 14, 2021

ericonr Apr 14, 2021

ericonr Apr 26, 2021

unspecd Apr 30, 2021

ericonr Apr 30, 2021

unspecd Apr 30, 2021

ericonr commented May 4, 2021

ericonr left a comment

ericonr left a comment

ericonr May 4, 2021

unspecd May 6, 2021

unspecd May 6, 2021 •

edited

ericonr May 6, 2021

ericonr May 4, 2021

Piraty May 5, 2021

ericonr commented Oct 3, 2021

gdb: clean up templates #29382

gdb: clean up templates #29382

Conversation

unspecd commented Mar 10, 2021 • edited

General

Have the results of the proposed changes been tested?

Does it build and run successfully?

ericonr Apr 14, 2021 • edited

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

ericonr commented May 4, 2021

ericonr left a comment

Choose a reason for hiding this comment

ericonr left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

unspecd May 6, 2021 • edited

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

ericonr commented Oct 3, 2021

unspecd commented Mar 10, 2021 •

edited

ericonr Apr 14, 2021 •

edited

unspecd May 6, 2021 •

edited