rpms
/
gdb
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

More tweaks to gdb-6.6-buildid-locate-rpm.patch 

...in which rpmTag is replaced with rpmDbiTagVal.
This commit is contained in:
Kevin Buettner 2023-01-23 20:12:05 -07:00
parent e2df45df10
commit 8d8fb49148
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
gdb-6.6-buildid-locate.patch
View File

@ -787,10 +787,10 @@ diff --git a/gdb/build-id.c b/gdb/build-id.c
+ static rpmts (*rpmtsCreate_p) (void); + static rpmts (*rpmtsCreate_p) (void);
+ extern rpmts rpmtsFree(rpmts ts); + extern rpmts rpmtsFree(rpmts ts);
+ static rpmts (*rpmtsFree_p) (rpmts ts); + static rpmts (*rpmtsFree_p) (rpmts ts);
+ extern rpmdbMatchIterator rpmtsInitIterator(const rpmts ts, rpmTag rpmtag, + extern rpmdbMatchIterator rpmtsInitIterator(const rpmts ts, rpmDbiTagVal rpmtag,
+ const void * keyp, size_t keylen); + const void * keyp, size_t keylen);
+ static rpmdbMatchIterator (*rpmtsInitIterator_p) (const rpmts ts, + static rpmdbMatchIterator (*rpmtsInitIterator_p) (const rpmts ts,
+ rpmTag rpmtag, + rpmDbiTagVal rpmtag,
+ const void *keyp, + const void *keyp,
+ size_t keylen); + size_t keylen);
+#else /* !DLOPEN_LIBRPM */ +#else /* !DLOPEN_LIBRPM */
@ -845,7 +845,7 @@ diff --git a/gdb/build-id.c b/gdb/build-id.c
+ && (rpmdbNextIterator_p = (Header (*) (rpmdbMatchIterator mi)) dlsym (h, "rpmdbNextIterator")) + && (rpmdbNextIterator_p = (Header (*) (rpmdbMatchIterator mi)) dlsym (h, "rpmdbNextIterator"))
+ && (rpmtsCreate_p = (rpmts (*) (void)) dlsym (h, "rpmtsCreate")) + && (rpmtsCreate_p = (rpmts (*) (void)) dlsym (h, "rpmtsCreate"))
+ && (rpmtsFree_p = (rpmts (*) (rpmts ts)) dlsym (h, "rpmtsFree")) + && (rpmtsFree_p = (rpmts (*) (rpmts ts)) dlsym (h, "rpmtsFree"))
+ && (rpmtsInitIterator_p = (rpmdbMatchIterator (*) (const rpmts ts, rpmTag rpmtag, const void *keyp, size_t keylen)) dlsym (h, "rpmtsInitIterator")))) + && (rpmtsInitIterator_p = (rpmdbMatchIterator (*) (const rpmts ts, rpmDbiTagVal rpmtag, const void *keyp, size_t keylen)) dlsym (h, "rpmtsInitIterator"))))
+ { + {
+ warning (_("Opened library \"%s\" is incompatible (%s), " + warning (_("Opened library \"%s\" is incompatible (%s), "
+ "missing debuginfos notifications will not be displayed"), + "missing debuginfos notifications will not be displayed"),

4
gdb.spec
View File

@ -1190,6 +1190,10 @@ fi
%endif %endif
%changelog %changelog
* Mon Jan 23 2023 Kevin Buettner <kevinb@redhat.com>
- More tweaks to gdb-6.6-buildid-locate-rpm.patch, in which rpmTag
is replaced with rpmDbiTagVal.
* Mon Jan 23 2023 Keith Seitz <keiths@redhat.com> - 12.1-14 * Mon Jan 23 2023 Keith Seitz <keiths@redhat.com> - 12.1-14
From Sergey Mende: From Sergey Mende:
- Backport upstream patch "gdb: call check_typedef at beginning of - Backport upstream patch "gdb: call check_typedef at beginning of