OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/rpm?expand=0&rev=51

debugedit.diff

@@ -1,7 +1,9 @@
 Make debugedit build without dwarf.h. Also fixes a logic bug for ppc.
 
---- ./tools/debugedit.c.orig	2005-12-15 14:28:49.000000000 +0000
-+++ ./tools/debugedit.c	2006-03-17 13:01:53.000000000 +0000
+Index: tools/debugedit.c
+===================================================================
+--- tools/debugedit.c.orig
++++ tools/debugedit.c
 @@ -34,7 +34,37 @@
  #include <popt.h>
  
@@ -39,14 +41,26 @@ Make debugedit build without dwarf.h. Also fixes a logic bug for ppc.
 +#define DW_FORM_ref_udata	0x15
 +#define DW_FORM_indirect	0x16
  
- #include "hashtab.h"
+ #include <beecrypt/beecrypt.h>
  
-@@ -1039,7 +1069,7 @@ edit_dwarf2 (DSO *dso)
- 		  break;
- 		case EM_PPC:
- 		case EM_PPC64:
--		  if (rtype != R_PPC_ADDR32 || rtype != R_PPC_UADDR32)
-+		  if (rtype != R_PPC_ADDR32 && rtype != R_PPC_UADDR32)
- 		    goto fail;
- 		  break;
- 		case EM_S390:
+@@ -1346,7 +1376,6 @@ handle_build_id (DSO *dso, Elf_Data *bui
+      or Elf64 object, only that we are consistent in what bits feed the
+      hash so it comes out the same for the same file contents.  */
+   {
+-    inline void process (const void *data, size_t size);
+     inline void process (const void *data, size_t size)
+     {
+       memchunk chunk = { .data = (void *) data, .size = size };
+Index: tools/Makefile.am
+===================================================================
+--- tools/Makefile.am.orig
++++ tools/Makefile.am
+@@ -39,7 +39,7 @@ debugedit_SOURCES =	debugedit.c hashtab.
+ #debugedit_LDADD =	@LDFLAGS_STATIC@ \
+ debugedit_LDADD =	\
+ 	@WITH_LIBELF_LIB@ \
+-	@WITH_BEECRYPT_LIB@ \
++	$(top_builddir)/rpmdb/librpmdb.la \
+ 	@WITH_POPT_LIB@
+ 
+ javadeps_SOURCES =	javadeps.c