* [PR PATCH] Update GDBs to 11.1
@ 2021-09-13 14:52 ericonr
2021-10-03 6:09 ` [PR PATCH] [Updated] " ericonr
` (3 more replies)
0 siblings, 4 replies; 5+ messages in thread
From: ericonr @ 2021-09-13 14:52 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1605 bytes --]
There is a new pull request by ericonr against master on the void-packages repository
https://github.com/ericonr/void-packages gdb
https://github.com/void-linux/void-packages/pull/32949
Update GDBs to 11.1
<!-- Mark items with [x] where applicable -->
#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#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
<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!--
#### Does it build and run successfully?
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
- [ ] aarch64-musl
- [ ] armv7l
- [ ] armv6l-musl
-->
Testing still in progress.
A patch file from https://github.com/void-linux/void-packages/pull/32949.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-gdb-32949.patch --]
[-- Type: text/x-diff, Size: 4687 bytes --]
From a9674cf74f17fbfceb70a6ed67d7878ca1e6444a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
Date: Mon, 13 Sep 2021 11:50:02 -0300
Subject: [PATCH 1/3] gdb: update to 11.1.
---
srcpkgs/gdb/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/gdb/template b/srcpkgs/gdb/template
index 56c0e01630b5..48bf151cd78b 100644
--- a/srcpkgs/gdb/template
+++ b/srcpkgs/gdb/template
@@ -1,6 +1,6 @@
# Template file for 'gdb'
pkgname=gdb
-version=10.2
+version=11.1
revision=1
build_style=gnu-configure
pycompile_dirs="/usr/share/gdb/python"
@@ -11,7 +11,7 @@ configure_args="--disable-werror --disable-nls --with-system-readline
$(vopt_if python --with-python=/usr/bin/python3)
$(vopt_with debuginfod)"
hostmakedepends="texinfo perl pkg-config $(vopt_if python python3-devel)"
-makedepends="ncurses-devel zlib-devel readline-devel expat-devel
+makedepends="ncurses-devel zlib-devel readline-devel expat-devel gmp-devel
$(vopt_if python 'python3-devel gettext-devel')
$(vopt_if debuginfod elfutils-devel)"
short_desc="GNU Debugger"
@@ -19,7 +19,7 @@ maintainer="Anthony Iliopoulos <ailiop@altatus.com>"
license="GPL-3.0-or-later"
homepage="https://www.gnu.org/software/gdb/"
distfiles="${GNU_SITE}/${pkgname}/${pkgname}-${version}.tar.xz"
-checksum=aaa1223d534c9b700a8bec952d9748ee1977513f178727e1bee520ee000b4f29
+checksum=cccfcc407b20d343fb320d4a9a2110776dd3165118ffd41f4b1b162340333f94
python_version=3
if [ "${CROSS_BUILD}" ]; then
From 929a55451f583b6a03b3c9600ba98d2c03a5e632 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
Date: Mon, 13 Sep 2021 11:50:31 -0300
Subject: [PATCH 2/3] avr-gdb: update to 11.1.
---
srcpkgs/avr-gdb/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/avr-gdb/template b/srcpkgs/avr-gdb/template
index 73d9f9ac7456..420bf8340131 100644
--- a/srcpkgs/avr-gdb/template
+++ b/srcpkgs/avr-gdb/template
@@ -1,6 +1,6 @@
# Template file for 'avr-gdb'
pkgname=avr-gdb
-version=10.1
+version=11.1
revision=1
wrksrc=gdb-${version}
build_style=gnu-configure
@@ -16,7 +16,7 @@ configure_args="\
$(vopt_if static 'CFLAGS=-static CXXFLAGS=-static LDFLAGS=-static') \
$(vopt_if python --with-python=/usr/bin/python3)"
hostmakedepends="texinfo perl $(vopt_if python python3-devel)"
-makedepends="ncurses-devel zlib-devel readline-devel expat-devel
+makedepends="ncurses-devel zlib-devel readline-devel expat-devel gmp-devel
$(vopt_if python 'python3-devel gettext-devel')"
depends=gdb
short_desc="GNU Debugger for AVR"
@@ -24,7 +24,7 @@ maintainer="Artur Sinila <opensource@logarithmus.dev>"
license="GPL-3.0-or-later"
homepage="https://www.gnu.org/software/gdb/"
distfiles="${GNU_SITE}/gdb/gdb-${version}.tar.xz"
-checksum=f82f1eceeec14a3afa2de8d9b0d3c91d5a3820e23e0a01bbb70ef9f0276b62c0
+checksum=cccfcc407b20d343fb320d4a9a2110776dd3165118ffd41f4b1b162340333f94
python_version=3
replaces="cross-avr-gdb>=0"
From e0a033b999e443d6cd3c41d1aa69be5b23400a9a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
Date: Mon, 13 Sep 2021 11:51:30 -0300
Subject: [PATCH 3/3] cross-arm-none-eabi-gdb: update to 11.1.
---
srcpkgs/cross-arm-none-eabi-gdb/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/cross-arm-none-eabi-gdb/template b/srcpkgs/cross-arm-none-eabi-gdb/template
index ac8e6837d72c..407d13253527 100644
--- a/srcpkgs/cross-arm-none-eabi-gdb/template
+++ b/srcpkgs/cross-arm-none-eabi-gdb/template
@@ -2,7 +2,7 @@
_triplet=arm-none-eabi
_pkgname=gdb
pkgname=cross-${_triplet}-${_pkgname}
-version=8.3
+version=11.1
revision=1
wrksrc="${_pkgname}-${version}"
build_style=gnu-configure
@@ -24,7 +24,7 @@ configure_args="
$(vopt_with python)
"
hostmakedepends="autoconf automake bison flex pkg-config texinfo"
-makedepends="babeltrace-devel expat-devel mpfr-devel ncurses-devel
+makedepends="babeltrace-devel expat-devel mpfr-devel ncurses-devel gmp-devel
readline-devel zlib-devel $(vopt_if guile guile-devel)
$(vopt_if python 'python3-devel gettext-devel')"
short_desc="GNU Debugger"
@@ -32,7 +32,7 @@ maintainer="Ivan Sokolov <ivan-p-sokolov@ya.ru>"
license="GPL-3.0-or-later"
homepage="https://www.gnu.org/software/${_pkgname}"
distfiles="${GNU_SITE}/${_pkgname}/${_pkgname}-${version}.tar.xz"
-checksum=802f7ee309dcc547d65a68d61ebd6526762d26c3051f52caebe2189ac1ffd72e
+checksum=cccfcc407b20d343fb320d4a9a2110776dd3165118ffd41f4b1b162340333f94
python_version=2 #unverified
build_options="guile python"
# don't enable guile and python interfaces until they are moved into
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PR PATCH] [Updated] Update GDBs to 11.1
2021-09-13 14:52 [PR PATCH] Update GDBs to 11.1 ericonr
@ 2021-10-03 6:09 ` ericonr
2021-10-03 6:27 ` ericonr
` (2 subsequent siblings)
3 siblings, 0 replies; 5+ messages in thread
From: ericonr @ 2021-10-03 6:09 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1610 bytes --]
There is an updated pull request by ericonr against master on the void-packages repository
https://github.com/ericonr/void-packages gdb
https://github.com/void-linux/void-packages/pull/32949
Update GDBs to 11.1
<!-- Mark items with [x] where applicable -->
#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#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
<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!--
#### Does it build and run successfully?
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
- [ ] aarch64-musl
- [ ] armv7l
- [ ] armv6l-musl
-->
Testing still in progress.
A patch file from https://github.com/void-linux/void-packages/pull/32949.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-gdb-32949.patch --]
[-- Type: text/x-diff, Size: 15151 bytes --]
From 0a3a26593d0f70437cbb86f9e676681e70e6db3d Mon Sep 17 00:00:00 2001
From: Evgeny Ermakov <evgeny.v.ermakov@gmail.com>
Date: Sat, 1 May 2021 05:21:55 +1100
Subject: [PATCH 1/4] guile: devel needs dependency on libatomic_ops-devel on
some targets
---
srcpkgs/guile/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/guile/template b/srcpkgs/guile/template
index f9ce43c06709..f0f917b1c4ee 100644
--- a/srcpkgs/guile/template
+++ b/srcpkgs/guile/template
@@ -1,13 +1,13 @@
# Template file for 'guile'
pkgname=guile
version=2.2.7
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--disable-static --disable-error-on-warning"
hostmakedepends="pkg-config texinfo"
makedepends="gc-devel gmp-devel libatomic_ops-devel libffi-devel libltdl-devel
libunistring-devel readline-devel"
-short_desc="A portable, embeddable Scheme implementation written in C"
+short_desc="Portable, embeddable Scheme implementation written in C"
maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-3.0-or-later, LGPL-3.0-or-later"
homepage="http://www.gnu.org/software/guile"
@@ -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
From 0bfdf7190f0544d5be90e79ac2575bfb02569576 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
Date: Mon, 13 Sep 2021 11:50:02 -0300
Subject: [PATCH 2/4] gdb: update to 11.1 and clean up.
Also added build option for Guile.
Co-authored-by: Evgeny Ermakov <evgeny.v.ermakov@gmail.com>
---
srcpkgs/gdb-common | 1 +
srcpkgs/gdb/patches/gdb-mips-linux-nat.patch | 11 ++++
srcpkgs/gdb/template | 65 ++++++++++----------
3 files changed, 43 insertions(+), 34 deletions(-)
create mode 120000 srcpkgs/gdb-common
create mode 100644 srcpkgs/gdb/patches/gdb-mips-linux-nat.patch
diff --git a/srcpkgs/gdb-common b/srcpkgs/gdb-common
new file mode 120000
index 000000000000..f3e03e3f1a44
--- /dev/null
+++ b/srcpkgs/gdb-common
@@ -0,0 +1 @@
+gdb
\ No newline at end of file
diff --git a/srcpkgs/gdb/patches/gdb-mips-linux-nat.patch b/srcpkgs/gdb/patches/gdb-mips-linux-nat.patch
new file mode 100644
index 000000000000..ec4e9c2666f5
--- /dev/null
+++ b/srcpkgs/gdb/patches/gdb-mips-linux-nat.patch
@@ -0,0 +1,11 @@
+--- a/gdb/mips-linux-nat.c
++++ b/gdb/mips-linux-nat.c
+@@ -31,7 +31,7 @@
+ #include "gdb_proc_service.h"
+ #include "gregset.h"
+
+-#include <sgidefs.h>
++#include <asm/sgidefs.h>
+ #include "nat/gdb_ptrace.h"
+ #include <asm/ptrace.h>
+ #include "inf-ptrace.h"
diff --git a/srcpkgs/gdb/template b/srcpkgs/gdb/template
index 56c0e01630b5..f5b481c49eed 100644
--- a/srcpkgs/gdb/template
+++ b/srcpkgs/gdb/template
@@ -1,6 +1,6 @@
# Template file for 'gdb'
pkgname=gdb
-version=10.2
+version=11.1
revision=1
build_style=gnu-configure
pycompile_dirs="/usr/share/gdb/python"
@@ -8,19 +8,30 @@ configure_args="--disable-werror --disable-nls --with-system-readline
--with-system-gdbinit=/etc/gdb/gdbinit --with-system-zlib
$(vopt_enable gdbserver) $(vopt_if multiarch --enable-targets=all)
$(vopt_if static 'CFLAGS=-static CXXFLAGS=-static LDFLAGS=-static')
- $(vopt_if python --with-python=/usr/bin/python3)
+ $(vopt_with guile) $(vopt_if python --with-python=/usr/bin/python3)
$(vopt_with debuginfod)"
-hostmakedepends="texinfo perl pkg-config $(vopt_if python python3-devel)"
-makedepends="ncurses-devel zlib-devel readline-devel expat-devel
- $(vopt_if python 'python3-devel gettext-devel')
+hostmakedepends="pkg-config texinfo $(vopt_if python python3-devel) $(vopt_if guile guile)"
+makedepends="expat-devel ncurses-devel readline-devel zlib-devel gmp-devel
+ $(vopt_if guile guile-devel) $(vopt_if python 'python3-devel gettext-devel')
$(vopt_if debuginfod elfutils-devel)"
+depends="gdb-common>=${version}_${revision}"
+checkdepends="dejagnu"
short_desc="GNU Debugger"
maintainer="Anthony Iliopoulos <ailiop@altatus.com>"
license="GPL-3.0-or-later"
-homepage="https://www.gnu.org/software/gdb/"
-distfiles="${GNU_SITE}/${pkgname}/${pkgname}-${version}.tar.xz"
-checksum=aaa1223d534c9b700a8bec952d9748ee1977513f178727e1bee520ee000b4f29
+homepage="https://www.gnu.org/software/gdb"
+distfiles="${GNU_SITE}/gdb/gdb-${version}.tar.xz"
+checksum=cccfcc407b20d343fb320d4a9a2110776dd3165118ffd41f4b1b162340333f94
+make_check=extended # Tests take too long, not all of them pass.
python_version=3
+patch_args="-Np1"
+ignore_elf_files="
+ /usr/share/gdb/guile/gdb/support.go
+ /usr/share/gdb/guile/gdb/experimental.go
+ /usr/share/gdb/guile/gdb/iterator.go
+ /usr/share/gdb/guile/gdb/types.go
+ /usr/share/gdb/guile/gdb/printing.go
+ /usr/share/gdb/guile/gdb.go"
if [ "${CROSS_BUILD}" ]; then
# Make python3.x detection work in cross builds
@@ -28,36 +39,22 @@ if [ "${CROSS_BUILD}" ]; then
CXXFLAGS="-I${XBPS_CROSS_BASE}/${py3_inc}"
fi
-build_options="gdbserver multiarch static python debuginfod"
+build_options="debuginfod gdbserver guile multiarch python static"
+desc_option_gdbserver="Enable support for building GDB server"
desc_option_debuginfod="Enable support for libdebuginfod"
desc_option_multiarch="Enable support for all architectures"
-desc_option_gdbserver="Enable support for building GDB server"
-build_options_default="gdbserver python debuginfod"
+build_options_default="debuginfod gdbserver python"
vopt_conflict gdbserver static
vopt_conflict debuginfod static
-post_extract() {
- vsed -i 's,sgidefs.h,asm/sgidefs.h,' gdb/mips-linux-nat.c
- mkdir -p build
-}
-do_configure() {
- cd build
- ../configure ${configure_args/with-sysroot/with-build-sysroot} \
- CFLAGS_FOR_BUILD="${CFLAGS_FOR_BUILD} -fcommon"
- export gl_cv_func_gettimeofday_clobber=no
- export gl_cv_func_working_strerror=yes
- export gl_cv_func_strerror_0_works=yes
-}
-do_build() {
- cd build
- make ${makejobs} all
-}
-do_install() {
- cd build
- make DESTDIR=${DESTDIR} ${makejobs} install
+post_install() {
# resolve conflicts with binutils
- rm -rf ${DESTDIR}/usr/{include,lib,lib64}
- for f in bfd configure standards; do
- rm -f ${DESTDIR}/usr/share/info/${f}.info*
- done
+ rm -r ${DESTDIR}/usr/{include,lib,share/info/bfd.info*}
+}
+
+gdb-common_package() {
+ short_desc+=" - common files"
+ pkg_install() {
+ vmove usr/share
+ }
}
From fc24bc75ac1f3832e2d1347c038a922a4a6fc94e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
Date: Mon, 13 Sep 2021 11:50:31 -0300
Subject: [PATCH 3/4] avr-gdb: update to 11.1 and clean up.
Also added build option for Guile.
Co-authored-by: Evgeny Ermakov <evgeny.v.ermakov@gmail.com>
---
.../avr-gdb/patches/gdb-mips-linux-nat.patch | 11 +++
srcpkgs/avr-gdb/template | 76 +++++--------------
2 files changed, 28 insertions(+), 59 deletions(-)
create mode 100644 srcpkgs/avr-gdb/patches/gdb-mips-linux-nat.patch
diff --git a/srcpkgs/avr-gdb/patches/gdb-mips-linux-nat.patch b/srcpkgs/avr-gdb/patches/gdb-mips-linux-nat.patch
new file mode 100644
index 000000000000..ec4e9c2666f5
--- /dev/null
+++ b/srcpkgs/avr-gdb/patches/gdb-mips-linux-nat.patch
@@ -0,0 +1,11 @@
+--- a/gdb/mips-linux-nat.c
++++ b/gdb/mips-linux-nat.c
+@@ -31,7 +31,7 @@
+ #include "gdb_proc_service.h"
+ #include "gregset.h"
+
+-#include <sgidefs.h>
++#include <asm/sgidefs.h>
+ #include "nat/gdb_ptrace.h"
+ #include <asm/ptrace.h>
+ #include "inf-ptrace.h"
diff --git a/srcpkgs/avr-gdb/template b/srcpkgs/avr-gdb/template
index 73d9f9ac7456..fb73e18a3a77 100644
--- a/srcpkgs/avr-gdb/template
+++ b/srcpkgs/avr-gdb/template
@@ -1,79 +1,37 @@
# Template file for 'avr-gdb'
pkgname=avr-gdb
-version=10.1
+version=11.1
revision=1
wrksrc=gdb-${version}
build_style=gnu-configure
-pycompile_dirs="/usr/share/gdb/python"
-configure_args="\
- --target=avr \
- --program-prefix=avr- \
- --disable-werror \
- --disable-nls \
- --with-system-readline \
- --with-system-gdbinit=/etc/gdb/gdbinit \
- --with-system-zlib $(vopt_enable gdbserver) \
- $(vopt_if static 'CFLAGS=-static CXXFLAGS=-static LDFLAGS=-static') \
- $(vopt_if python --with-python=/usr/bin/python3)"
-hostmakedepends="texinfo perl $(vopt_if python python3-devel)"
-makedepends="ncurses-devel zlib-devel readline-devel expat-devel
- $(vopt_if python 'python3-devel gettext-devel')"
-depends=gdb
+configure_args="--target=avr --disable-werror --disable-nls --with-system-readline
+ --with-system-gdbinit=/etc/gdb/gdbinit --with-system-zlib
+ $(vopt_with guile) $(vopt_if python --with-python=/usr/bin/python3)"
+hostmakedepends="pkg-config texinfo $(vopt_if python python3-devel) $(vopt_if guile guile)"
+makedepends="expat-devel ncurses-devel readline-devel zlib-devel gmp-devel
+ $(vopt_if guile guile-devel) $(vopt_if python 'python3-devel gettext-devel')"
+depends="gdb-common"
short_desc="GNU Debugger for AVR"
maintainer="Artur Sinila <opensource@logarithmus.dev>"
license="GPL-3.0-or-later"
-homepage="https://www.gnu.org/software/gdb/"
+homepage="https://www.gnu.org/software/gdb"
distfiles="${GNU_SITE}/gdb/gdb-${version}.tar.xz"
-checksum=f82f1eceeec14a3afa2de8d9b0d3c91d5a3820e23e0a01bbb70ef9f0276b62c0
-python_version=3
+checksum=cccfcc407b20d343fb320d4a9a2110776dd3165118ffd41f4b1b162340333f94
+make_check=no # See gdb/template.
replaces="cross-avr-gdb>=0"
+patch_args="-Np1"
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}"
fi
-CFLAGS+=" -fcommon"
-CXXFLAGS+=" -fcommon"
-# Package build options
-build_options="gdbserver static python"
-desc_option_gdbserver="Enable support for building GDB server"
-# By default, don't enable any of build options
-#build_options_default="gdbserver"
-# Both options cannot be enabled at the same time
-vopt_conflict gdbserver static
-
-post_extract() {
- vsed -i 's,sgidefs.h,asm/sgidefs.h,' gdb/mips-linux-nat.c
- mkdir -p build
-}
-
-do_configure() {
- cd build
- ../configure ${configure_args/with-sysroot/with-build-sysroot} \
- CFLAGS_FOR_BUILD="${CFLAGS_FOR_BUILD} -fcommon"
- export gl_cv_func_gettimeofday_clobber=no
- export gl_cv_func_working_strerror=yes
- export gl_cv_func_strerror_0_works=yes
-}
-do_build() {
- cd build
- make ${makejobs} all
-}
-
-do_install() {
- cd build
- make DESTDIR=${DESTDIR} ${makejobs} install
- # resolve conflicts with binutils
- rm -rf ${DESTDIR}/usr/include ${DESTDIR}/usr/lib
- rm -rf ${DESTDIR}/usr/lib64
- for f in bfd configure standards; do
- rm -f ${DESTDIR}/usr/share/info/${f}.info*
- done
-}
+# Package build options
+build_options="guile python"
+build_options_default="python"
post_install() {
- # resolve conflicts with binutils and native gdb
- rm -fr usr/{share/{locale,gdb,info},include}
+ # resolve conflicts with gdb-common
+ rm -r ${DESTDIR}/usr/{share/{gdb,info},include}
}
From 653c5dc2c103ab490d5cf1f452870b8d41b6ba54 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
Date: Mon, 13 Sep 2021 11:51:30 -0300
Subject: [PATCH 4/4] cross-arm-none-eabi-gdb: update to 11.1 and clean up.
Co-authored-by: Evgeny Ermakov <evgeny.v.ermakov@gmail.com>
---
.../patches/gdb-mips-linux-nat.patch | 11 +++
srcpkgs/cross-arm-none-eabi-gdb/template | 69 ++++++++-----------
2 files changed, 40 insertions(+), 40 deletions(-)
create mode 100644 srcpkgs/cross-arm-none-eabi-gdb/patches/gdb-mips-linux-nat.patch
diff --git a/srcpkgs/cross-arm-none-eabi-gdb/patches/gdb-mips-linux-nat.patch b/srcpkgs/cross-arm-none-eabi-gdb/patches/gdb-mips-linux-nat.patch
new file mode 100644
index 000000000000..ec4e9c2666f5
--- /dev/null
+++ b/srcpkgs/cross-arm-none-eabi-gdb/patches/gdb-mips-linux-nat.patch
@@ -0,0 +1,11 @@
+--- a/gdb/mips-linux-nat.c
++++ b/gdb/mips-linux-nat.c
+@@ -31,7 +31,7 @@
+ #include "gdb_proc_service.h"
+ #include "gregset.h"
+
+-#include <sgidefs.h>
++#include <asm/sgidefs.h>
+ #include "nat/gdb_ptrace.h"
+ #include <asm/ptrace.h>
+ #include "inf-ptrace.h"
diff --git a/srcpkgs/cross-arm-none-eabi-gdb/template b/srcpkgs/cross-arm-none-eabi-gdb/template
index ac8e6837d72c..986b0420294f 100644
--- a/srcpkgs/cross-arm-none-eabi-gdb/template
+++ b/srcpkgs/cross-arm-none-eabi-gdb/template
@@ -1,48 +1,37 @@
-# Template file for 'cross-${_triplet}-${_pkgname}'
-_triplet=arm-none-eabi
-_pkgname=gdb
-pkgname=cross-${_triplet}-${_pkgname}
-version=8.3
+# Template file for 'cross-arm-none-eabi-gdb'
+pkgname=cross-arm-none-eabi-gdb
+version=11.1
revision=1
-wrksrc="${_pkgname}-${version}"
+wrksrc=gdb-${version}
build_style=gnu-configure
-pycompile_dirs="/usr/share/${_pkgname}"
-configure_args="
- --disable-gdbserver
- --disable-nls
- --disable-werror
- --host=${XBPS_CROSS_TRIPLE}
- --prefix=/usr
- --target=${_triplet}
- --with-babeltrace
- --with-expat
- --with-mpfr
- --with-system-readline
- --with-system-zlib
- --without-isl
- $(vopt_with guile)
- $(vopt_with python)
-"
-hostmakedepends="autoconf automake bison flex pkg-config texinfo"
-makedepends="babeltrace-devel expat-devel mpfr-devel ncurses-devel
- readline-devel zlib-devel $(vopt_if guile guile-devel)
- $(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
+ $(vopt_with guile) $(vopt_if python --with-python=/usr/bin/python3)"
+hostmakedepends="pkg-config texinfo $(vopt_if python python3-devel) $(vopt_if guile guile)"
+makedepends="expat-devel ncurses-devel readline-devel zlib-devel gmp-devel
+ $(vopt_if guile guile-devel) $(vopt_if python 'python3-devel gettext-devel')
+ babeltrace-devel mpfr-devel"
+depends="gdb-common"
+short_desc="GNU Debugger for ARM"
maintainer="Ivan Sokolov <ivan-p-sokolov@ya.ru>"
license="GPL-3.0-or-later"
-homepage="https://www.gnu.org/software/${_pkgname}"
-distfiles="${GNU_SITE}/${_pkgname}/${_pkgname}-${version}.tar.xz"
-checksum=802f7ee309dcc547d65a68d61ebd6526762d26c3051f52caebe2189ac1ffd72e
-python_version=2 #unverified
-build_options="guile python"
-# don't enable guile and python interfaces until they are moved into
-# platform independent packages
-build_options_default=" "
-nocross=yes
+homepage="https://www.gnu.org/software/gdb"
+distfiles="${GNU_SITE}/gdb/gdb-${version}.tar.xz"
+checksum=cccfcc407b20d343fb320d4a9a2110776dd3165118ffd41f4b1b162340333f94
+make_check=no # See gdb/template.
+patch_args="-Np1"
+
+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}"
+fi
-CFLAGS="-fcommon"
+# Package build options
+build_options="guile python"
+build_options_default="python"
post_install() {
- # resolve conflicts with binutils and native gdb
- rm -fr ${DESTDIR}/usr/{share/{locale,gdb,info},include}
+ # resolve conflicts with gdb-common
+ rm -r ${DESTDIR}/usr/{share/{gdb,info},include}
}
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PR PATCH] [Updated] Update GDBs to 11.1
2021-09-13 14:52 [PR PATCH] Update GDBs to 11.1 ericonr
2021-10-03 6:09 ` [PR PATCH] [Updated] " ericonr
@ 2021-10-03 6:27 ` ericonr
2021-10-03 8:18 ` ericonr
2021-10-03 8:18 ` [PR PATCH] [Closed]: " ericonr
3 siblings, 0 replies; 5+ messages in thread
From: ericonr @ 2021-10-03 6:27 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1610 bytes --]
There is an updated pull request by ericonr against master on the void-packages repository
https://github.com/ericonr/void-packages gdb
https://github.com/void-linux/void-packages/pull/32949
Update GDBs to 11.1
<!-- Mark items with [x] where applicable -->
#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#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
<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!--
#### Does it build and run successfully?
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
- [ ] aarch64-musl
- [ ] armv7l
- [ ] armv6l-musl
-->
Testing still in progress.
A patch file from https://github.com/void-linux/void-packages/pull/32949.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-gdb-32949.patch --]
[-- Type: text/x-diff, Size: 15381 bytes --]
From 0a3a26593d0f70437cbb86f9e676681e70e6db3d Mon Sep 17 00:00:00 2001
From: Evgeny Ermakov <evgeny.v.ermakov@gmail.com>
Date: Sat, 1 May 2021 05:21:55 +1100
Subject: [PATCH 1/4] guile: devel needs dependency on libatomic_ops-devel on
some targets
---
srcpkgs/guile/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/guile/template b/srcpkgs/guile/template
index f9ce43c06709..f0f917b1c4ee 100644
--- a/srcpkgs/guile/template
+++ b/srcpkgs/guile/template
@@ -1,13 +1,13 @@
# Template file for 'guile'
pkgname=guile
version=2.2.7
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--disable-static --disable-error-on-warning"
hostmakedepends="pkg-config texinfo"
makedepends="gc-devel gmp-devel libatomic_ops-devel libffi-devel libltdl-devel
libunistring-devel readline-devel"
-short_desc="A portable, embeddable Scheme implementation written in C"
+short_desc="Portable, embeddable Scheme implementation written in C"
maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-3.0-or-later, LGPL-3.0-or-later"
homepage="http://www.gnu.org/software/guile"
@@ -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
From cf855c6e4f30335a0223b9784102c5afb4da61cd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
Date: Mon, 13 Sep 2021 11:50:02 -0300
Subject: [PATCH 2/4] gdb: update to 11.1 and clean up.
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>
---
srcpkgs/gdb-common | 1 +
srcpkgs/gdb/patches/gdb-mips-linux-nat.patch | 11 ++++
srcpkgs/gdb/template | 67 ++++++++++----------
3 files changed, 44 insertions(+), 35 deletions(-)
create mode 120000 srcpkgs/gdb-common
create mode 100644 srcpkgs/gdb/patches/gdb-mips-linux-nat.patch
diff --git a/srcpkgs/gdb-common b/srcpkgs/gdb-common
new file mode 120000
index 000000000000..f3e03e3f1a44
--- /dev/null
+++ b/srcpkgs/gdb-common
@@ -0,0 +1 @@
+gdb
\ No newline at end of file
diff --git a/srcpkgs/gdb/patches/gdb-mips-linux-nat.patch b/srcpkgs/gdb/patches/gdb-mips-linux-nat.patch
new file mode 100644
index 000000000000..ec4e9c2666f5
--- /dev/null
+++ b/srcpkgs/gdb/patches/gdb-mips-linux-nat.patch
@@ -0,0 +1,11 @@
+--- a/gdb/mips-linux-nat.c
++++ b/gdb/mips-linux-nat.c
+@@ -31,7 +31,7 @@
+ #include "gdb_proc_service.h"
+ #include "gregset.h"
+
+-#include <sgidefs.h>
++#include <asm/sgidefs.h>
+ #include "nat/gdb_ptrace.h"
+ #include <asm/ptrace.h>
+ #include "inf-ptrace.h"
diff --git a/srcpkgs/gdb/template b/srcpkgs/gdb/template
index 56c0e01630b5..39bc48be3144 100644
--- a/srcpkgs/gdb/template
+++ b/srcpkgs/gdb/template
@@ -1,6 +1,6 @@
# Template file for 'gdb'
pkgname=gdb
-version=10.2
+version=11.1
revision=1
build_style=gnu-configure
pycompile_dirs="/usr/share/gdb/python"
@@ -8,19 +8,30 @@ configure_args="--disable-werror --disable-nls --with-system-readline
--with-system-gdbinit=/etc/gdb/gdbinit --with-system-zlib
$(vopt_enable gdbserver) $(vopt_if multiarch --enable-targets=all)
$(vopt_if static 'CFLAGS=-static CXXFLAGS=-static LDFLAGS=-static')
- $(vopt_if python --with-python=/usr/bin/python3)
+ $(vopt_with guile) $(vopt_if python --with-python=/usr/bin/python3)
$(vopt_with debuginfod)"
-hostmakedepends="texinfo perl pkg-config $(vopt_if python python3-devel)"
-makedepends="ncurses-devel zlib-devel readline-devel expat-devel
- $(vopt_if python 'python3-devel gettext-devel')
- $(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 gmp-devel
+ $(vopt_if debuginfod elfutils-devel) $(vopt_if guile guile-devel)
+ $(vopt_if python 'gettext-devel python3-devel')"
+depends="gdb-common>=${version}_${revision}"
+checkdepends="dejagnu"
short_desc="GNU Debugger"
maintainer="Anthony Iliopoulos <ailiop@altatus.com>"
license="GPL-3.0-or-later"
-homepage="https://www.gnu.org/software/gdb/"
-distfiles="${GNU_SITE}/${pkgname}/${pkgname}-${version}.tar.xz"
-checksum=aaa1223d534c9b700a8bec952d9748ee1977513f178727e1bee520ee000b4f29
+homepage="https://www.gnu.org/software/gdb"
+distfiles="${GNU_SITE}/gdb/gdb-${version}.tar.xz"
+checksum=cccfcc407b20d343fb320d4a9a2110776dd3165118ffd41f4b1b162340333f94
+make_check=extended # Tests take too long, not all of them pass.
python_version=3
+patch_args="-Np1"
+ignore_elf_files="
+ /usr/share/gdb/guile/gdb/support.go
+ /usr/share/gdb/guile/gdb/experimental.go
+ /usr/share/gdb/guile/gdb/iterator.go
+ /usr/share/gdb/guile/gdb/types.go
+ /usr/share/gdb/guile/gdb/printing.go
+ /usr/share/gdb/guile/gdb.go"
if [ "${CROSS_BUILD}" ]; then
# Make python3.x detection work in cross builds
@@ -28,36 +39,22 @@ if [ "${CROSS_BUILD}" ]; then
CXXFLAGS="-I${XBPS_CROSS_BASE}/${py3_inc}"
fi
-build_options="gdbserver multiarch static python debuginfod"
+build_options="debuginfod gdbserver guile multiarch python static"
+desc_option_gdbserver="Enable support for building GDB server"
desc_option_debuginfod="Enable support for libdebuginfod"
desc_option_multiarch="Enable support for all architectures"
-desc_option_gdbserver="Enable support for building GDB server"
-build_options_default="gdbserver python debuginfod"
+build_options_default="debuginfod gdbserver python"
vopt_conflict gdbserver static
vopt_conflict debuginfod static
-post_extract() {
- vsed -i 's,sgidefs.h,asm/sgidefs.h,' gdb/mips-linux-nat.c
- mkdir -p build
-}
-do_configure() {
- cd build
- ../configure ${configure_args/with-sysroot/with-build-sysroot} \
- CFLAGS_FOR_BUILD="${CFLAGS_FOR_BUILD} -fcommon"
- export gl_cv_func_gettimeofday_clobber=no
- export gl_cv_func_working_strerror=yes
- export gl_cv_func_strerror_0_works=yes
-}
-do_build() {
- cd build
- make ${makejobs} all
-}
-do_install() {
- cd build
- make DESTDIR=${DESTDIR} ${makejobs} install
+post_install() {
# resolve conflicts with binutils
- rm -rf ${DESTDIR}/usr/{include,lib,lib64}
- for f in bfd configure standards; do
- rm -f ${DESTDIR}/usr/share/info/${f}.info*
- done
+ rm -r ${DESTDIR}/usr/{include,lib,share/info/bfd.info*}
+}
+
+gdb-common_package() {
+ short_desc+=" - common files"
+ pkg_install() {
+ vmove usr/share
+ }
}
From db9d8383e901f9733905878db079a3802268aecd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
Date: Mon, 13 Sep 2021 11:50:31 -0300
Subject: [PATCH 3/4] avr-gdb: update to 11.1 and clean up.
Also added build option for Guile.
Co-authored-by: Evgeny Ermakov <evgeny.v.ermakov@gmail.com>
---
.../avr-gdb/patches/gdb-mips-linux-nat.patch | 11 +++
srcpkgs/avr-gdb/template | 76 +++++--------------
2 files changed, 28 insertions(+), 59 deletions(-)
create mode 100644 srcpkgs/avr-gdb/patches/gdb-mips-linux-nat.patch
diff --git a/srcpkgs/avr-gdb/patches/gdb-mips-linux-nat.patch b/srcpkgs/avr-gdb/patches/gdb-mips-linux-nat.patch
new file mode 100644
index 000000000000..ec4e9c2666f5
--- /dev/null
+++ b/srcpkgs/avr-gdb/patches/gdb-mips-linux-nat.patch
@@ -0,0 +1,11 @@
+--- a/gdb/mips-linux-nat.c
++++ b/gdb/mips-linux-nat.c
+@@ -31,7 +31,7 @@
+ #include "gdb_proc_service.h"
+ #include "gregset.h"
+
+-#include <sgidefs.h>
++#include <asm/sgidefs.h>
+ #include "nat/gdb_ptrace.h"
+ #include <asm/ptrace.h>
+ #include "inf-ptrace.h"
diff --git a/srcpkgs/avr-gdb/template b/srcpkgs/avr-gdb/template
index 73d9f9ac7456..9d2e15ca5946 100644
--- a/srcpkgs/avr-gdb/template
+++ b/srcpkgs/avr-gdb/template
@@ -1,79 +1,37 @@
# Template file for 'avr-gdb'
pkgname=avr-gdb
-version=10.1
+version=11.1
revision=1
wrksrc=gdb-${version}
build_style=gnu-configure
-pycompile_dirs="/usr/share/gdb/python"
-configure_args="\
- --target=avr \
- --program-prefix=avr- \
- --disable-werror \
- --disable-nls \
- --with-system-readline \
- --with-system-gdbinit=/etc/gdb/gdbinit \
- --with-system-zlib $(vopt_enable gdbserver) \
- $(vopt_if static 'CFLAGS=-static CXXFLAGS=-static LDFLAGS=-static') \
- $(vopt_if python --with-python=/usr/bin/python3)"
-hostmakedepends="texinfo perl $(vopt_if python python3-devel)"
-makedepends="ncurses-devel zlib-devel readline-devel expat-devel
- $(vopt_if python 'python3-devel gettext-devel')"
-depends=gdb
+configure_args="--target=avr --disable-werror --disable-nls --with-system-readline
+ --with-system-gdbinit=/etc/gdb/gdbinit --with-system-zlib
+ $(vopt_with guile) $(vopt_if python --with-python=/usr/bin/python3)"
+hostmakedepends="pkg-config texinfo $(vopt_if python python3-devel) $(vopt_if guile guile)"
+makedepends="expat-devel ncurses-devel readline-devel zlib-devel gmp-devel
+ $(vopt_if guile guile-devel) $(vopt_if python 'gettext-devel python3-devel')"
+depends="gdb-common"
short_desc="GNU Debugger for AVR"
maintainer="Artur Sinila <opensource@logarithmus.dev>"
license="GPL-3.0-or-later"
-homepage="https://www.gnu.org/software/gdb/"
+homepage="https://www.gnu.org/software/gdb"
distfiles="${GNU_SITE}/gdb/gdb-${version}.tar.xz"
-checksum=f82f1eceeec14a3afa2de8d9b0d3c91d5a3820e23e0a01bbb70ef9f0276b62c0
-python_version=3
+checksum=cccfcc407b20d343fb320d4a9a2110776dd3165118ffd41f4b1b162340333f94
+make_check=no # See gdb/template.
replaces="cross-avr-gdb>=0"
+patch_args="-Np1"
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}"
fi
-CFLAGS+=" -fcommon"
-CXXFLAGS+=" -fcommon"
-# Package build options
-build_options="gdbserver static python"
-desc_option_gdbserver="Enable support for building GDB server"
-# By default, don't enable any of build options
-#build_options_default="gdbserver"
-# Both options cannot be enabled at the same time
-vopt_conflict gdbserver static
-
-post_extract() {
- vsed -i 's,sgidefs.h,asm/sgidefs.h,' gdb/mips-linux-nat.c
- mkdir -p build
-}
-
-do_configure() {
- cd build
- ../configure ${configure_args/with-sysroot/with-build-sysroot} \
- CFLAGS_FOR_BUILD="${CFLAGS_FOR_BUILD} -fcommon"
- export gl_cv_func_gettimeofday_clobber=no
- export gl_cv_func_working_strerror=yes
- export gl_cv_func_strerror_0_works=yes
-}
-do_build() {
- cd build
- make ${makejobs} all
-}
-
-do_install() {
- cd build
- make DESTDIR=${DESTDIR} ${makejobs} install
- # resolve conflicts with binutils
- rm -rf ${DESTDIR}/usr/include ${DESTDIR}/usr/lib
- rm -rf ${DESTDIR}/usr/lib64
- for f in bfd configure standards; do
- rm -f ${DESTDIR}/usr/share/info/${f}.info*
- done
-}
+# Package build options
+build_options="guile python"
+build_options_default="python"
post_install() {
- # resolve conflicts with binutils and native gdb
- rm -fr usr/{share/{locale,gdb,info},include}
+ # resolve conflicts with gdb-common
+ rm -r ${DESTDIR}/usr/{share/{gdb,info},include}
}
From bf84c56802024c5f6216a3e538ab6e2e853cf2f7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
Date: Mon, 13 Sep 2021 11:51:30 -0300
Subject: [PATCH 4/4] cross-arm-none-eabi-gdb: update to 11.1 and clean up.
Co-authored-by: Evgeny Ermakov <evgeny.v.ermakov@gmail.com>
---
.../patches/gdb-mips-linux-nat.patch | 11 +++
srcpkgs/cross-arm-none-eabi-gdb/template | 71 ++++++++-----------
2 files changed, 42 insertions(+), 40 deletions(-)
create mode 100644 srcpkgs/cross-arm-none-eabi-gdb/patches/gdb-mips-linux-nat.patch
diff --git a/srcpkgs/cross-arm-none-eabi-gdb/patches/gdb-mips-linux-nat.patch b/srcpkgs/cross-arm-none-eabi-gdb/patches/gdb-mips-linux-nat.patch
new file mode 100644
index 000000000000..ec4e9c2666f5
--- /dev/null
+++ b/srcpkgs/cross-arm-none-eabi-gdb/patches/gdb-mips-linux-nat.patch
@@ -0,0 +1,11 @@
+--- a/gdb/mips-linux-nat.c
++++ b/gdb/mips-linux-nat.c
+@@ -31,7 +31,7 @@
+ #include "gdb_proc_service.h"
+ #include "gregset.h"
+
+-#include <sgidefs.h>
++#include <asm/sgidefs.h>
+ #include "nat/gdb_ptrace.h"
+ #include <asm/ptrace.h>
+ #include "inf-ptrace.h"
diff --git a/srcpkgs/cross-arm-none-eabi-gdb/template b/srcpkgs/cross-arm-none-eabi-gdb/template
index ac8e6837d72c..a785c3de4add 100644
--- a/srcpkgs/cross-arm-none-eabi-gdb/template
+++ b/srcpkgs/cross-arm-none-eabi-gdb/template
@@ -1,48 +1,39 @@
-# Template file for 'cross-${_triplet}-${_pkgname}'
-_triplet=arm-none-eabi
-_pkgname=gdb
-pkgname=cross-${_triplet}-${_pkgname}
-version=8.3
+# Template file for 'cross-arm-none-eabi-gdb'
+pkgname=cross-arm-none-eabi-gdb
+version=11.1
revision=1
-wrksrc="${_pkgname}-${version}"
+wrksrc=gdb-${version}
build_style=gnu-configure
-pycompile_dirs="/usr/share/${_pkgname}"
-configure_args="
- --disable-gdbserver
- --disable-nls
- --disable-werror
- --host=${XBPS_CROSS_TRIPLE}
- --prefix=/usr
- --target=${_triplet}
- --with-babeltrace
- --with-expat
- --with-mpfr
- --with-system-readline
- --with-system-zlib
- --without-isl
- $(vopt_with guile)
- $(vopt_with python)
-"
-hostmakedepends="autoconf automake bison flex pkg-config texinfo"
-makedepends="babeltrace-devel expat-devel mpfr-devel ncurses-devel
- readline-devel zlib-devel $(vopt_if guile guile-devel)
- $(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
+ $(vopt_with guile) $(vopt_if python --with-python=/usr/bin/python3)"
+hostmakedepends="pkg-config texinfo $(vopt_if python python3-devel) $(vopt_if guile guile)"
+# mpfr is necessary to emulate target floating point behavior
+# babeltrace is necessary for Common Trace Format support
+makedepends="expat-devel ncurses-devel readline-devel zlib-devel gmp-devel
+ babeltrace-devel mpfr-devel
+ $(vopt_if guile guile-devel) $(vopt_if python 'gettext-devel python3-devel')"
+depends="gdb-common"
+short_desc="GNU Debugger for ARM"
maintainer="Ivan Sokolov <ivan-p-sokolov@ya.ru>"
license="GPL-3.0-or-later"
-homepage="https://www.gnu.org/software/${_pkgname}"
-distfiles="${GNU_SITE}/${_pkgname}/${_pkgname}-${version}.tar.xz"
-checksum=802f7ee309dcc547d65a68d61ebd6526762d26c3051f52caebe2189ac1ffd72e
-python_version=2 #unverified
-build_options="guile python"
-# don't enable guile and python interfaces until they are moved into
-# platform independent packages
-build_options_default=" "
-nocross=yes
+homepage="https://www.gnu.org/software/gdb"
+distfiles="${GNU_SITE}/gdb/gdb-${version}.tar.xz"
+checksum=cccfcc407b20d343fb320d4a9a2110776dd3165118ffd41f4b1b162340333f94
+make_check=no # See gdb/template.
+patch_args="-Np1"
+
+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}"
+fi
-CFLAGS="-fcommon"
+# Package build options
+build_options="guile python"
+build_options_default="python"
post_install() {
- # resolve conflicts with binutils and native gdb
- rm -fr ${DESTDIR}/usr/{share/{locale,gdb,info},include}
+ # resolve conflicts with gdb-common
+ rm -r ${DESTDIR}/usr/{share/{gdb,info},include}
}
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: Update GDBs to 11.1
2021-09-13 14:52 [PR PATCH] Update GDBs to 11.1 ericonr
2021-10-03 6:09 ` [PR PATCH] [Updated] " ericonr
2021-10-03 6:27 ` ericonr
@ 2021-10-03 8:18 ` ericonr
2021-10-03 8:18 ` [PR PATCH] [Closed]: " ericonr
3 siblings, 0 replies; 5+ messages in thread
From: ericonr @ 2021-10-03 8:18 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 157 bytes --]
New comment by ericonr on void-packages repository
https://github.com/void-linux/void-packages/pull/32949#issuecomment-932887104
Comment:
Merged in #29382
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PR PATCH] [Closed]: Update GDBs to 11.1
2021-09-13 14:52 [PR PATCH] Update GDBs to 11.1 ericonr
` (2 preceding siblings ...)
2021-10-03 8:18 ` ericonr
@ 2021-10-03 8:18 ` ericonr
3 siblings, 0 replies; 5+ messages in thread
From: ericonr @ 2021-10-03 8:18 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1458 bytes --]
There's a closed pull request on the void-packages repository
Update GDBs to 11.1
https://github.com/void-linux/void-packages/pull/32949
Description:
<!-- Mark items with [x] where applicable -->
#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#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
<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!--
#### Does it build and run successfully?
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
- [ ] aarch64-musl
- [ ] armv7l
- [ ] armv6l-musl
-->
Testing still in progress.
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2021-10-03 8:18 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-09-13 14:52 [PR PATCH] Update GDBs to 11.1 ericonr
2021-10-03 6:09 ` [PR PATCH] [Updated] " ericonr
2021-10-03 6:27 ` ericonr
2021-10-03 8:18 ` ericonr
2021-10-03 8:18 ` [PR PATCH] [Closed]: " ericonr
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).