RPMs/gdb
Watch
1
0
Fork
You've already forked gdb
 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Rebase to FSF GDB 7.10.50.20151113 (trunk snapshot).

Browse source 
- [testsuite] BuildRequire libmpx for --with testsuite.
- Force libncursesw over libncurses to match the includes (RH BZ 1270534).
This commit is contained in:
Jan Kratochvil 2015-11-14 17:06:06 +01:00
commit c296a6a29e
10 changed files with 167 additions and 677 deletions
Download patch file Download diff file Expand all files Collapse all files

89
gdb-6.6-buildid-locate-rpm.patch
View file

@ -1,7 +1,7 @@
Index: gdb-7.9.90.20150717/gdb/event-top.c
Index: gdb-7.10.50.20151113/gdb/event-top.c
===================================================================
--- gdb-7.9.90.20150717.orig/gdb/event-top.c 2015-07-17 03:59:12.000000000 +0200
+++ gdb-7.9.90.20150717/gdb/event-top.c 2015-08-01 20:07:15.822993674 +0200
--- gdb-7.10.50.20151113.orig/gdb/event-top.c 2015-11-14 16:08:57.874227260 +0100
+++ gdb-7.10.50.20151113/gdb/event-top.c 2015-11-14 16:09:19.785362435 +0100
@@ -37,6 +37,7 @@
#include "gdbcmd.h" /* for dont_repeat() */
#include "annotate.h"
@ -28,10 +28,10 @@ Index: gdb-7.9.90.20150717/gdb/event-top.c
old_chain = make_cleanup (free_current_contents, &actual_gdb_prompt);
/* Do not call the python hook on an explicit prompt change as
Index: gdb-7.9.90.20150717/gdb/symfile.h
Index: gdb-7.10.50.20151113/gdb/symfile.h
===================================================================
--- gdb-7.9.90.20150717.orig/gdb/symfile.h 2015-08-01 20:07:15.787993404 +0200
+++ gdb-7.9.90.20150717/gdb/symfile.h 2015-08-01 20:07:15.822993674 +0200
--- gdb-7.10.50.20151113.orig/gdb/symfile.h 2015-11-14 16:08:57.874227260 +0100
+++ gdb-7.10.50.20151113/gdb/symfile.h 2015-11-14 16:09:19.786362441 +0100
@@ -587,6 +587,8 @@ void map_symbol_filenames (symbol_filena
/* build-id support. */
extern struct bfd_build_id *build_id_addr_get (CORE_ADDR addr);
@ -41,11 +41,11 @@ Index: gdb-7.9.90.20150717/gdb/symfile.h
/* From dwarf2read.c */
Index: gdb-7.9.90.20150717/gdb/testsuite/lib/gdb.exp
Index: gdb-7.10.50.20151113/gdb/testsuite/lib/gdb.exp
===================================================================
--- gdb-7.9.90.20150717.orig/gdb/testsuite/lib/gdb.exp 2015-08-01 20:07:15.789993420 +0200
+++ gdb-7.9.90.20150717/gdb/testsuite/lib/gdb.exp 2015-08-01 20:07:15.824993689 +0200
@@ -1573,7 +1573,7 @@ proc default_gdb_start { } {
--- gdb-7.10.50.20151113.orig/gdb/testsuite/lib/gdb.exp 2015-11-14 16:08:57.874227260 +0100
+++ gdb-7.10.50.20151113/gdb/testsuite/lib/gdb.exp 2015-11-14 16:09:19.786362441 +0100
@@ -1640,7 +1640,7 @@ proc default_gdb_start { } {
warning "Couldn't set the width to 0."
}
}
@ -54,11 +54,11 @@ Index: gdb-7.9.90.20150717/gdb/testsuite/lib/gdb.exp
send_gdb "set build-id-verbose 0\n"
gdb_expect 10 {
-re "$gdb_prompt $" {
Index: gdb-7.9.90.20150717/gdb/testsuite/lib/mi-support.exp
Index: gdb-7.10.50.20151113/gdb/testsuite/lib/mi-support.exp
===================================================================
--- gdb-7.9.90.20150717.orig/gdb/testsuite/lib/mi-support.exp 2015-08-01 20:07:15.789993420 +0200
+++ gdb-7.9.90.20150717/gdb/testsuite/lib/mi-support.exp 2015-08-01 20:07:15.824993689 +0200
@@ -214,7 +214,7 @@ proc default_mi_gdb_start { args } {
--- gdb-7.10.50.20151113.orig/gdb/testsuite/lib/mi-support.exp 2015-11-14 16:08:57.874227260 +0100
+++ gdb-7.10.50.20151113/gdb/testsuite/lib/mi-support.exp 2015-11-14 16:09:19.787362447 +0100
@@ -204,7 +204,7 @@ proc default_mi_gdb_start { args } {
warning "Couldn't set the width to 0."
}
}
@ -67,10 +67,10 @@ Index: gdb-7.9.90.20150717/gdb/testsuite/lib/mi-support.exp
send_gdb "190-gdb-set build-id-verbose 0\n"
gdb_expect 10 {
-re ".*190-gdb-set build-id-verbose 0\r\n190\\\^done\r\n$mi_gdb_prompt$" {
Index: gdb-7.9.90.20150717/gdb/tui/tui-interp.c
Index: gdb-7.10.50.20151113/gdb/tui/tui-interp.c
===================================================================
--- gdb-7.9.90.20150717.orig/gdb/tui/tui-interp.c 2015-07-17 03:59:13.000000000 +0200
+++ gdb-7.9.90.20150717/gdb/tui/tui-interp.c 2015-08-01 20:07:15.825993697 +0200
--- gdb-7.10.50.20151113.orig/gdb/tui/tui-interp.c 2015-11-14 16:08:57.874227260 +0100
+++ gdb-7.10.50.20151113/gdb/tui/tui-interp.c 2015-11-14 16:09:19.787362447 +0100
@@ -31,6 +31,7 @@
#include "tui/tui-io.h"
#include "infrun.h"
@ -79,10 +79,10 @@ Index: gdb-7.9.90.20150717/gdb/tui/tui-interp.c
static struct ui_out *tui_ui_out (struct interp *self);
Index: gdb-7.9.90.20150717/gdb/aclocal.m4
Index: gdb-7.10.50.20151113/gdb/aclocal.m4
===================================================================
--- gdb-7.9.90.20150717.orig/gdb/aclocal.m4 2015-07-17 03:59:12.000000000 +0200
+++ gdb-7.9.90.20150717/gdb/aclocal.m4 2015-08-01 20:07:15.825993697 +0200
--- gdb-7.10.50.20151113.orig/gdb/aclocal.m4 2015-11-14 16:08:57.874227260 +0100
+++ gdb-7.10.50.20151113/gdb/aclocal.m4 2015-11-14 16:09:19.787362447 +0100
@@ -11,6 +11,221 @@
# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
# PARTICULAR PURPOSE.
@ -305,10 +305,10 @@ Index: gdb-7.9.90.20150717/gdb/aclocal.m4
# AM_AUX_DIR_EXPAND -*- Autoconf -*-
# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc.
Index: gdb-7.9.90.20150717/gdb/config.in
Index: gdb-7.10.50.20151113/gdb/config.in
===================================================================
--- gdb-7.9.90.20150717.orig/gdb/config.in 2015-07-17 03:59:12.000000000 +0200
+++ gdb-7.9.90.20150717/gdb/config.in 2015-08-01 20:07:15.826993704 +0200
--- gdb-7.10.50.20151113.orig/gdb/config.in 2015-11-14 16:08:57.874227260 +0100
+++ gdb-7.10.50.20151113/gdb/config.in 2015-11-14 16:09:19.787362447 +0100
@@ -33,6 +33,9 @@
/* Define to BFD's default target vector. */
#undef DEFAULT_BFD_VEC
@ -329,11 +329,11 @@ Index: gdb-7.9.90.20150717/gdb/config.in
/* Define to 1 if you have the <libunwind-ia64.h> header file. */
#undef HAVE_LIBUNWIND_IA64_H
Index: gdb-7.9.90.20150717/gdb/configure
Index: gdb-7.10.50.20151113/gdb/configure
===================================================================
--- gdb-7.9.90.20150717.orig/gdb/configure 2015-07-17 03:59:12.000000000 +0200
+++ gdb-7.9.90.20150717/gdb/configure 2015-08-01 20:07:15.830993735 +0200
@@ -703,6 +703,11 @@ PKGVERSION
--- gdb-7.10.50.20151113.orig/gdb/configure 2015-11-14 16:09:10.050302377 +0100
+++ gdb-7.10.50.20151113/gdb/configure 2015-11-14 16:09:30.651429470 +0100
@@ -705,6 +705,11 @@ PKGVERSION
HAVE_NATIVE_GCORE_TARGET
TARGET_OBS
subdirs
@ -345,7 +345,7 @@ Index: gdb-7.9.90.20150717/gdb/configure
GDB_DATADIR
DEBUGDIR
MAKEINFO_EXTRA_FLAGS
@@ -811,6 +816,7 @@ with_gdb_datadir
@@ -813,6 +818,7 @@ with_gdb_datadir
with_relocated_sources
with_auto_load_dir
with_auto_load_safe_path
@ -353,7 +353,7 @@ Index: gdb-7.9.90.20150717/gdb/configure
enable_targets
enable_64_bit_bfd
enable_gdbcli
@@ -867,6 +873,11 @@ CCC
@@ -869,6 +875,11 @@ CCC
CPP
MAKEINFO
MAKEINFOFLAGS
@ -365,7 +365,7 @@ Index: gdb-7.9.90.20150717/gdb/configure
YACC
YFLAGS
XMKMF'
@@ -1538,6 +1549,8 @@ Optional Packages:
@@ -1540,6 +1551,8 @@ Optional Packages:
[--with-auto-load-dir]
--without-auto-load-safe-path
do not restrict auto-loaded files locations
@ -374,7 +374,7 @@ Index: gdb-7.9.90.20150717/gdb/configure
--with-libunwind-ia64 use libunwind frame unwinding for ia64 targets
--with-curses use the curses library instead of the termcap
library
@@ -1592,6 +1605,13 @@ Some influential environment variables:
@@ -1595,6 +1608,13 @@ Some influential environment variables:
MAKEINFO Parent configure detects if it is of sufficient version.
MAKEINFOFLAGS
Parameters for MAKEINFO.
@ -388,7 +388,7 @@ Index: gdb-7.9.90.20150717/gdb/configure
YACC The `Yet Another C Compiler' implementation to use. Defaults to
the first program found out of: `bison -y', `byacc', `yacc'.
YFLAGS The list of arguments that will be passed by default to $YACC.
@@ -5608,6 +5628,491 @@ _ACEOF
@@ -5656,6 +5676,494 @@ _ACEOF
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_auto_load_safe_path" >&5
$as_echo "$with_auto_load_safe_path" >&6; }
@ -623,6 +623,7 @@ Index: gdb-7.9.90.20150717/gdb/configure
+
+
+
+
+if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
+ if test -n "$ac_tool_prefix"; then
+ # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args.
@ -751,6 +752,7 @@ Index: gdb-7.9.90.20150717/gdb/configure
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then
+ pkg_cv_RPM_CFLAGS=`$PKG_CONFIG --cflags "rpm" 2>/dev/null`
+ test "x$?" != "x0" && pkg_failed=yes
+else
+ pkg_failed=yes
+fi
@ -767,6 +769,7 @@ Index: gdb-7.9.90.20150717/gdb/configure
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then
+ pkg_cv_RPM_LIBS=`$PKG_CONFIG --libs "rpm" 2>/dev/null`
+ test "x$?" != "x0" && pkg_failed=yes
+else
+ pkg_failed=yes
+fi
@ -786,9 +789,9 @@ Index: gdb-7.9.90.20150717/gdb/configure
+ _pkg_short_errors_supported=no
+fi
+ if test $_pkg_short_errors_supported = yes; then
+ RPM_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "rpm" 2>&1`
+ RPM_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "rpm" 2>&1`
+ else
+ RPM_PKG_ERRORS=`$PKG_CONFIG --print-errors "rpm" 2>&1`
+ RPM_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "rpm" 2>&1`
+ fi
+ # Put the nasty error message in config.log where it belongs
+ echo "$RPM_PKG_ERRORS" >&5
@ -880,10 +883,10 @@ Index: gdb-7.9.90.20150717/gdb/configure
subdirs="$subdirs testsuite"
Index: gdb-7.9.90.20150717/gdb/configure.ac
Index: gdb-7.10.50.20151113/gdb/configure.ac
===================================================================
--- gdb-7.9.90.20150717.orig/gdb/configure.ac 2015-07-17 03:59:12.000000000 +0200
+++ gdb-7.9.90.20150717/gdb/configure.ac 2015-08-01 20:07:15.831993743 +0200
--- gdb-7.10.50.20151113.orig/gdb/configure.ac 2015-11-14 16:08:57.874227260 +0100
+++ gdb-7.10.50.20151113/gdb/configure.ac 2015-11-14 16:09:19.790362466 +0100
@@ -177,6 +177,199 @@ AC_DEFINE_DIR(AUTO_LOAD_SAFE_PATH, escap
[Directories safe to hold auto-loaded files.])
AC_MSG_RESULT([$with_auto_load_safe_path])
@ -1084,10 +1087,10 @@ Index: gdb-7.9.90.20150717/gdb/configure.ac
AC_CONFIG_SUBDIRS(testsuite)
# Check whether to support alternative target configurations
Index: gdb-7.9.90.20150717/gdb/corelow.c
Index: gdb-7.10.50.20151113/gdb/corelow.c
===================================================================
--- gdb-7.9.90.20150717.orig/gdb/corelow.c 2015-08-01 20:07:15.775993312 +0200
+++ gdb-7.9.90.20150717/gdb/corelow.c 2015-08-01 20:07:15.831993743 +0200
--- gdb-7.10.50.20151113.orig/gdb/corelow.c 2015-11-14 16:08:57.874227260 +0100
+++ gdb-7.10.50.20151113/gdb/corelow.c 2015-11-14 16:09:19.791362472 +0100
@@ -310,7 +310,7 @@ build_id_locate_exec (int from_tty)
symfile_objfile->flags |= OBJF_BUILD_ID_CORE_LOADED;
}
@ -1097,10 +1100,10 @@ Index: gdb-7.9.90.20150717/gdb/corelow.c
do_cleanups (back_to);
Index: gdb-7.9.90.20150717/gdb/build-id.c
Index: gdb-7.10.50.20151113/gdb/build-id.c
===================================================================
--- gdb-7.9.90.20150717.orig/gdb/build-id.c 2015-08-01 20:07:15.791993435 +0200
+++ gdb-7.9.90.20150717/gdb/build-id.c 2015-08-01 20:08:27.735546630 +0200
--- gdb-7.10.50.20151113.orig/gdb/build-id.c 2015-11-14 16:08:57.874227260 +0100
+++ gdb-7.10.50.20151113/gdb/build-id.c 2015-11-14 16:09:19.791362472 +0100
@@ -35,6 +35,7 @@
#include "elf/common.h"
#include "elf-bfd.h"