From a138d3c5774e63c9209ece6799d61aaa16e5abb3 Mon Sep 17 00:00:00 2001 From: munchausen Date: Fri, 3 Jan 2014 14:49:37 +0000 Subject: [PATCH 01/11] Update libelf-0.8.13.recipe for PM --- dev-libs/libelf/libelf-0.8.13.recipe | 53 +++++++++++++++++++++------- 1 file changed, 41 insertions(+), 12 deletions(-) diff --git a/dev-libs/libelf/libelf-0.8.13.recipe b/dev-libs/libelf/libelf-0.8.13.recipe index ce1ff7e9d..eb7745355 100644 --- a/dev-libs/libelf/libelf-0.8.13.recipe +++ b/dev-libs/libelf/libelf-0.8.13.recipe @@ -1,24 +1,53 @@ +SUMMARY="libelf" DESCRIPTION="libelf - ELF object file access library" HOMEPAGE="http://www.mr511.de/software/english.html" SRC_URI="http://www.mr511.de/software/libelf-0.8.13.tar.gz" CHECKSUM_MD5="4136d7b4c04df68b686570afa26988ac" +LICENSE="GNU LGPL v2" +COPYRIGHT="1995-2008 Michael Riepe" REVISION="1" -STATUS_HAIKU="stable" -DEPEND="" +ARCHITECTURES="x86 x86_gcc2" +SECONDARY_ARCHITECTURES="x86_gcc2 x86" +SOURCE_DIR="$portVersionedName" +PATCHES="libelf-0.8.13.patch" + +PROVIDES=" + lib:libelf$secondaryArchSuffix = $portVersion + " +REQUIRES=" + haiku$secondaryArchSuffix >= $haikuVersion + " +BUILD_REQUIRES="" + +BUILD_PREREQUIRES=" + haiku${secondaryArchSuffix}_devel >= $haikuVersion + cmd:gcc + cmd:ld + cmd:libtoolize + cmd:autoreconf + cmd:make + " + BUILD() { - cd libelf-0.8.13 - libtoolize -fci - autoreconf - ./configure --enable-gnu-names --prefix=$(finddir B_COMMON_DIRECTORY) - make + libtoolize -fci + autoreconf + runConfigure ./configure + make } INSTALL() { - cd libelf-0.8.13 - make install instroot=$DESTDIR - make install-compat instroot=$DESTDIR + make install + make install-compat + prepareInstalledDevelLib libelf + packageEntries devel $developDir } -LICENSE="GNU LGPL v2" -COPYRIGHT="1995-2008 Michael Riepe" + +PROVIDES_devel=" + devel:libelf$secondaryArchSuffix = $portVersion + " + +REQUIRES_devel=" + lib:libelf$secondaryArchSuffix == $portVersion + " From 48c6c24b1addd2b678105628ea7d7dc32be0b885 Mon Sep 17 00:00:00 2001 From: munchausen Date: Fri, 3 Jan 2014 15:00:43 +0000 Subject: [PATCH 02/11] Update libdwarf-20120410.recipe for PM --- dev-libs/libdwarf/libdwarf-20120410.recipe | 83 ++++++++++++++++------ 1 file changed, 63 insertions(+), 20 deletions(-) diff --git a/dev-libs/libdwarf/libdwarf-20120410.recipe b/dev-libs/libdwarf/libdwarf-20120410.recipe index 01c895b41..e1ffe6aed 100644 --- a/dev-libs/libdwarf/libdwarf-20120410.recipe +++ b/dev-libs/libdwarf/libdwarf-20120410.recipe @@ -1,30 +1,73 @@ +SUMMARY="libdwarf and dwarfdump" DESCRIPTION="libdwarf and dwarfdump - library and utility for working with DWARF Debugging Information Format" -HOMEPAGE="http://reality.sgiweb.org/davea/dwarf.html" -SRC_URI="http://reality.sgiweb.org/davea/libdwarf-20120410.tar.gz" -CHECKSUM_MD5="77c8b351f11738bc9fa50474a69d5b36" +HOMEPAGE="http://www.prevanders.net/dwarf.html" +SRC_URI="http://www.prevanders.net/libdwarf-20130729.tar.gz" +CHECKSUM_MD5="4cc5e48693f7b93b7aa0261e63c0e21d" +LICENSE=" + GNU GPL v2 + GNU LGPL v2.1 + " +COPYRIGHT=" + 2000,2002,2004,2005 Silicon Graphics, Inc. All Rights Reserved. + 2007-2010 David Anderson. All Rights Reserved. + 2007-2010 Sun Microsystems, Inc. All rights reserved + " REVISION="1" -STATUS_HAIKU="stable" -DEPEND="dev-libs/libelf >= 0.8.13" +ARCHITECTURES="x86 x86_gcc2" +SECONDARY_ARCHITECTURES="x86_gcc2 x86" +SOURCE_DIR="dwarf-20130729" +PATCHES="libdwarf-20130729.patch" + +PROVIDES=" + lib:libdwarf$secondaryArchSuffix = $portVersion + cmd:dwarfdump = $portVersion + " +# cmd:dwarfdump2 = $portVersion +# " + +REQUIRES=" + haiku$secondaryArchSuffix >= $haikuVersion + lib:libelf$secondaryArchSuffix + " + +BUILD_REQUIRES=" + lib:libelf$secondaryArchSuffix + devel:libelf$secondaryArchSuffix + " + +BUILD_PREREQUIRES=" + haiku${secondaryArchSuffix}_devel >= $haikuVersion + cmd:gcc$secondaryArchSuffix + cmd:ld$secondaryArchSuffix + cmd:make + " + BUILD() { - cd dwarf-20120410/libdwarf - ./configure --enable-shared --prefix=$(finddir B_COMMON_DIRECTORY) - make - cd ../dwarfdump - LDFLAGS="-L../libdwarf -L/boot/common/lib" ./configure --prefix=$(finddir B_COMMON_DIRECTORY) - LIBRARY_PATH=$LIBRARY_PATH:../libdwarf/ make + cd libdwarf + runConfigure ./configure --enable-shared + make + cd ../dwarfdump + LDFLAGS="-L../libdwarf -L/boot/common/lib" ./configure $configureDirArgs + LIBRARY_PATH=$LIBRARY_PATH:../libdwarf/ make } INSTALL() { - cd dwarf-20120410/libdwarf - make install - cd ../dwarfdump - make install + cd libdwarf + make install + cd ../dwarfdump + make install + #prepareInstalledDevelLib libdwarf + packageEntries devel develop } -LICENSE="GNU GPL v2 - GNU LGPL v2.1" -COPYRIGHT="2000,2002,2004,2005 Silicon Graphics, Inc. All Rights Reserved. - 2007-2010 David Anderson. All Rights Reserved. - 2007-2010 Sun Microsystems, Inc. All rights reserved" +PROVIDES_devel=" + devel:libdwarf$secondaryArchSuffix = $portVersion + " + +REQUIRES_devel=" + lib:libelf$secondaryArchSuffix + devel:libelf$secondaryArchSuffix + lib:libdwarf$secondaryArchSuffix == $portVersion + " From ecdb9b4329e35fe8d56f3f5ff947d70abbd8bdbe Mon Sep 17 00:00:00 2001 From: Ed Robbins Date: Fri, 3 Jan 2014 15:18:58 +0000 Subject: [PATCH 03/11] Add recipe for libdwarf, basedlatest version --- dev-libs/libdwarf/libdwarf-20120410.recipe | 83 +++++-------------- dev-libs/libdwarf/libdwarf-20130729.recipe | 73 ++++++++++++++++ .../libdwarf/patches/libdwarf-20130729.patch | 79 ++++++++++++++++++ 3 files changed, 172 insertions(+), 63 deletions(-) create mode 100644 dev-libs/libdwarf/libdwarf-20130729.recipe create mode 100644 dev-libs/libdwarf/patches/libdwarf-20130729.patch diff --git a/dev-libs/libdwarf/libdwarf-20120410.recipe b/dev-libs/libdwarf/libdwarf-20120410.recipe index e1ffe6aed..01c895b41 100644 --- a/dev-libs/libdwarf/libdwarf-20120410.recipe +++ b/dev-libs/libdwarf/libdwarf-20120410.recipe @@ -1,73 +1,30 @@ -SUMMARY="libdwarf and dwarfdump" DESCRIPTION="libdwarf and dwarfdump - library and utility for working with DWARF Debugging Information Format" -HOMEPAGE="http://www.prevanders.net/dwarf.html" -SRC_URI="http://www.prevanders.net/libdwarf-20130729.tar.gz" -CHECKSUM_MD5="4cc5e48693f7b93b7aa0261e63c0e21d" -LICENSE=" - GNU GPL v2 - GNU LGPL v2.1 - " -COPYRIGHT=" - 2000,2002,2004,2005 Silicon Graphics, Inc. All Rights Reserved. - 2007-2010 David Anderson. All Rights Reserved. - 2007-2010 Sun Microsystems, Inc. All rights reserved - " +HOMEPAGE="http://reality.sgiweb.org/davea/dwarf.html" +SRC_URI="http://reality.sgiweb.org/davea/libdwarf-20120410.tar.gz" +CHECKSUM_MD5="77c8b351f11738bc9fa50474a69d5b36" REVISION="1" -ARCHITECTURES="x86 x86_gcc2" -SECONDARY_ARCHITECTURES="x86_gcc2 x86" -SOURCE_DIR="dwarf-20130729" -PATCHES="libdwarf-20130729.patch" - -PROVIDES=" - lib:libdwarf$secondaryArchSuffix = $portVersion - cmd:dwarfdump = $portVersion - " -# cmd:dwarfdump2 = $portVersion -# " - -REQUIRES=" - haiku$secondaryArchSuffix >= $haikuVersion - lib:libelf$secondaryArchSuffix - " - -BUILD_REQUIRES=" - lib:libelf$secondaryArchSuffix - devel:libelf$secondaryArchSuffix - " - -BUILD_PREREQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion - cmd:gcc$secondaryArchSuffix - cmd:ld$secondaryArchSuffix - cmd:make - " - +STATUS_HAIKU="stable" +DEPEND="dev-libs/libelf >= 0.8.13" BUILD() { - cd libdwarf - runConfigure ./configure --enable-shared - make - cd ../dwarfdump - LDFLAGS="-L../libdwarf -L/boot/common/lib" ./configure $configureDirArgs - LIBRARY_PATH=$LIBRARY_PATH:../libdwarf/ make + cd dwarf-20120410/libdwarf + ./configure --enable-shared --prefix=$(finddir B_COMMON_DIRECTORY) + make + cd ../dwarfdump + LDFLAGS="-L../libdwarf -L/boot/common/lib" ./configure --prefix=$(finddir B_COMMON_DIRECTORY) + LIBRARY_PATH=$LIBRARY_PATH:../libdwarf/ make } INSTALL() { - cd libdwarf - make install - cd ../dwarfdump - make install - #prepareInstalledDevelLib libdwarf - packageEntries devel develop + cd dwarf-20120410/libdwarf + make install + cd ../dwarfdump + make install } -PROVIDES_devel=" - devel:libdwarf$secondaryArchSuffix = $portVersion - " - -REQUIRES_devel=" - lib:libelf$secondaryArchSuffix - devel:libelf$secondaryArchSuffix - lib:libdwarf$secondaryArchSuffix == $portVersion - " +LICENSE="GNU GPL v2 + GNU LGPL v2.1" +COPYRIGHT="2000,2002,2004,2005 Silicon Graphics, Inc. All Rights Reserved. + 2007-2010 David Anderson. All Rights Reserved. + 2007-2010 Sun Microsystems, Inc. All rights reserved" diff --git a/dev-libs/libdwarf/libdwarf-20130729.recipe b/dev-libs/libdwarf/libdwarf-20130729.recipe new file mode 100644 index 000000000..e1ffe6aed --- /dev/null +++ b/dev-libs/libdwarf/libdwarf-20130729.recipe @@ -0,0 +1,73 @@ +SUMMARY="libdwarf and dwarfdump" +DESCRIPTION="libdwarf and dwarfdump - library and utility for working with DWARF Debugging Information Format" +HOMEPAGE="http://www.prevanders.net/dwarf.html" +SRC_URI="http://www.prevanders.net/libdwarf-20130729.tar.gz" +CHECKSUM_MD5="4cc5e48693f7b93b7aa0261e63c0e21d" +LICENSE=" + GNU GPL v2 + GNU LGPL v2.1 + " +COPYRIGHT=" + 2000,2002,2004,2005 Silicon Graphics, Inc. All Rights Reserved. + 2007-2010 David Anderson. All Rights Reserved. + 2007-2010 Sun Microsystems, Inc. All rights reserved + " +REVISION="1" +ARCHITECTURES="x86 x86_gcc2" +SECONDARY_ARCHITECTURES="x86_gcc2 x86" +SOURCE_DIR="dwarf-20130729" +PATCHES="libdwarf-20130729.patch" + +PROVIDES=" + lib:libdwarf$secondaryArchSuffix = $portVersion + cmd:dwarfdump = $portVersion + " +# cmd:dwarfdump2 = $portVersion +# " + +REQUIRES=" + haiku$secondaryArchSuffix >= $haikuVersion + lib:libelf$secondaryArchSuffix + " + +BUILD_REQUIRES=" + lib:libelf$secondaryArchSuffix + devel:libelf$secondaryArchSuffix + " + +BUILD_PREREQUIRES=" + haiku${secondaryArchSuffix}_devel >= $haikuVersion + cmd:gcc$secondaryArchSuffix + cmd:ld$secondaryArchSuffix + cmd:make + " + +BUILD() +{ + cd libdwarf + runConfigure ./configure --enable-shared + make + cd ../dwarfdump + LDFLAGS="-L../libdwarf -L/boot/common/lib" ./configure $configureDirArgs + LIBRARY_PATH=$LIBRARY_PATH:../libdwarf/ make +} + +INSTALL() +{ + cd libdwarf + make install + cd ../dwarfdump + make install + #prepareInstalledDevelLib libdwarf + packageEntries devel develop +} + +PROVIDES_devel=" + devel:libdwarf$secondaryArchSuffix = $portVersion + " + +REQUIRES_devel=" + lib:libelf$secondaryArchSuffix + devel:libelf$secondaryArchSuffix + lib:libdwarf$secondaryArchSuffix == $portVersion + " diff --git a/dev-libs/libdwarf/patches/libdwarf-20130729.patch b/dev-libs/libdwarf/patches/libdwarf-20130729.patch new file mode 100644 index 000000000..8cbd8dfca --- /dev/null +++ b/dev-libs/libdwarf/patches/libdwarf-20130729.patch @@ -0,0 +1,79 @@ +diff -Naur dwarf-20130729/dwarfdump/Makefile.in dwarf-20130729-c89/dwarfdump/Makefile.in +--- dwarf-20130729/dwarfdump/Makefile.in 2013-02-02 19:13:55.027000832 +0000 ++++ dwarf-20130729-c89/dwarfdump/Makefile.in 2014-01-02 23:57:54.130809856 +0000 +@@ -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.019922944 +0000 ++++ dwarf-20130729-c89/dwarfdump/print_die.c 2014-01-02 23:11:00.841744384 +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/libdwarf/gennames.c dwarf-20130729-c89/libdwarf/gennames.c +--- dwarf-20130729/libdwarf/gennames.c 2013-01-25 19:09:11.052166656 +0000 ++++ dwarf-20130729-c89/libdwarf/gennames.c 2014-01-02 22:57:20.856162304 +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.051904512 +0000 ++++ dwarf-20130729-c89/libdwarf/Makefile.in 2014-01-03 00:36:16.817627136 +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/include/libdwarf + + INSTALL = @INSTALL@ + INSTALL_PROGRAM = @INSTALL_PROGRAM@ +@@ -213,7 +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 From ced6e43de9559b07a9c80b97b5f028e2b4bab6cf Mon Sep 17 00:00:00 2001 From: munchausen Date: Fri, 3 Jan 2014 15:00:43 +0000 Subject: [PATCH 04/11] Add PM recipe for libdwarf, based on latest version --- dev-libs/libdwarf/libdwarf-20130729.recipe | 73 +++++++++++++++++ .../libdwarf/patches/libdwarf-20130729.patch | 79 +++++++++++++++++++ 2 files changed, 152 insertions(+) create mode 100644 dev-libs/libdwarf/libdwarf-20130729.recipe create mode 100644 dev-libs/libdwarf/patches/libdwarf-20130729.patch diff --git a/dev-libs/libdwarf/libdwarf-20130729.recipe b/dev-libs/libdwarf/libdwarf-20130729.recipe new file mode 100644 index 000000000..e1ffe6aed --- /dev/null +++ b/dev-libs/libdwarf/libdwarf-20130729.recipe @@ -0,0 +1,73 @@ +SUMMARY="libdwarf and dwarfdump" +DESCRIPTION="libdwarf and dwarfdump - library and utility for working with DWARF Debugging Information Format" +HOMEPAGE="http://www.prevanders.net/dwarf.html" +SRC_URI="http://www.prevanders.net/libdwarf-20130729.tar.gz" +CHECKSUM_MD5="4cc5e48693f7b93b7aa0261e63c0e21d" +LICENSE=" + GNU GPL v2 + GNU LGPL v2.1 + " +COPYRIGHT=" + 2000,2002,2004,2005 Silicon Graphics, Inc. All Rights Reserved. + 2007-2010 David Anderson. All Rights Reserved. + 2007-2010 Sun Microsystems, Inc. All rights reserved + " +REVISION="1" +ARCHITECTURES="x86 x86_gcc2" +SECONDARY_ARCHITECTURES="x86_gcc2 x86" +SOURCE_DIR="dwarf-20130729" +PATCHES="libdwarf-20130729.patch" + +PROVIDES=" + lib:libdwarf$secondaryArchSuffix = $portVersion + cmd:dwarfdump = $portVersion + " +# cmd:dwarfdump2 = $portVersion +# " + +REQUIRES=" + haiku$secondaryArchSuffix >= $haikuVersion + lib:libelf$secondaryArchSuffix + " + +BUILD_REQUIRES=" + lib:libelf$secondaryArchSuffix + devel:libelf$secondaryArchSuffix + " + +BUILD_PREREQUIRES=" + haiku${secondaryArchSuffix}_devel >= $haikuVersion + cmd:gcc$secondaryArchSuffix + cmd:ld$secondaryArchSuffix + cmd:make + " + +BUILD() +{ + cd libdwarf + runConfigure ./configure --enable-shared + make + cd ../dwarfdump + LDFLAGS="-L../libdwarf -L/boot/common/lib" ./configure $configureDirArgs + LIBRARY_PATH=$LIBRARY_PATH:../libdwarf/ make +} + +INSTALL() +{ + cd libdwarf + make install + cd ../dwarfdump + make install + #prepareInstalledDevelLib libdwarf + packageEntries devel develop +} + +PROVIDES_devel=" + devel:libdwarf$secondaryArchSuffix = $portVersion + " + +REQUIRES_devel=" + lib:libelf$secondaryArchSuffix + devel:libelf$secondaryArchSuffix + lib:libdwarf$secondaryArchSuffix == $portVersion + " diff --git a/dev-libs/libdwarf/patches/libdwarf-20130729.patch b/dev-libs/libdwarf/patches/libdwarf-20130729.patch new file mode 100644 index 000000000..8cbd8dfca --- /dev/null +++ b/dev-libs/libdwarf/patches/libdwarf-20130729.patch @@ -0,0 +1,79 @@ +diff -Naur dwarf-20130729/dwarfdump/Makefile.in dwarf-20130729-c89/dwarfdump/Makefile.in +--- dwarf-20130729/dwarfdump/Makefile.in 2013-02-02 19:13:55.027000832 +0000 ++++ dwarf-20130729-c89/dwarfdump/Makefile.in 2014-01-02 23:57:54.130809856 +0000 +@@ -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.019922944 +0000 ++++ dwarf-20130729-c89/dwarfdump/print_die.c 2014-01-02 23:11:00.841744384 +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/libdwarf/gennames.c dwarf-20130729-c89/libdwarf/gennames.c +--- dwarf-20130729/libdwarf/gennames.c 2013-01-25 19:09:11.052166656 +0000 ++++ dwarf-20130729-c89/libdwarf/gennames.c 2014-01-02 22:57:20.856162304 +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.051904512 +0000 ++++ dwarf-20130729-c89/libdwarf/Makefile.in 2014-01-03 00:36:16.817627136 +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/include/libdwarf + + INSTALL = @INSTALL@ + INSTALL_PROGRAM = @INSTALL_PROGRAM@ +@@ -213,7 +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 From a99436869bea3a7dea6710c8c66e4f05cddc5d43 Mon Sep 17 00:00:00 2001 From: Ed Robbins Date: Sat, 4 Jan 2014 02:28:36 +0000 Subject: [PATCH 05/11] Fixes to libelf recipe --- dev-libs/libelf/libelf-0.8.13.recipe | 23 +++++++++++++++-------- 1 file changed, 15 insertions(+), 8 deletions(-) diff --git a/dev-libs/libelf/libelf-0.8.13.recipe b/dev-libs/libelf/libelf-0.8.13.recipe index eb7745355..cfd9b46ad 100644 --- a/dev-libs/libelf/libelf-0.8.13.recipe +++ b/dev-libs/libelf/libelf-0.8.13.recipe @@ -1,5 +1,11 @@ -SUMMARY="libelf" -DESCRIPTION="libelf - ELF object file access library" +SUMMARY="libelf - ELF object file access library" +DESCRIPTION=" + Libelf lets you read, modify or create ELF files in an + architecture-independent way. The library takes care of size and endian + issues, e.g. you can process a file for SPARC processors on an Intel-based + system. This library is a clean-room rewrite of the System V Release 4 + library and is source code compatible with it. + " HOMEPAGE="http://www.mr511.de/software/english.html" SRC_URI="http://www.mr511.de/software/libelf-0.8.13.tar.gz" CHECKSUM_MD5="4136d7b4c04df68b686570afa26988ac" @@ -8,7 +14,6 @@ COPYRIGHT="1995-2008 Michael Riepe" REVISION="1" ARCHITECTURES="x86 x86_gcc2" SECONDARY_ARCHITECTURES="x86_gcc2 x86" -SOURCE_DIR="$portVersionedName" PATCHES="libelf-0.8.13.patch" PROVIDES=" @@ -17,12 +22,13 @@ PROVIDES=" REQUIRES=" haiku$secondaryArchSuffix >= $haikuVersion " -BUILD_REQUIRES="" +BUILD_REQUIRES=" + haiku${secondaryArchSuffix}_devel >= $haikuVersion + " BUILD_PREREQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion - cmd:gcc - cmd:ld + cmd:gcc$secondaryArchSuffix + cmd:ld$secondaryArchSuffix cmd:libtoolize cmd:autoreconf cmd:make @@ -45,9 +51,10 @@ INSTALL() } PROVIDES_devel=" + libelf${secondaryArchSuffix}_devel = $portVersion devel:libelf$secondaryArchSuffix = $portVersion " REQUIRES_devel=" - lib:libelf$secondaryArchSuffix == $portVersion + lib:libelf$secondaryArchSuffix == $portVersion base " From ed4c99a3b19f7a04016daaa11ffadc66917bd7bb Mon Sep 17 00:00:00 2001 From: Ed Robbins Date: Sun, 5 Jan 2014 15:02:52 +0000 Subject: [PATCH 06/11] Fixes for libdwarf recipe and patch --- dev-libs/libdwarf/libdwarf-20130729.recipe | 51 ++++++++++++++---- .../libdwarf/patches/libdwarf-20130729.patch | Bin 3248 -> 23904 bytes 2 files changed, 40 insertions(+), 11 deletions(-) diff --git a/dev-libs/libdwarf/libdwarf-20130729.recipe b/dev-libs/libdwarf/libdwarf-20130729.recipe index e1ffe6aed..4b25b1ce9 100644 --- a/dev-libs/libdwarf/libdwarf-20130729.recipe +++ b/dev-libs/libdwarf/libdwarf-20130729.recipe @@ -1,5 +1,35 @@ -SUMMARY="libdwarf and dwarfdump" -DESCRIPTION="libdwarf and dwarfdump - library and utility for working with DWARF Debugging Information Format" +SUMMARY="libdwarf and dwarfdump - library and utility for working with DWARF Debugging Information Format" +DESCRIPTION=" + DWARF is a widely used, standardized debugging data format. DWARF was + originally designed along with Executable and Linkable Format (ELF), + although it is independent of object file formats. The name is a + medieval fantasy complement to ELF that has no official meaning, + although the backronym 'Debugging With Attributed Record Formats' was + later proposed. + + The DWARF Debugging Information Format is of interest to programmers + working on compilers and debuggers (and anyone interested in reading or + writing DWARF information). DWARF uses a data structure called a + Debugging Information Entry (DIE) to represent each variable, type, + procedure, etc. It was developed by a committee (known as the PLSIG at + the time) starting around 1991. Starting around 1991 SGI developed the + libdwarf and dwarfdump tools for internal use and as part of SGI IRIX + developer tools. Since that time dwarfdump and libdwarf have been + shipped (as an executable and archive respectively, not source) with + every release of the SGI MIPS/IRIX C compiler. In 1994 (I think the + correct year) SGI agreed to open-source libdwarf (and in 1999 to + open-source dwarfdump) so anyone could use them. + + libdwarf allows reading, creation and manipulation of dwarf data. + dwarfdump (written in C) and dwarfdump2 (written in C++) do the same + job, they let you dump out, in readable form, the DWARF2, DWARF3, or + DWARF4 data from an object file, but dwarfdump2 does a better job in + some respects. + + This package includes dwarfdump2 and libdwarf, although the source + package has been patched to make dwarfdump and dwarfgen haiku + compatible as well. + " HOMEPAGE="http://www.prevanders.net/dwarf.html" SRC_URI="http://www.prevanders.net/libdwarf-20130729.tar.gz" CHECKSUM_MD5="4cc5e48693f7b93b7aa0261e63c0e21d" @@ -15,15 +45,13 @@ COPYRIGHT=" REVISION="1" ARCHITECTURES="x86 x86_gcc2" SECONDARY_ARCHITECTURES="x86_gcc2 x86" -SOURCE_DIR="dwarf-20130729" +SOURCE_DIR="dwarf-$portVersion" PATCHES="libdwarf-20130729.patch" PROVIDES=" lib:libdwarf$secondaryArchSuffix = $portVersion cmd:dwarfdump = $portVersion " -# cmd:dwarfdump2 = $portVersion -# " REQUIRES=" haiku$secondaryArchSuffix >= $haikuVersion @@ -31,12 +59,12 @@ REQUIRES=" " BUILD_REQUIRES=" + haiku${secondaryArchSuffix}_devel >= $haikuVersion lib:libelf$secondaryArchSuffix devel:libelf$secondaryArchSuffix " BUILD_PREREQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion cmd:gcc$secondaryArchSuffix cmd:ld$secondaryArchSuffix cmd:make @@ -47,8 +75,8 @@ BUILD() cd libdwarf runConfigure ./configure --enable-shared make - cd ../dwarfdump - LDFLAGS="-L../libdwarf -L/boot/common/lib" ./configure $configureDirArgs + cd ../dwarfdump2 + LDFLAGS="-L../libdwarf" ./configure $configureDirArgs LIBRARY_PATH=$LIBRARY_PATH:../libdwarf/ make } @@ -56,18 +84,19 @@ INSTALL() { cd libdwarf make install - cd ../dwarfdump + cd ../dwarfdump2 make install #prepareInstalledDevelLib libdwarf - packageEntries devel develop + packageEntries devel $developDir } PROVIDES_devel=" + libdwarf${secondaryArchSuffix}_devel = $portVersion devel:libdwarf$secondaryArchSuffix = $portVersion " REQUIRES_devel=" lib:libelf$secondaryArchSuffix devel:libelf$secondaryArchSuffix - lib:libdwarf$secondaryArchSuffix == $portVersion + lib:libdwarf$secondaryArchSuffix == $portVersion base " diff --git a/dev-libs/libdwarf/patches/libdwarf-20130729.patch b/dev-libs/libdwarf/patches/libdwarf-20130729.patch index 8cbd8dfca9f85de1d5f97d8689936e94d932a732..629988ba9070b0bf803b7e8359f99c13397456e3 100644 GIT binary patch literal 23904 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 X#phk|opd~wITeEvd9tbFHCFgvms+~X delta 266 zcmZ9Gy-EX75JtJWkPTXCRBYmch1D)IbLaln7D3d~ND{Qr6ah)$?`tSiSSh}Mkg(XK z^bvdlE$jq+0l}=De)V?_=XIh+tJk+FIRNmQWZc@g*`9CK36OKZ94I3ljf;j0)Zig_ zW5-|5Gbx5Z6qqYS-e#8@zfZ&nPw0 zwALCKwbtaWz4*6)ssfsNjYUfuxZK>IsMKHpHds|Rr%+w;&Qe2X08!hBw(#gIIn=h? h>nK$l43ADOj{9=Z-BnH=yZ7?4vml4P2l?)8{Q%YKN+$pS From 377b01fe41eea4c9354c852d532e9cd67faa4a31 Mon Sep 17 00:00:00 2001 From: Ed Robbins Date: Sun, 5 Jan 2014 15:08:20 +0000 Subject: [PATCH 07/11] Repair libdwarf patch --- .../libdwarf/patches/libdwarf-20130729.patch | Bin 23904 -> 7179 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/dev-libs/libdwarf/patches/libdwarf-20130729.patch b/dev-libs/libdwarf/patches/libdwarf-20130729.patch index 629988ba9070b0bf803b7e8359f99c13397456e3..281916785f8bee36952b427343389234c9e335a4 100644 GIT binary patch delta 17 YcmaE`i?Q2c!yUHCF&;ddZ9SAl0Y>u%qyPW_ literal 23904 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 X#phk|opd~wITeEvd9tbFHCFgvms+~X From 42e1df9da7ab394efe6b1fcb012292a70ff37bf4 Mon Sep 17 00:00:00 2001 From: Ed Robbins Date: Sun, 5 Jan 2014 16:25:20 +0000 Subject: [PATCH 08/11] Fix documentation directory --- .../libdwarf/patches/libdwarf-20130729.patch | 62 ++++++++++++------- 1 file changed, 40 insertions(+), 22 deletions(-) diff --git a/dev-libs/libdwarf/patches/libdwarf-20130729.patch b/dev-libs/libdwarf/patches/libdwarf-20130729.patch index 281916785..25fce363d 100644 --- a/dev-libs/libdwarf/patches/libdwarf-20130729.patch +++ b/dev-libs/libdwarf/patches/libdwarf-20130729.patch @@ -1,6 +1,15 @@ diff -Naur dwarf-20130729/dwarfdump/Makefile.in dwarf-20130729-c89/dwarfdump/Makefile.in ---- dwarf-20130729/dwarfdump/Makefile.in 2013-02-02 19:13:55.053477376 +0000 -+++ dwarf-20130729-c89/dwarfdump/Makefile.in 2014-01-04 22:16:40.452984832 +0000 +--- 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. @@ -17,8 +26,8 @@ diff -Naur dwarf-20130729/dwarfdump/Makefile.in dwarf-20130729-c89/dwarfdump/Mak 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.046399488 +0000 -+++ dwarf-20130729-c89/dwarfdump/print_die.c 2014-01-04 22:17:40.267386880 +0000 +--- 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 @@ -37,8 +46,8 @@ diff -Naur dwarf-20130729/dwarfdump/print_die.c dwarf-20130729-c89/dwarfdump/pri 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.054788096 +0000 -+++ dwarf-20130729-c89/dwarfdump2/dwarfdump.cc 2014-01-04 23:22:07.392691712 +0000 +--- 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 #include // for sort @@ -57,8 +66,17 @@ diff -Naur dwarf-20130729/dwarfdump2/dwarfdump.cc dwarf-20130729-c89/dwarfdump2/ " " << 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.060555264 +0000 -+++ dwarf-20130729-c89/dwarfdump2/Makefile.in 2014-01-04 23:18:23.387973120 +0000 +--- 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. @@ -75,8 +93,8 @@ diff -Naur dwarf-20130729/dwarfdump2/Makefile.in dwarf-20130729-c89/dwarfdump2/M 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.042467328 +0000 -+++ dwarf-20130729-c89/dwarfgen/createirepformfrombinary.cc 2014-01-04 22:51:04.916193280 +0000 +--- 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 // For memset etc #include //open @@ -86,8 +104,8 @@ diff -Naur dwarf-20130729/dwarfgen/createirepformfrombinary.cc dwarf-20130729-c8 #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.043778048 +0000 -+++ dwarf-20130729-c89/dwarfgen/createirepfrombinary.cc 2014-01-04 22:51:26.518782976 +0000 +--- 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 // For memset etc #include //open @@ -97,8 +115,8 @@ diff -Naur dwarf-20130729/dwarfgen/createirepfrombinary.cc dwarf-20130729-c89/dw #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.044826624 +0000 -+++ dwarf-20130729-c89/dwarfgen/dwarfgen.cc 2014-01-04 22:52:19.229113856 +0000 +--- 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 // For memset etc #include //open @@ -110,8 +128,8 @@ diff -Naur dwarf-20130729/dwarfgen/dwarfgen.cc dwarf-20130729-c89/dwarfgen/dwarf #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.043253760 +0000 -+++ dwarf-20130729-c89/dwarfgen/irepattrtodbg.cc 2014-01-04 22:52:50.147324928 +0000 +--- 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 //open #include //open @@ -121,8 +139,8 @@ diff -Naur dwarf-20130729/dwarfgen/irepattrtodbg.cc dwarf-20130729-c89/dwarfgen/ #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.044040192 +0000 -+++ dwarf-20130729-c89/dwarfgen/ireptodbg.cc 2014-01-04 22:53:13.649592832 +0000 +--- 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 // For memset etc #include //open @@ -132,8 +150,8 @@ diff -Naur dwarf-20130729/dwarfgen/ireptodbg.cc dwarf-20130729-c89/dwarfgen/irep #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.011534336 +0000 -+++ dwarf-20130729-c89/libdwarf/gennames.c 2014-01-04 22:19:48.910950400 +0000 +--- 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' */ @@ -145,8 +163,8 @@ diff -Naur dwarf-20130729/libdwarf/gennames.c dwarf-20130729-c89/libdwarf/gennam 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.011272192 +0000 -+++ dwarf-20130729-c89/libdwarf/Makefile.in 2014-01-04 22:21:06.420216832 +0000 +--- 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@ From abdf62993a7a4f76d28af33d0621799454b28e5e Mon Sep 17 00:00:00 2001 From: Ed Robbins Date: Mon, 6 Jan 2014 13:26:56 +0000 Subject: [PATCH 09/11] libdwarf: pass directories to make instead of modifying makefile fix build for gcc4 other small fixes (description, unneed REQUIRES) --- dev-libs/libdwarf/libdwarf-20130729.recipe | 64 ++++++-------- .../libdwarf/patches/libdwarf-20130729.patch | 85 +++++++------------ 2 files changed, 57 insertions(+), 92 deletions(-) diff --git a/dev-libs/libdwarf/libdwarf-20130729.recipe b/dev-libs/libdwarf/libdwarf-20130729.recipe index 4b25b1ce9..d93cd5e56 100644 --- a/dev-libs/libdwarf/libdwarf-20130729.recipe +++ b/dev-libs/libdwarf/libdwarf-20130729.recipe @@ -1,35 +1,28 @@ SUMMARY="libdwarf and dwarfdump - library and utility for working with DWARF Debugging Information Format" DESCRIPTION=" - DWARF is a widely used, standardized debugging data format. DWARF was - originally designed along with Executable and Linkable Format (ELF), - although it is independent of object file formats. The name is a - medieval fantasy complement to ELF that has no official meaning, - although the backronym 'Debugging With Attributed Record Formats' was - later proposed. - - The DWARF Debugging Information Format is of interest to programmers - working on compilers and debuggers (and anyone interested in reading or - writing DWARF information). DWARF uses a data structure called a - Debugging Information Entry (DIE) to represent each variable, type, - procedure, etc. It was developed by a committee (known as the PLSIG at - the time) starting around 1991. Starting around 1991 SGI developed the - libdwarf and dwarfdump tools for internal use and as part of SGI IRIX - developer tools. Since that time dwarfdump and libdwarf have been - shipped (as an executable and archive respectively, not source) with - every release of the SGI MIPS/IRIX C compiler. In 1994 (I think the - correct year) SGI agreed to open-source libdwarf (and in 1999 to - open-source dwarfdump) so anyone could use them. - - libdwarf allows reading, creation and manipulation of dwarf data. - dwarfdump (written in C) and dwarfdump2 (written in C++) do the same - job, they let you dump out, in readable form, the DWARF2, DWARF3, or - DWARF4 data from an object file, but dwarfdump2 does a better job in - some respects. - - This package includes dwarfdump2 and libdwarf, although the source - package has been patched to make dwarfdump and dwarfgen haiku - compatible as well. - " +DWARF is a widely used, standardized debugging data format. DWARF was \ +originally designed along with Executable and Linkable Format (ELF), although \ +it is independent of object file formats. The name is a medieval fantasy \ +complement to ELF that has no official meaning, although the backronym \ +'Debugging With Attributed Record Formats' was later proposed. +The DWARF Debugging Information Format is of interest to programmers working on \ +compilers and debuggers (and anyone interested in reading or writing DWARF \ +information). DWARF uses a data structure called a Debugging Information Entry \ +(DIE) to represent each variable, type, procedure, etc. It was developed by a \ +committee (known as the PLSIG at the time) starting around 1991. Starting \ +around 1991 SGI developed the libdwarf and dwarfdump tools for internal use and \ +as part of SGI IRIX developer tools. Since that time dwarfdump and libdwarf \ +have been shipped (as an executable and archive respectively, not source) with \ +every release of the SGI MIPS/IRIX C compiler. In 1994 (I think the correct \ +year) SGI agreed to open-source libdwarf (and in 1999 to open-source dwarfdump) \ +so anyone could use them. +libdwarf allows reading, creation and manipulation of dwarf data. dwarfdump \ +(written in C) and dwarfdump2 (written in C++) do the same job, they let you \ +dump out, in readable form, the DWARF2, DWARF3, or DWARF4 data from an object \ +file, but dwarfdump2 does a better job in some respects. +This package includes dwarfdump2 and libdwarf, although the source package has \ +been patched to make dwarfdump and dwarfgen haiku compatible as well. +" HOMEPAGE="http://www.prevanders.net/dwarf.html" SRC_URI="http://www.prevanders.net/libdwarf-20130729.tar.gz" CHECKSUM_MD5="4cc5e48693f7b93b7aa0261e63c0e21d" @@ -76,17 +69,16 @@ BUILD() runConfigure ./configure --enable-shared make cd ../dwarfdump2 - LDFLAGS="-L../libdwarf" ./configure $configureDirArgs - LIBRARY_PATH=$LIBRARY_PATH:../libdwarf/ make + LDFLAGS="-L../libdwarf" ./configure $configureDirArgs + LIBRARY_PATH=$LIBRARY_PATH:%A/../libdwarf make } INSTALL() { cd libdwarf - make install + make install bindir=$binDir libdir=$libDir incdir=$includeDir cd ../dwarfdump2 - make install - #prepareInstalledDevelLib libdwarf + make install mandir=$manDir packageEntries devel $developDir } @@ -96,7 +88,5 @@ PROVIDES_devel=" " REQUIRES_devel=" - lib:libelf$secondaryArchSuffix - devel:libelf$secondaryArchSuffix lib:libdwarf$secondaryArchSuffix == $portVersion base " diff --git a/dev-libs/libdwarf/patches/libdwarf-20130729.patch b/dev-libs/libdwarf/patches/libdwarf-20130729.patch index 25fce363d..d3f8072dd 100644 --- a/dev-libs/libdwarf/patches/libdwarf-20130729.patch +++ b/dev-libs/libdwarf/patches/libdwarf-20130729.patch @@ -1,15 +1,6 @@ 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 - - +--- dwarf-20130729/dwarfdump/Makefile.in 2013-02-02 19:13:55.031981568 +0000 ++++ dwarf-20130729-c89/dwarfdump/Makefile.in 2014-01-06 11:16:30.116916224 +0000 @@ -154,9 +154,11 @@ # will work and leave sensible permissions on the resulting files. # Some adjustment might be required, see README. @@ -26,8 +17,8 @@ diff -Naur dwarf-20130729/dwarfdump/Makefile.in dwarf-20130729-c89/dwarfdump/Mak 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 +--- dwarf-20130729/dwarfdump/print_die.c 2013-02-06 20:48:07.024903680 +0000 ++++ dwarf-20130729-c89/dwarfdump/print_die.c 2014-01-06 11:16:30.131596288 +0000 @@ -3380,6 +3380,7 @@ we have a serious botch. this FORM defines the value as a .debug_info @@ -46,37 +37,33 @@ diff -Naur dwarf-20130729/dwarfdump/print_die.c dwarf-20130729-c89/dwarfdump/pri 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 @@ +--- dwarf-20130729/dwarfdump2/dwarfdump.cc 2013-07-30 16:12:36.033292288 +0000 ++++ dwarf-20130729-c89/dwarfdump2/dwarfdump.cc 2014-01-06 11:19:43.419168256 +0000 +@@ -47,6 +47,9 @@ #include #include // for sort #include ++#if __GNUC__ == 2 +#include ++#endif /* for 'open' */ #include -@@ -2413,7 +2414,7 @@ +@@ -2413,7 +2416,11 @@ Compiler *pCompiler, Dwarf_Check_Categories category) { Dwarf_Check_Result result = pCompiler->results_[category]; -- cerr << std::setw(24) << std::left << str << ++#if __GNUC__ == 2 + cerr << std::setw(24) << ios::left << str << ++#else + cerr << std::setw(24) << std::left << str << ++#endif 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@ +--- dwarf-20130729/dwarfdump2/Makefile.in 2013-02-02 19:16:44.038797312 +0000 ++++ dwarf-20130729-c89/dwarfdump2/Makefile.in 2014-01-06 12:53:29.018350080 +0000 @@ -133,9 +133,11 @@ # will work and leave sensible permissions on the resulting files. # Some adjustment might be required, see README. @@ -93,8 +80,8 @@ diff -Naur dwarf-20130729/dwarfdump2/Makefile.in dwarf-20130729-c89/dwarfdump2/M 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 +--- dwarf-20130729/dwarfgen/createirepformfrombinary.cc 2013-02-01 16:20:06.020971520 +0000 ++++ dwarf-20130729-c89/dwarfgen/createirepformfrombinary.cc 2014-01-06 11:16:30.163577856 +0000 @@ -28,7 +28,6 @@ #include // For memset etc #include //open @@ -104,8 +91,8 @@ diff -Naur dwarf-20130729/dwarfgen/createirepformfrombinary.cc dwarf-20130729-c8 #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 +--- dwarf-20130729/dwarfgen/createirepfrombinary.cc 2013-02-01 16:20:11.022282240 +0000 ++++ dwarf-20130729-c89/dwarfgen/createirepfrombinary.cc 2014-01-06 11:16:30.171442176 +0000 @@ -30,7 +30,6 @@ #include // For memset etc #include //open @@ -115,8 +102,8 @@ diff -Naur dwarf-20130729/dwarfgen/createirepfrombinary.cc dwarf-20130729-c89/dw #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 +--- dwarf-20130729/dwarfgen/dwarfgen.cc 2013-02-01 16:20:17.023330816 +0000 ++++ dwarf-20130729-c89/dwarfgen/dwarfgen.cc 2014-01-06 11:16:30.179830784 +0000 @@ -56,8 +56,8 @@ #include // For memset etc #include //open @@ -128,8 +115,8 @@ diff -Naur dwarf-20130729/dwarfgen/dwarfgen.cc dwarf-20130729-c89/dwarfgen/dwarf #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 +--- dwarf-20130729/dwarfgen/irepattrtodbg.cc 2013-02-01 16:20:21.021495808 +0000 ++++ dwarf-20130729-c89/dwarfgen/irepattrtodbg.cc 2014-01-06 11:16:30.192937984 +0000 @@ -30,7 +30,6 @@ #include //open #include //open @@ -139,8 +126,8 @@ diff -Naur dwarf-20130729/dwarfgen/irepattrtodbg.cc dwarf-20130729-c89/dwarfgen/ #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 +--- dwarf-20130729/dwarfgen/ireptodbg.cc 2013-02-01 16:20:26.022544384 +0000 ++++ dwarf-20130729-c89/dwarfgen/ireptodbg.cc 2014-01-06 11:16:30.201064448 +0000 @@ -28,7 +28,6 @@ #include // For memset etc #include //open @@ -150,8 +137,8 @@ diff -Naur dwarf-20130729/dwarfgen/ireptodbg.cc dwarf-20130729-c89/dwarfgen/irep #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 +--- dwarf-20130729/libdwarf/gennames.c 2013-01-25 19:09:11.056885248 +0000 ++++ dwarf-20130729-c89/libdwarf/gennames.c 2014-01-06 11:16:30.209715200 +0000 @@ -486,8 +486,8 @@ /* Process each line from 'dwarf.h' */ @@ -163,20 +150,8 @@ diff -Naur dwarf-20130729/libdwarf/gennames.c dwarf-20130729-c89/libdwarf/gennam 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@ +--- dwarf-20130729/libdwarf/Makefile.in 2013-07-28 17:58:54.056885248 +0000 ++++ dwarf-20130729-c89/libdwarf/Makefile.in 2014-01-06 11:16:30.217055232 +0000 @@ -213,8 +214,11 @@ rm -f dwarf_names_enum.h dwarf_names_new.h dwarf_names.c dwarf_names.h From 27dcb4e8bbb635bd10b425d18fb48af8358f3843 Mon Sep 17 00:00:00 2001 From: Ed Robbins Date: Mon, 6 Jan 2014 13:30:32 +0000 Subject: [PATCH 10/11] Style fixes for libelf description --- dev-libs/libelf/libelf-0.8.13.recipe | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/dev-libs/libelf/libelf-0.8.13.recipe b/dev-libs/libelf/libelf-0.8.13.recipe index cfd9b46ad..8184d88f7 100644 --- a/dev-libs/libelf/libelf-0.8.13.recipe +++ b/dev-libs/libelf/libelf-0.8.13.recipe @@ -1,11 +1,11 @@ SUMMARY="libelf - ELF object file access library" DESCRIPTION=" - Libelf lets you read, modify or create ELF files in an - architecture-independent way. The library takes care of size and endian - issues, e.g. you can process a file for SPARC processors on an Intel-based - system. This library is a clean-room rewrite of the System V Release 4 - library and is source code compatible with it. - " +Libelf lets you read, modify or create ELF files in an architecture-independent \ +way. The library takes care of size and endian issues, e.g. you can process a \ +file for SPARC processors on an Intel-based system. This library is a \ +clean-room rewrite of the System V Release 4 library and is source code \ +compatible with it. +" HOMEPAGE="http://www.mr511.de/software/english.html" SRC_URI="http://www.mr511.de/software/libelf-0.8.13.tar.gz" CHECKSUM_MD5="4136d7b4c04df68b686570afa26988ac" From a8370318e9956c0a9a23be93db9f24395f86ff63 Mon Sep 17 00:00:00 2001 From: Ed Robbins Date: Mon, 6 Jan 2014 16:05:05 +0000 Subject: [PATCH 11/11] Remove unneeded dependency --- dev-libs/libdwarf/libdwarf-20130729.recipe | 1 - 1 file changed, 1 deletion(-) diff --git a/dev-libs/libdwarf/libdwarf-20130729.recipe b/dev-libs/libdwarf/libdwarf-20130729.recipe index d93cd5e56..ff44cf1ac 100644 --- a/dev-libs/libdwarf/libdwarf-20130729.recipe +++ b/dev-libs/libdwarf/libdwarf-20130729.recipe @@ -53,7 +53,6 @@ REQUIRES=" BUILD_REQUIRES=" haiku${secondaryArchSuffix}_devel >= $haikuVersion - lib:libelf$secondaryArchSuffix devel:libelf$secondaryArchSuffix "