openSUSE Build Service

Overview Repositories Revisions Requests Users Attributes Meta

File debugedit.diff of Package rpm (Revision 608d2274340caab3506def9cdf74caf5)

Currently displaying revision 608d2274340caab3506def9cdf74caf5 , Show latest

Make debugedit build without dwarf.h

--- ./Makefile.am.orig	2010-12-22 11:17:20.000000000 +0000
+++ ./Makefile.am	2011-05-10 16:03:49.000000000 +0000
@@ -143,7 +143,6 @@ rpm2cpio_LDADD +=	@WITH_NSS_LIB@ @WITH_P
 
 
 if LIBELF
-if LIBDWARF
 rpmconfig_SCRIPTS += scripts/find-debuginfo.sh
 
 rpmlibexec_PROGRAMS +=	debugedit
@@ -156,7 +155,6 @@ elfdeps_SOURCES =	tools/elfdeps.c
 elfdeps_LDADD =		rpmio/librpmio.la
 elfdeps_LDADD +=	@WITH_LIBELF_LIB@ @WITH_POPT_LIB@
 endif
-endif
 
 rpmlibexec_PROGRAMS +=	javadeps
 javadeps_SOURCES =	tools/javadeps.c
--- ./tools/debugedit.c.orig	2010-12-03 12:11:57.000000000 +0000
+++ ./tools/debugedit.c	2011-05-10 16:03:49.000000000 +0000
@@ -37,7 +37,37 @@
 #include <popt.h>
 
 #include <gelf.h>
-#include <dwarf.h>
+
+
+/* some defines taken from the dwarf standard */
+
+#define DW_TAG_compile_unit	0x11
+
+#define DW_AT_name		0x03
+#define DW_AT_stmt_list		0x10
+#define DW_AT_comp_dir		0x1b
+
+#define DW_FORM_addr		0x01
+#define DW_FORM_block2		0x03
+#define DW_FORM_block4		0x04
+#define DW_FORM_data2		0x05
+#define DW_FORM_data4		0x06
+#define DW_FORM_data8		0x07
+#define DW_FORM_string		0x08
+#define DW_FORM_block		0x09
+#define DW_FORM_block1		0x0a
+#define DW_FORM_data1		0x0b
+#define DW_FORM_flag		0x0c
+#define DW_FORM_sdata		0x0d
+#define DW_FORM_strp		0x0e
+#define DW_FORM_udata		0x0f
+#define DW_FORM_ref_addr	0x10
+#define DW_FORM_ref1		0x11
+#define DW_FORM_ref2		0x12
+#define DW_FORM_ref4		0x13
+#define DW_FORM_ref8		0x14
+#define DW_FORM_ref_udata	0x15
+#define DW_FORM_indirect	0x16
 
 #include <rpm/rpmio.h>
 #include <rpm/rpmpgp.h>

Places

File debugedit.diff of Package rpm (Revision 608d2274340caab3506def9cdf74caf5)

Places