Michael Schröder
dc6592c036
OBS-URL: https://build.opensuse.org/package/show/Base:System/rpm?expand=0&rev=507
70 lines
1.8 KiB
Diff
70 lines
1.8 KiB
Diff
Make debugedit build without dwarf.h
|
|
|
|
--- ./Makefile.am.orig 2019-06-26 14:17:31.394985722 +0000
|
|
+++ ./Makefile.am 2019-10-02 09:48:35.949316743 +0000
|
|
@@ -167,7 +167,6 @@ rpm2archive_LDADD += @WITH_POPT_LIB@ @WI
|
|
|
|
|
|
if LIBELF
|
|
-if LIBDWARF
|
|
if LIBDW
|
|
rpmconfig_SCRIPTS += scripts/find-debuginfo.sh
|
|
|
|
@@ -181,7 +180,6 @@ else
|
|
debugedit_LDADD += @WITH_LIBDW_LIB@ -lebl
|
|
endif # HAVE_LIBDW_STRTAB
|
|
endif # LIBDW
|
|
-endif # LIBDWARF
|
|
rpmlibexec_PROGRAMS += elfdeps
|
|
elfdeps_SOURCES = tools/elfdeps.c
|
|
elfdeps_LDADD = rpmio/librpmio.la
|
|
--- ./tools/debugedit.c.orig 2019-06-26 14:17:31.462985619 +0000
|
|
+++ ./tools/debugedit.c 2019-10-02 09:48:35.953316735 +0000
|
|
@@ -39,7 +39,45 @@
|
|
#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
|
|
+
|
|
+#define DW_MACRO_GNU_define 1
|
|
+#define DW_MACRO_GNU_undef 2
|
|
+#define DW_MACRO_GNU_start_file 3
|
|
+#define DW_MACRO_GNU_end_file 4
|
|
+#define DW_MACRO_GNU_define_indirect 5
|
|
+#define DW_MACRO_GNU_undef_indirect 6
|
|
+#define DW_MACRO_GNU_transparent_include 7
|
|
|
|
|
|
/* Unfortunately strtab manipulation functions were only officially added
|