d9daa262a4
- Enable librpm for version > librpm.so.3 [bsc#1145692]:
* Allow any librpm.so.x
* Fix unused variables in HAVE_LIBRPM code in
gdb-6.6-buildid-locate-rpm-suse.patch
* Add %build test to check for "zypper install <rpm-packagename>"
message
OBS-URL: https://build.opensuse.org/request/show/726802
OBS-URL: https://build.opensuse.org/package/show/devel:gcc/gdb?expand=0&rev=221
129 lines
4.3 KiB
Diff
129 lines
4.3 KiB
Diff
Index: gdb-7.12.1/gdb/build-id.c
|
|
===================================================================
|
|
--- gdb-7.12.1.orig/gdb/build-id.c 2017-02-14 15:56:04.000000000 +0100
|
|
+++ gdb-7.12.1/gdb/build-id.c 2017-02-14 15:58:29.000000000 +0100
|
|
@@ -841,9 +841,9 @@ missing_rpm_enlist_1 (const char *filena
|
|
if (h == NULL)
|
|
break;
|
|
|
|
- /* Verify the debuginfo file is not already installed. */
|
|
-
|
|
- debuginfo = headerFormat_p (h, "%{sourcerpm}-debuginfo.%{arch}",
|
|
+ /* The allocated memory gets utilized below for MISSING_RPM_HASH. */
|
|
+ debuginfo = headerFormat_p (h,
|
|
+ "%{name}-debuginfo-%{version}-%{release}.%{arch}",
|
|
&err);
|
|
if (!debuginfo)
|
|
{
|
|
@@ -851,60 +851,19 @@ missing_rpm_enlist_1 (const char *filena
|
|
err);
|
|
continue;
|
|
}
|
|
- /* s = `.src.rpm-debuginfo.%{arch}' */
|
|
- s = strrchr (debuginfo, '-') - srcrpmlen;
|
|
- s2 = NULL;
|
|
- if (s > debuginfo && memcmp (s, ".src.rpm", srcrpmlen) == 0)
|
|
- {
|
|
- /* s2 = `-%{release}.src.rpm-debuginfo.%{arch}' */
|
|
- s2 = (char *) memrchr (debuginfo, '-', s - debuginfo);
|
|
- }
|
|
- if (s2)
|
|
- {
|
|
- /* s2 = `-%{version}-%{release}.src.rpm-debuginfo.%{arch}' */
|
|
- s2 = (char *) memrchr (debuginfo, '-', s2 - debuginfo);
|
|
- }
|
|
- if (!s2)
|
|
- {
|
|
- warning (_("Error querying the rpm file `%s': %s"), filename,
|
|
- debuginfo);
|
|
- xfree (debuginfo);
|
|
- continue;
|
|
- }
|
|
- /* s = `.src.rpm-debuginfo.%{arch}' */
|
|
- /* s2 = `-%{version}-%{release}.src.rpm-debuginfo.%{arch}' */
|
|
- memmove (s2 + debuginfolen, s2, s - s2);
|
|
- memcpy (s2, "-debuginfo", debuginfolen);
|
|
- /* s = `XXXX.%{arch}' */
|
|
- /* strlen ("XXXX") == srcrpmlen + debuginfolen */
|
|
- /* s2 = `-debuginfo-%{version}-%{release}XX.%{arch}' */
|
|
- /* strlen ("XX") == srcrpmlen */
|
|
- memmove (s + debuginfolen, s + srcrpmlen + debuginfolen,
|
|
- strlen (s + srcrpmlen + debuginfolen) + 1);
|
|
- /* s = `-debuginfo-%{version}-%{release}.%{arch}' */
|
|
|
|
+ /* Verify the debuginfo file is not already installed. */
|
|
/* RPMDBI_PACKAGES requires keylen == sizeof (int). */
|
|
/* RPMDBI_LABEL is an interface for NVR-based dbiFindByLabel(). */
|
|
mi_debuginfo = rpmtsInitIterator_p (ts, (rpmTag) RPMDBI_LABEL, debuginfo, 0);
|
|
- xfree (debuginfo);
|
|
if (mi_debuginfo)
|
|
{
|
|
+ xfree (debuginfo);
|
|
rpmdbFreeIterator_p (mi_debuginfo);
|
|
count = 0;
|
|
break;
|
|
}
|
|
|
|
- /* The allocated memory gets utilized below for MISSING_RPM_HASH. */
|
|
- debuginfo = headerFormat_p (h,
|
|
- "%{name}-%{version}-%{release}.%{arch}",
|
|
- &err);
|
|
- if (!debuginfo)
|
|
- {
|
|
- warning (_("Error querying the rpm file `%s': %s"), filename,
|
|
- err);
|
|
- continue;
|
|
- }
|
|
-
|
|
/* Base package name for `debuginfo-install'. We do not use the
|
|
`yum' command directly as the line
|
|
yum --enablerepo='*debug*' install NAME-debuginfo.ARCH
|
|
@@ -1035,10 +994,7 @@ missing_rpm_list_print (void)
|
|
(int (*) (const void *, const void *)) missing_rpm_list_compar);
|
|
|
|
printf_unfiltered (_("Missing separate debuginfos, use: %s"),
|
|
-#ifdef DNF_DEBUGINFO_INSTALL
|
|
- "dnf "
|
|
-#endif
|
|
- "debuginfo-install");
|
|
+ "zypper install");
|
|
for (array_iter = array; array_iter < array + missing_rpm_list_entries;
|
|
array_iter++)
|
|
{
|
|
@@ -1251,13 +1207,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"),
|
|
-#ifdef DNF_DEBUGINFO_INSTALL
|
|
- "dnf"
|
|
-#else
|
|
- "yum"
|
|
-#endif
|
|
- " --enablerepo='*debug*' 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/build-id.c b/gdb/build-id.c
|
|
index b9ff15a..75d501a 100644
|
|
--- a/gdb/build-id.c
|
|
+++ b/gdb/build-id.c
|
|
@@ -864,10 +864,8 @@ missing_rpm_enlist_1 (const char *filename, int verify_vendor)
|
|
#endif
|
|
{
|
|
Header h;
|
|
- char *debuginfo, **slot, *s, *s2;
|
|
+ char *debuginfo, **slot;
|
|
errmsg_t err;
|
|
- size_t srcrpmlen = sizeof (".src.rpm") - 1;
|
|
- size_t debuginfolen = sizeof ("-debuginfo") - 1;
|
|
rpmdbMatchIterator mi_debuginfo;
|
|
|
|
h = rpmdbNextIterator_p (mi);
|