diff options
Diffstat (limited to 'package/gdb')
| -rw-r--r-- | package/gdb/Makefile | 18 | ||||
| -rw-r--r-- | package/gdb/patches/patch-gdb_configure | 96 | ||||
| -rw-r--r-- | package/gdb/patches/patch-gdb_riscv-tdep_c | 12 |
3 files changed, 12 insertions, 114 deletions
diff --git a/package/gdb/Makefile b/package/gdb/Makefile index f69d139f0..e4cbe89a9 100644 --- a/package/gdb/Makefile +++ b/package/gdb/Makefile @@ -4,17 +4,17 @@ include ${ADK_TOPDIR}/rules.mk PKG_NAME:= gdb -PKG_VERSION:= 9.1 +PKG_VERSION:= 14.2 PKG_RELEASE:= 1 -PKG_HASH:= 699e0ec832fdd2f21c8266171ea5bf44024bd05164fdf064e4d10cc4cf0d1737 -PKG_DESCR:= programm debugger +PKG_HASH:= 2d4dd8061d8ded12b6c63f55e45344881e8226105f4d2a9b234040efa5ce7772 +PKG_DESCR:= program debugger PKG_SECTION:= app/debug PKG_SITES:= ${MASTER_SITE_GNU:=gdb/} -PKG_DEPENDS:= libncurses zlib libexpat libthread-db -PKG_BUILDDEP:= ncurses readline expat zlib +PKG_DEPENDS:= libncurses libreadline zlib libexpat libthread-db libgmp mpfr +PKG_BUILDDEP:= ncurses readline expat zlib gmp mpfr PKG_NEEDS:= c++ -PKG_ARCH_DEPENDS:= !arc !cris !avr32 !microblaze +PKG_ARCH_DEPENDS:= !cris !avr32 !microblaze include ${ADK_TOPDIR}/mk/package.mk @@ -24,8 +24,10 @@ XAKE_FLAGS+= MAKEINFO=true WRKBUILD= $(WRKDIR)/$(PKG_NAME)-obj +CONFIGURE_ENV+= host_configargs='--with-libgmp-prefix="${STAGING_TARGET_DIR}/usr"' # --enable-static is required to build libbfd.a CONFIGURE_ARGS+= --enable-static \ + --disable-shared \ --without-uiout \ --disable-tui \ --disable-gdbtk \ @@ -41,7 +43,11 @@ CONFIGURE_ARGS+= --enable-static \ --disable-install-libiberty \ --disable-install-libbfd \ --with-system-zlib \ + --with-system-readline \ --with-curses \ + --with-libexpat-prefix="${STAGING_TARGET_DIR}/usr" \ + --with-gmp="${STAGING_TARGET_DIR}/usr" \ + --with-mpfr="${STAGING_TARGET_DIR}/usr" \ --enable-gdbmi gdb-install: diff --git a/package/gdb/patches/patch-gdb_configure b/package/gdb/patches/patch-gdb_configure deleted file mode 100644 index 932db7d01..000000000 --- a/package/gdb/patches/patch-gdb_configure +++ /dev/null @@ -1,96 +0,0 @@ ---- gdb-8.3.1.orig/gdb/configure 2019-09-21 00:04:41.000000000 +0200 -+++ gdb-8.3.1/gdb/configure 2019-10-16 12:08:42.152038996 +0200 -@@ -15064,93 +15064,6 @@ $as_echo "$gdb_cv_bigtoc" >&6; } - ;; - esac - --{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for the dynamic export flag" >&5 --$as_echo_n "checking for the dynamic export flag... " >&6; } --dynamic_list=false --if test "${gdb_native}" = yes; then -- # The dynamically loaded libthread_db needs access to symbols in the gdb -- # executable. Older GNU ld supports --export-dynamic but --dynamic-list -- # may not be supported there. -- old_LDFLAGS="$LDFLAGS" -- # Older GNU ld supports --export-dynamic but --dynamic-list it does not. -- RDYNAMIC="-Wl,--dynamic-list=${srcdir}/proc-service.list" -- LDFLAGS="$LDFLAGS $RDYNAMIC" -- if test "${have_libpython}" = no; then -- cat confdefs.h - <<_ACEOF >conftest.$ac_ext --/* end confdefs.h. */ -- --int --main () --{ -- -- ; -- return 0; --} --_ACEOF --if ac_fn_c_try_link "$LINENO"; then : -- dynamic_list=true --fi --rm -f core conftest.err conftest.$ac_objext \ -- conftest$ac_exeext conftest.$ac_ext -- else -- # Workaround http://bugs.python.org/issue4434 where static -- # libpythonX.Y.a would get its symbols required for -- # pythonX.Y/lib-dynload/*.so modules hidden by -Wl,--dynamic-list. -- # Problem does not happen for the recommended libpythonX.Y.so linkage. -- -- # Note the workaround for Python -- # http://bugs.python.org/issue10112 earlier has removed -- # -export-dynamic from PYTHON_LIBS. That's exactly what we want -- # here too, as otherwise it'd make this -Wl,--dynamic-list test -- # always pass. -- old_CFLAGS="$CFLAGS" -- CFLAGS="$CFLAGS $PYTHON_CFLAGS" -- old_LIBS="$LIBS" -- LIBS="$LIBS $PYTHON_LIBS" -- old_CPPFLAGS="$CPPFLAGS" -- CPPFLAGS="$CPPFLAGS $PYTHON_CPPFLAGS" -- if test "$cross_compiling" = yes; then : -- true --else -- cat confdefs.h - <<_ACEOF >conftest.$ac_ext --/* end confdefs.h. */ --#include "Python.h" --int --main () --{ --int err; -- Py_Initialize (); -- err = PyRun_SimpleString ("import itertools\n"); -- Py_Finalize (); -- return err == 0 ? 0 : 1; -- ; -- return 0; --} --_ACEOF --if ac_fn_c_try_run "$LINENO"; then : -- dynamic_list=true --fi --rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ -- conftest.$ac_objext conftest.beam conftest.$ac_ext --fi -- -- LIBS="$old_LIBS" -- CFLAGS="$old_CFLAGS" -- CPPFLAGS="$old_CPPFLAGS" -- fi -- LDFLAGS="$old_LDFLAGS" --fi --if $dynamic_list; then -- found="-Wl,--dynamic-list" -- RDYNAMIC='-Wl,--dynamic-list=$(srcdir)/proc-service.list' --else -- found="-rdynamic" -- RDYNAMIC="-rdynamic" --fi -- --{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $found" >&5 --$as_echo "$found" >&6; } -- - - if test ${build} = ${host} -a ${host} = ${target} ; then - case ${host_os} in diff --git a/package/gdb/patches/patch-gdb_riscv-tdep_c b/package/gdb/patches/patch-gdb_riscv-tdep_c deleted file mode 100644 index 17834f821..000000000 --- a/package/gdb/patches/patch-gdb_riscv-tdep_c +++ /dev/null @@ -1,12 +0,0 @@ ---- gdb-8.3.1.orig/gdb/riscv-tdep.c 2019-09-21 00:04:41.000000000 +0200 -+++ gdb-8.3.1/gdb/riscv-tdep.c 2019-10-16 12:18:34.569267544 +0200 -@@ -3131,9 +3131,6 @@ riscv_gdbarch_init (struct gdbarch_info - /* We do support running binaries compiled for 32-bit float on targets - with 64-bit float, so we only complain if the binary requires more - than the target has available. */ -- if (abi_features.flen > features.flen) -- error (_("bfd requires flen %d, but target has flen %d"), -- abi_features.flen, features.flen); - - /* If the ABI_FEATURES xlen is 0 then this indicates we got no useful abi - features from the INFO object. In this case we assume that the xlen |