Make debugedit build without dwarf.h

diff --git a/Makefile.am b/Makefile.am
index 9e170df99b8d8d14d1ed2c2df79db229ae5074c3..7683a44b54b00fbc42791785a41826ebf9680203 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -150,7 +150,6 @@ rpm2cpio_LDADD +=   @WITH_NSS_LIB@ @WITH_POPT_LIB@ @WITH_ZLIB_LIB@
 
 
 if LIBELF
-if LIBDWARF
 rpmconfig_SCRIPTS += scripts/find-debuginfo.sh
 
 rpmlibexec_PROGRAMS += debugedit
@@ -163,7 +162,6 @@ elfdeps_SOURCES =   tools/elfdeps.c
 elfdeps_LDADD =                rpmio/librpmio.la
 elfdeps_LDADD +=       @WITH_LIBELF_LIB@ @WITH_POPT_LIB@
 endif
-endif
 
 rpmlibexec_PROGRAMS += rpmdeps
 rpmdeps_SOURCES =      tools/rpmdeps.c

diff --git a/tools/debugedit.c b/tools/debugedit.c
index f48d6f7a103188c769e5b1c06b165d82047c840f..bb9336c38c76cea5edf0ffe76d88e32eac4d90c6 100644 (file)
--- a/tools/debugedit.c
+++ b/tools/debugedit.c
@@ -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>