From 03615dd0aafcea8aa9417d56687aa909e8699566498b27e8ad520f2e799703ef Mon Sep 17 00:00:00 2001 From: OBS User unknown Date: Thu, 7 May 2009 15:40:45 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/gdb?expand=0&rev=58 --- gdb-6.6-buildid-locate-rpm-suse.patch | 19 +++++++++++++++++++ gdb.changes | 6 ++++++ gdb.spec | 14 ++++++++++++-- 3 files changed, 37 insertions(+), 2 deletions(-) create mode 100644 gdb-6.6-buildid-locate-rpm-suse.patch diff --git a/gdb-6.6-buildid-locate-rpm-suse.patch b/gdb-6.6-buildid-locate-rpm-suse.patch new file mode 100644 index 0000000..01c90e3 --- /dev/null +++ b/gdb-6.6-buildid-locate-rpm-suse.patch @@ -0,0 +1,19 @@ +Index: gdb-6.8.50.20090302/gdb/symfile.c +=================================================================== +--- gdb-6.8.50.20090302.orig/gdb/symfile.c 2009-05-07 16:02:18.000000000 +0200 ++++ gdb-6.8.50.20090302/gdb/symfile.c 2009-05-07 16:05:42.000000000 +0200 +@@ -2188,8 +2188,12 @@ debug_print_missing (const char *binary, + fprintf_unfiltered (gdb_stdlog, + _("Missing separate debuginfo for %s\n"), binary); + if (debug != NULL) +- fprintf_unfiltered (gdb_stdlog, _("Try: %s %s\n"), +- "yum --enablerepo='*-debuginfo' install", debug); ++ { ++ const char *p = strrchr (debug, '/'); ++ fprintf_unfiltered (gdb_stdlog, _("Try: %s%.2s%.38s\"\n"), ++ "zypper install -C \"debuginfo(build-id)=", ++ p - 2, p + 1); ++ } + } + } + diff --git a/gdb.changes b/gdb.changes index 044a078..dea7831 100644 --- a/gdb.changes +++ b/gdb.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu May 7 15:00:14 CEST 2009 - rguenther@suse.de + +- Fix build for SLE10. [fate#305977] +- Adjust missing debug packages suggested install command. + ------------------------------------------------------------------- Wed Apr 29 15:11:15 CEST 2009 - rguenther@suse.de diff --git a/gdb.spec b/gdb.spec index 3086c82..86dc99c 100644 --- a/gdb.spec +++ b/gdb.spec @@ -23,7 +23,7 @@ Name: gdb # NOTE: the FSF gdb versions are numbered N.M for official releases, like 6.3 # and, since January 2005, X.Y.Z.date for daily snapshots, like 6.3.50.20050112 # (daily snapshot from mailine), or 6.3.0.20040112 (head of the release branch). Version: 6.8.50.20090302 -Release: 1 +Release: 2 # The release always contains a leading reserved number, start it at 1. # `upstream' is not a part of `name' to stay fully rpm dependencies compatible for the testing. License: GNU Free Documentation License, Version 1.2 (GFDL 1.2); GPL v2 or later; GPL v3 or later @@ -281,7 +281,13 @@ Patch359: gdb-charset-crash.patch # Fix readline 5.1 warnings Patch1000: readline-5.1-random.patch Patch1001: gdb-readline6.patch -BuildRequires: bison flex gettext glibc-devel libexpat-devel ncurses-devel texinfo zlib-devel +Patch1002: gdb-6.6-buildid-locate-rpm-suse.patch +BuildRequires: bison flex gettext glibc-devel ncurses-devel texinfo zlib-devel +%if %{suse_version} < 1020 +BuildRequires: expat +%else +BuildRequires: libexpat-devel +%endif BuildRequires: readline-devel # dlopen() no longer makes rpm-libs a mandatory dependency. #Requires: rpm-libs @@ -497,6 +503,7 @@ rm -f gdb/jv-exp.c gdb/m2-exp.c gdb/objc-exp.c gdb/p-exp.c %if %{suse_version} > 1110 %patch1001 %endif +%patch1002 -p1 find -name "*.orig" | xargs rm -f ! find -name "*.rej" # Should not happen. %endif # 0%{!?_with_upstream:1} @@ -746,6 +753,9 @@ fi %endif %changelog +* Thu May 07 2009 rguenther@suse.de +- Fix build for SLE10. [fate#305977] +- Adjust missing debug packages suggested install command. * Wed Apr 29 2009 rguenther@suse.de - Adjust package name and release to not contain macros. * Mon Apr 27 2009 rguenther@suse.de