mirror of
https://github.com/yann64/haikuports.git
synced 2026-04-09 05:10:05 +02:00
194 lines
7.5 KiB
Diff
194 lines
7.5 KiB
Diff
diff -Naur dwarf-20130729/dwarfdump/Makefile.in dwarf-20130729-c89/dwarfdump/Makefile.in
|
|
--- dwarf-20130729/dwarfdump/Makefile.in 2013-02-02 19:13:55.002621440 +0000
|
|
+++ dwarf-20130729-c89/dwarfdump/Makefile.in 2014-01-05 16:25:11.063963136 +0000
|
|
@@ -13,7 +13,7 @@
|
|
exec_prefix = @exec_prefix@
|
|
bindir = $(exec_prefix)/bin
|
|
libdir = $(exec_prefix)/lib
|
|
-mandir = $(exec_prefix)/share/man
|
|
+mandir = $(exec_prefix)/documentation/man
|
|
man1dir = $(mandir)/man1
|
|
|
|
|
|
@@ -154,9 +154,11 @@
|
|
# will work and leave sensible permissions on the resulting files.
|
|
# Some adjustment might be required, see README.
|
|
install: all
|
|
- $(INSTALL) dwarfdump $(bindir)/dwarfdump
|
|
- $(INSTALL) $(srcdir)/dwarfdump.conf $(libdir)/dwarfdump.conf
|
|
- $(INSTALL) $(srcdir)/dwarfdump.1 $(man1dir)/dwarfdump.1
|
|
+ install -m 0755 -d $(bindir)
|
|
+ install -m 0755 -d $(man1dir)
|
|
+ install -m 0755 dwarfdump $(bindir)
|
|
+ install -m 0755 dwarfdump.conf $(libdir)
|
|
+ install -m 0755 dwarfdump.1 $(man1dir)
|
|
|
|
uninstall:
|
|
-rm -f $(bindir)/dwarfdump
|
|
diff -Naur dwarf-20130729/dwarfdump/print_die.c dwarf-20130729-c89/dwarfdump/print_die.c
|
|
--- dwarf-20130729/dwarfdump/print_die.c 2013-02-06 20:48:07.062652416 +0000
|
|
+++ dwarf-20130729-c89/dwarfdump/print_die.c 2014-01-05 16:22:51.478150656 +0000
|
|
@@ -3380,6 +3380,7 @@
|
|
we have a serious botch. this FORM
|
|
defines the value as a .debug_info
|
|
global offset. */
|
|
+ int res = 0;
|
|
Dwarf_Off cuoff = 0;
|
|
Dwarf_Off culen = 0;
|
|
Dwarf_Off die_overall_offset = 0;
|
|
@@ -3399,7 +3400,7 @@
|
|
print_error(dbg,small_buf,DW_DLV_OK,0);
|
|
}
|
|
|
|
- int res = dwarf_die_CU_offset_range(die,&cuoff,
|
|
+ res = dwarf_die_CU_offset_range(die,&cuoff,
|
|
&culen,&err);
|
|
DWARF_CHECK_COUNT(tag_tree_result,1);
|
|
if (res != DW_DLV_OK) {
|
|
diff -Naur dwarf-20130729/dwarfdump2/dwarfdump.cc dwarf-20130729-c89/dwarfdump2/dwarfdump.cc
|
|
--- dwarf-20130729/dwarfdump2/dwarfdump.cc 2013-07-30 16:12:36.003932160 +0000
|
|
+++ dwarf-20130729-c89/dwarfdump2/dwarfdump.cc 2014-01-05 16:22:51.481820672 +0000
|
|
@@ -47,6 +47,7 @@
|
|
#include <vector>
|
|
#include <algorithm> // for sort
|
|
#include <iomanip>
|
|
+#include <streambuf.h>
|
|
|
|
/* for 'open' */
|
|
#include <sys/types.h>
|
|
@@ -2413,7 +2414,7 @@
|
|
Compiler *pCompiler, Dwarf_Check_Categories category)
|
|
{
|
|
Dwarf_Check_Result result = pCompiler->results_[category];
|
|
- cerr << std::setw(24) << std::left << str <<
|
|
+ cerr << std::setw(24) << ios::left << str <<
|
|
IToDec(result.checks_,10) <<
|
|
" " <<
|
|
IToDec(result.errors_,10) << endl;
|
|
diff -Naur dwarf-20130729/dwarfdump2/Makefile.in dwarf-20130729-c89/dwarfdump2/Makefile.in
|
|
--- dwarf-20130729/dwarfdump2/Makefile.in 2013-02-02 19:16:44.009437184 +0000
|
|
+++ dwarf-20130729-c89/dwarfdump2/Makefile.in 2014-01-05 16:23:35.852230144 +0000
|
|
@@ -13,7 +13,7 @@
|
|
exec_prefix = @exec_prefix@
|
|
bindir = $(exec_prefix)/bin
|
|
libdir = $(exec_prefix)/lib
|
|
-mandir = $(exec_prefix)/share/man
|
|
+mandir = $(exec_prefix)/documentation/man
|
|
man1dir = $(mandir)/man1
|
|
|
|
INSTALL = @INSTALL@
|
|
@@ -133,9 +133,11 @@
|
|
# will work and leave sensible permissions on the resulting files.
|
|
# Some adjustment might be required, see README.
|
|
install: all
|
|
- $(INSTALL) dwarfdump $(bindir)/dwarfdump
|
|
- $(INSTALL) $(srcdir)/dwarfdump.1 $(man1dir)/dwarfdump.1
|
|
- $(INSTALL) $(srcdir)/dwarfdump.conf $(libdir)/dwarfdump.conf
|
|
+ install -m 0755 -d $(bindir)
|
|
+ install -m 0755 -d $(man1dir)
|
|
+ install -m 0755 dwarfdump $(bindir)
|
|
+ install -m 0755 dwarfdump.conf $(libdir)
|
|
+ install -m 0755 dwarfdump.1 $(man1dir)
|
|
|
|
uninstall:
|
|
-rm -f $(bindir)/dwarfdump
|
|
diff -Naur dwarf-20130729/dwarfgen/createirepformfrombinary.cc dwarf-20130729-c89/dwarfgen/createirepformfrombinary.cc
|
|
--- dwarf-20130729/dwarfgen/createirepformfrombinary.cc 2013-02-01 16:20:06.058720256 +0000
|
|
+++ dwarf-20130729-c89/dwarfgen/createirepformfrombinary.cc 2014-01-05 16:22:51.505413632 +0000
|
|
@@ -28,7 +28,6 @@
|
|
#include <string.h> // For memset etc
|
|
#include <sys/stat.h> //open
|
|
#include <fcntl.h> //open
|
|
-#include "elf.h"
|
|
#include "gelf.h"
|
|
#include "strtabdata.h"
|
|
#include "dwarf.h"
|
|
diff -Naur dwarf-20130729/dwarfgen/createirepfrombinary.cc dwarf-20130729-c89/dwarfgen/createirepfrombinary.cc
|
|
--- dwarf-20130729/dwarfgen/createirepfrombinary.cc 2013-02-01 16:20:11.059768832 +0000
|
|
+++ dwarf-20130729-c89/dwarfgen/createirepfrombinary.cc 2014-01-05 16:22:51.529530880 +0000
|
|
@@ -30,7 +30,6 @@
|
|
#include <string.h> // For memset etc
|
|
#include <sys/stat.h> //open
|
|
#include <fcntl.h> //open
|
|
-#include "elf.h"
|
|
#include "gelf.h"
|
|
#include "strtabdata.h"
|
|
#include "dwarf.h"
|
|
diff -Naur dwarf-20130729/dwarfgen/dwarfgen.cc dwarf-20130729-c89/dwarfgen/dwarfgen.cc
|
|
--- dwarf-20130729/dwarfgen/dwarfgen.cc 2013-02-01 16:20:17.061079552 +0000
|
|
+++ dwarf-20130729-c89/dwarfgen/dwarfgen.cc 2014-01-05 16:22:51.540540928 +0000
|
|
@@ -56,8 +56,8 @@
|
|
#include <string.h> // For memset etc
|
|
#include <sys/stat.h> //open
|
|
#include <fcntl.h> //open
|
|
+#include <stdint.h>
|
|
#include "general.h"
|
|
-#include "elf.h"
|
|
#include "gelf.h"
|
|
#include "strtabdata.h"
|
|
#include "dwarf.h"
|
|
diff -Naur dwarf-20130729/dwarfgen/irepattrtodbg.cc dwarf-20130729-c89/dwarfgen/irepattrtodbg.cc
|
|
--- dwarf-20130729/dwarfgen/irepattrtodbg.cc 2013-02-01 16:20:21.059244544 +0000
|
|
+++ dwarf-20130729-c89/dwarfgen/irepattrtodbg.cc 2014-01-05 16:22:51.567279616 +0000
|
|
@@ -30,7 +30,6 @@
|
|
#include <sys/stat.h> //open
|
|
#include <fcntl.h> //open
|
|
#include "general.h"
|
|
-#include "elf.h"
|
|
#include "gelf.h"
|
|
#include "strtabdata.h"
|
|
#include "dwarf.h"
|
|
diff -Naur dwarf-20130729/dwarfgen/ireptodbg.cc dwarf-20130729-c89/dwarfgen/ireptodbg.cc
|
|
--- dwarf-20130729/dwarfgen/ireptodbg.cc 2013-02-01 16:20:26.060293120 +0000
|
|
+++ dwarf-20130729-c89/dwarfgen/ireptodbg.cc 2014-01-05 16:22:51.570163200 +0000
|
|
@@ -28,7 +28,6 @@
|
|
#include <string.h> // For memset etc
|
|
#include <sys/stat.h> //open
|
|
#include <fcntl.h> //open
|
|
-#include "elf.h"
|
|
#include "gelf.h"
|
|
#include "strtabdata.h"
|
|
#include "dwarf.h"
|
|
diff -Naur dwarf-20130729/libdwarf/gennames.c dwarf-20130729-c89/libdwarf/gennames.c
|
|
--- dwarf-20130729/libdwarf/gennames.c 2013-01-25 19:09:11.027525120 +0000
|
|
+++ dwarf-20130729-c89/libdwarf/gennames.c 2014-01-05 16:22:51.591134720 +0000
|
|
@@ -486,8 +486,8 @@
|
|
|
|
/* Process each line from 'dwarf.h' */
|
|
while (!feof(f_dwarf_in)) {
|
|
- errno = 0;
|
|
char *fgbad = fgets(line_in,sizeof(line_in),f_dwarf_in);
|
|
+ errno = 0;
|
|
if(!fgbad) {
|
|
if(feof(f_dwarf_in)) {
|
|
break;
|
|
diff -Naur dwarf-20130729/libdwarf/Makefile.in dwarf-20130729-c89/libdwarf/Makefile.in
|
|
--- dwarf-20130729/libdwarf/Makefile.in 2013-07-28 17:58:54.027525120 +0000
|
|
+++ dwarf-20130729-c89/libdwarf/Makefile.in 2014-01-05 16:22:51.592969728 +0000
|
|
@@ -46,8 +46,9 @@
|
|
|
|
prefix = @prefix@
|
|
exec_prefix = @exec_prefix@
|
|
-bindir = $(exec_prefix)/bin
|
|
-libdir = $(exec_prefix)/lib
|
|
+bindir = $(DESTDIR)$(prefix)/bin
|
|
+libdir = $(DESTDIR)$(prefix)/lib
|
|
+incdir = $(DESTDIR)$(prefix)/develop/headers/libdwarf
|
|
|
|
INSTALL = @INSTALL@
|
|
INSTALL_PROGRAM = @INSTALL_PROGRAM@
|
|
@@ -213,8 +214,11 @@
|
|
rm -f dwarf_names_enum.h dwarf_names_new.h dwarf_names.c dwarf_names.h
|
|
|
|
install: all
|
|
- echo "No install provided, see comments in the README"
|
|
-
|
|
+ install -m 0755 -d $(incdir)
|
|
+ install -m 0755 -d $(libdir)
|
|
+ install -m 0755 libdwarf.h $(incdir)
|
|
+ install -m 0755 dwarf.h $(incdir)
|
|
+ install -m 0755 libdwarf.so $(libdir)
|
|
distclean: clean
|
|
rm -f config.status config.log config.cache config.h
|
|
rm -rf autom4te.cache
|