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>
This commit is contained in:
Érico Nogueira 2021-09-13 11:50:02 -03:00 committed by Érico Nogueira Rolim
parent b67aa1de9e
commit 496e3305cb
3 changed files with 45 additions and 37 deletions

1
srcpkgs/gdb-common Symbolic link
View file

@ -0,0 +1 @@
gdb

View file

@ -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"

View file

@ -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,56 +8,52 @@ 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
CFLAGS="-I${XBPS_CROSS_BASE}/${py3_inc}"
CXXFLAGS="-I${XBPS_CROSS_BASE}/${py3_inc}"
CPPFLAGS="-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
}
}