9 files changed, 174 insertions, 0 deletions

diff --git a/meta-linaro/recipes-extra/dwarfutils/README b/meta-linaro/recipes-extra/dwarfutils/README
new file mode 100644
index 0000000..5edf841
--- /dev/null
+++ b/meta-linaro/recipes-extra/dwarfutils/README
@@ -0,0 +1,18 @@
+Patches were submitted upstream and the answer was:
+
+---------
+Yes, I assume host == build  in all releases to date.  AFAIK you are the
+first to try a canadian-cross build.
+
+Another issue  is that the build is not set up to do the build anywhere
+but inside the source tree.  It is true that make-clean/CLEANUP fixes up
+the mess pretty well, but a separate build directory would be a nice
+(and traditional) thing to allow.
+
+I cannot use your submission for anything (Linaro and I have no
+agreement in place) but  I think these are interesting and worthwhile
+small issues that libdwarf/dwarfdump should be able to deal with.
+
+Thanks for the suggestion.  I made a note and should be able to take a
+look at this issue in the near future. 
+---------
diff --git a/meta-linaro/recipes-extra/dwarfutils/dwarf.inc b/meta-linaro/recipes-extra/dwarfutils/dwarf.inc
new file mode 100644
index 0000000..6839f49
--- /dev/null
+++ b/meta-linaro/recipes-extra/dwarfutils/dwarf.inc
@@ -0,0 +1,12 @@
+DEPENDS = "elfutils"
+LICENSE = "GPLv2"
+LIC_FILES_CHKSUM = "file://COPYING;md5=db2a565b9d860834e0f2c9cf569fb4e5"
+
+SRC_URI = "http://www.prevanders.net/libdwarf-${PV}.tar.gz"
+
+SRC_URI[md5sum] = "83ab49c58439254729f543be6977692b"
+SRC_URI[sha256sum] = "c0aede3a7368c27572ae1cc403c4cbdbf6eeb91a05adbb6f41c40ed78b75cdd9"
+
+S = "${WORKDIR}/dwarf-${PV}/${BPN}"
+
+inherit autotools
diff --git a/meta-linaro/recipes-extra/dwarfutils/dwarfdump/fix-dump.patch b/meta-linaro/recipes-extra/dwarfutils/dwarfdump/fix-dump.patch
new file mode 100644
index 0000000..45ca7a8
--- /dev/null
+++ b/meta-linaro/recipes-extra/dwarfutils/dwarfdump/fix-dump.patch
@@ -0,0 +1,25 @@
+---
+ Makefile.in |    4 ++++
+ 1 file changed, 4 insertions(+)
+
+--- dwarfdump.orig/Makefile.in
++++ dwarfdump/Makefile.in
+@@ -104,14 +104,18 @@ naming.o:  $(srcdir)/naming.c $(srcdir)/
+ # in the tree builds.
+ trivial_naming.o: $(srcdir)/naming.c
+        $(CC) $(CFLAGS) -DTRIVIAL_NAMING  -c $(srcdir)/naming.c -o trivial_naming.o 
+ 
+ tag_tree_build:  $(srcdir)/tag_tree.c $(DIRINC)/dwarf.h $(HEADERS) tag_common.o makename.o common.o trivial_naming.o
++ifeq ($(NATIVE),1)
+        $(CC) $(CFLAGS) $(srcdir)/tag_tree.c tag_common.o common.o makename.o trivial_naming.o $(LDFLAGS) -o tag_tree_build 
++endif
+ 
+ tag_attr_build:  $(srcdir)/tag_attr.c $(DIRINC)/dwarf.h $(HEADERS) tag_common.o makename.o common.o trivial_naming.o
++ifeq ($(NATIVE),1)
+        $(CC) $(CFLAGS) $(srcdir)/tag_attr.c tag_common.o common.o makename.o trivial_naming.o $(LDFLAGS) -o tag_attr_build 
++endif
+ 
+ tmp-tt-table.c tmp-tt-ext-table.c: $(srcdir)/tag_tree_ext.list $(srcdir)/tag_tree.list tag_tree_build
+        # gcc -E tag_tree.list does not work, so use a .c name
+        -rm -f  tmp-t1.c
+        cp $(srcdir)/tag_tree.list tmp-t1.c
diff --git a/meta-linaro/recipes-extra/dwarfutils/dwarfdump2/fix-dump.patch b/meta-linaro/recipes-extra/dwarfutils/dwarfdump2/fix-dump.patch
new file mode 100644
index 0000000..18ffe81
--- /dev/null
+++ b/meta-linaro/recipes-extra/dwarfutils/dwarfdump2/fix-dump.patch
@@ -0,0 +1,27 @@
+---
+ Makefile.in |   11 +++++++----
+ 1 file changed, 7 insertions(+), 4 deletions(-)
+
+--- dwarfdump2.orig/Makefile.in
++++ dwarfdump2/Makefile.in
+@@ -100,14 +100,17 @@ common.o:  $(srcdir)/common.cc $(srcdir)
+ # in the tree builds.
+ trivial_naming.o: $(srcdir)/naming.cc
+        $(CXX) $(CXXFLAGS) -DTRIVIAL_NAMING  -c $(srcdir)/naming.cc -o trivial_naming.o
+ 
+ tag_tree_build:  $(srcdir)/tag_tree.cc $(DIRINC)/dwarf.h $(HEADERS) tag_common.o trivial_naming.o common.o
+-       $(CXX) $(CXXFLAGS) $(srcdir)/tag_tree.cc trivial_naming.o tag_common.o common.o $(LDFLAGS) -o tag_tree_build 
+-
++ifeq ($(NATIVE),1)
++       $(CXX) $(CXXFLAGS) $(srcdir)/tag_tree.cc trivial_naming.o tag_common.o common.o $(LDFLAGS) -o tag_tree_build
++endif
+ tag_attr_build:  $(srcdir)/tag_attr.cc $(DIRINC)/dwarf.h $(HEADERS) trivial_naming.o tag_common.o naming.o common.o
+-       $(CXX) $(CXXFLAGS) $(srcdir)/tag_attr.cc trivial_naming.o tag_common.o common.o $(LDFLAGS) -o tag_attr_build 
++ifeq ($(NATIVE),1)
++       $(CXX) $(CXXFLAGS) $(srcdir)/tag_attr.cc trivial_naming.o tag_common.o common.o $(LDFLAGS) -o tag_attr_build
++endif
+ 
+ tmp-tt-table.cc tmp-tt-ext-table.cc: $(srcdir)/tag_tree_ext.list $(srcdir)/tag_tree.list tag_tree_build
+        # gcc -E tag_tree.list does not work, so use a .cc name
+        -rm -f  tmp-t1.cc
+        cp $(srcdir)/tag_tree.list tmp-t1.cc
diff --git a/meta-linaro/recipes-extra/dwarfutils/dwarfdump2_20121130.bb b/meta-linaro/recipes-extra/dwarfutils/dwarfdump2_20121130.bb
new file mode 100644
index 0000000..10999d6
--- /dev/null
+++ b/meta-linaro/recipes-extra/dwarfutils/dwarfdump2_20121130.bb
@@ -0,0 +1,22 @@
+require dwarf.inc
+
+DEPENDS = "libdwarf libdwarf-native"
+
+LIC_FILES_CHKSUM = "file://GPL.txt;md5=751419260aa954499f7abaabaa882bbe"
+
+SRC_URI += "file://fix-dump.patch"
+
+do_compile_prepend() {
+        oe_runmake CXX="${BUILD_CXX}" \
+                CXXFLAGS="${BUILD_CXXFLAGS} -I${S}/../libdwarf/ -I." \
+                LDFLAGS="${BUILD_LDFLAGS} -ldwarf -lelf" NATIVE=1
+        rm *.o dwarfdump
+}
+
+do_install() {
+    install -d ${D}${bindir} ${D}${mandir}/man1
+    install -m 0755 dwarfdump ${D}${bindir}
+    install -m 0644 dwarfdump.1 ${D}${mandir}/man1
+}
+
+PARALLEL_MAKE = ""
diff --git a/meta-linaro/recipes-extra/dwarfutils/dwarfdump_20121130.bb b/meta-linaro/recipes-extra/dwarfutils/dwarfdump_20121130.bb
new file mode 100644
index 0000000..1befb31
--- /dev/null
+++ b/meta-linaro/recipes-extra/dwarfutils/dwarfdump_20121130.bb
@@ -0,0 +1,22 @@
+require dwarf.inc
+
+DEPENDS = "libdwarf libdwarf-native"
+
+LIC_FILES_CHKSUM = "file://GPL.txt;md5=751419260aa954499f7abaabaa882bbe"
+
+SRC_URI += "file://fix-dump.patch"
+
+do_compile_prepend() {
+        oe_runmake CC="${BUILD_CC}" \
+                CFLAGS="${BUILD_CFLAGS} -I${S}/../libdwarf/ -I." \
+                LDFLAGS="${BUILD_LDFLAGS} -ldwarf -lelf" NATIVE=1
+        rm *.o dwarfdump
+}
+
+do_install() {
+    install -d ${D}${bindir} ${D}${mandir}/man1
+    install -m 0755 dwarfdump ${D}${bindir}
+    install -m 0644 dwarfdump.1 ${D}${mandir}/man1
+}
+
+PARALLEL_MAKE = ""
diff --git a/meta-linaro/recipes-extra/dwarfutils/dwarfgen_20121130.bb b/meta-linaro/recipes-extra/dwarfutils/dwarfgen_20121130.bb
new file mode 100644
index 0000000..97d3b2f
--- /dev/null
+++ b/meta-linaro/recipes-extra/dwarfutils/dwarfgen_20121130.bb
@@ -0,0 +1,13 @@
+require dwarf.inc
+
+DEPENDS = "libdwarf libdwarf-native"
+
+LIC_FILES_CHKSUM = "file://GPL.txt;md5=751419260aa954499f7abaabaa882bbe"
+
+do_install() {
+    install -d ${D}${bindir} ${D}${mandir}/man1
+    install -m 0755 ${BPN} ${D}${bindir}
+    install -m 0644 ${BPN}.1 ${D}${mandir}/man1
+}
+
+PARALLEL_MAKE = ""
diff --git a/meta-linaro/recipes-extra/dwarfutils/libdwarf/fix-gennames.patch b/meta-linaro/recipes-extra/dwarfutils/libdwarf/fix-gennames.patch
new file mode 100644
index 0000000..901409d
--- /dev/null
+++ b/meta-linaro/recipes-extra/dwarfutils/libdwarf/fix-gennames.patch
@@ -0,0 +1,22 @@
+---
+ Makefile.in |    4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+--- libdwarf.orig/Makefile.in
++++ libdwarf/Makefile.in
+@@ -135,13 +135,13 @@ libdwarf.so: dwarf_names.h dwarf_names.c
+        $(CC) $(CFLAGS) -shared $(OBJS)  dwarf_names.o -o $@
+ 
+ none:
+        echo "do nothing"
+ common.o: $(srcdir)/common.c $(srcdir)/common.h
+-       $(CC) $(CFLAGS) -c $(srcdir)/common.c
++       $(BUILD_CC) $(BUILD_CFLAGS) -c $(srcdir)/common.c
+ gennames: $(srcdir)/gennames.c $(srcdir)/dwarf.h common.o
+-       $(CC) $(CFLAGS) $(srcdir)/gennames.c common.o $(LDFLAGS) -o gennames
++       $(BUILD_CC) $(BUILD_CFLAGS) $(srcdir)/gennames.c common.o $(BUILD_LDFLAGS) -o gennames
+ dwarf_names.c dwarf_names.h: gennames $(srcdir)/dwarf.h
+        rm -f dwarf_names.h dwarf_names.c
+        ./gennames  @dwarf_namestable@  -i $(srcdir) -o .
+ 
+ 
diff --git a/meta-linaro/recipes-extra/dwarfutils/libdwarf_20121130.bb b/meta-linaro/recipes-extra/dwarfutils/libdwarf_20121130.bb
new file mode 100644
index 0000000..828e0d0
--- /dev/null
+++ b/meta-linaro/recipes-extra/dwarfutils/libdwarf_20121130.bb
@@ -0,0 +1,13 @@
+require dwarf.inc
+
+SRC_URI += "file://fix-gennames.patch"
+
+do_install() {
+    install -d ${D}${libdir} ${D}${includedir}/libdwarf
+    install -m 0755 libdwarf.a ${D}${libdir}
+    install -m 0644 ${S}/dwarf.h ${S}/libdwarf.h ${D}${includedir}/libdwarf
+}
+
+ALLOW_EMPTY_${PN} = "1"
+
+BBCLASSEXTEND = "native"