merge of b40b9fb8b17f69ba321fa34167b8ddb37dc72ec2

     and e6a2ccb39d3b001fdcc1071ba1860678a1fe8647

3 files changed, 168 insertions, 0 deletions

diff --git a/packages/elfutils/elfutils-0.108/.mtn2git_empty b/packages/elfutils/elfutils-0.108/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/elfutils/elfutils-0.108/.mtn2git_empty
diff --git a/packages/elfutils/elfutils-0.108/warnings.patch b/packages/elfutils/elfutils-0.108/warnings.patch
new file mode 100644
index 0000000000..1c283d8530
--- /dev/null
+++ b/packages/elfutils/elfutils-0.108/warnings.patch
@@ -0,0 +1,132 @@
+Index: elfutils-0.108/configure.ac
+===================================================================
+--- elfutils-0.108.orig/configure.ac	2005-05-08 19:13:45.000000000 +0100
++++ elfutils-0.108/configure.ac	2006-04-07 11:34:17.000000000 +0100
+@@ -49,6 +49,10 @@
+ dnl Add all the languages for which translations are available.
+ ALL_LINGUAS=
+ 
++if test X"$CFLAGS" = X; then
++  CFLAGS="-Wall -Werror -g -O2"
++fi
++
+ AC_PROG_CC
+ AC_PROG_RANLIB
+ AC_PROG_YACC
+Index: elfutils-0.108/lib/Makefile.am
+===================================================================
+--- elfutils-0.108.orig/lib/Makefile.am	2005-05-07 00:48:02.000000000 +0100
++++ elfutils-0.108/lib/Makefile.am	2006-04-07 11:35:38.000000000 +0100
+@@ -21,7 +21,7 @@
+ else
+ AM_CFLAGS =
+ endif
+-AM_CFLAGS += -fpic -Wall -Wshadow -Werror -Wunused -Wextra $($(*F)_CFLAGS)
++AM_CFLAGS += -fpic -Wshadow -Wunused -Wextra $($(*F)_CFLAGS)
+ INCLUDES = -I$(srcdir)/../libelf -I..
+ 
+ noinst_LIBRARIES = libeu.a
+Index: elfutils-0.108/libasm/Makefile.am
+===================================================================
+--- elfutils-0.108.orig/libasm/Makefile.am	2005-02-25 06:46:26.000000000 +0000
++++ elfutils-0.108/libasm/Makefile.am	2006-04-07 11:36:09.000000000 +0100
+@@ -18,7 +18,7 @@
+ else
+ AM_CFLAGS =
+ endif
+-AM_CFLAGS += -Wall -Wshadow -Werror -Wunused -Wextra -Wformat=2
++AM_CFLAGS += -Wshadow -Wunused -Wextra -Wformat=2
+ INCLUDES = -I. -I$(srcdir) -I.. -I$(top_srcdir)/libelf -I$(top_srcdir)/libebl \
+ 	   -I$(top_srcdir)/lib
+ GCC_INCLUDE = -I$(shell $(CC) -print-file-name=include)
+Index: elfutils-0.108/libcpu/Makefile.am
+===================================================================
+--- elfutils-0.108.orig/libcpu/Makefile.am	2005-02-25 06:46:58.000000000 +0000
++++ elfutils-0.108/libcpu/Makefile.am	2006-04-07 11:36:32.000000000 +0100
+@@ -13,7 +13,7 @@
+ ## 3001 King Ranch Road, Ukiah, CA 95482.
+ ##
+ DEFS = -D_GNU_SOURCE -DHAVE_CONFIG_H
+-AM_CFLAGS = -Wall -Wshadow -Werror -Wextra -Wformat=2 -Wunused
++AM_CFLAGS = -Wshadow -Wextra -Wformat=2 -Wunused
+ INCLUDES = -I$(srcdir)
+ 
+ noinst_LIBRARIES = libcpu_i386.a
+Index: elfutils-0.108/libdw/Makefile.am
+===================================================================
+--- elfutils-0.108.orig/libdw/Makefile.am	2005-04-04 01:29:25.000000000 +0100
++++ elfutils-0.108/libdw/Makefile.am	2006-04-07 11:36:42.000000000 +0100
+@@ -18,7 +18,7 @@
+ else
+ AM_CFLAGS =
+ endif
+-AM_CFLAGS += -Wall -Werror -Wshadow -Wunused -Wformat=2 -Wextra -std=gnu99
++AM_CFLAGS += -Wshadow -Wunused -Wformat=2 -Wextra -std=gnu99
+ INCLUDES = -I. -I$(srcdir) -I$(srcdir)/../libelf -I.. -I$(srcdir)/../lib
+ VERSION = 1
+ 
+Index: elfutils-0.108/libebl/Makefile.am
+===================================================================
+--- elfutils-0.108.orig/libebl/Makefile.am	2005-05-07 00:40:23.000000000 +0100
++++ elfutils-0.108/libebl/Makefile.am	2006-04-07 11:36:53.000000000 +0100
+@@ -18,7 +18,7 @@
+ else
+ AM_CFLAGS =
+ endif
+-AM_CFLAGS += -fpic -Wall -Wshadow -Werror -Wunused -Wextra -Wformat=2 \
++AM_CFLAGS += -fpic -Wshadow -Wunused -Wextra -Wformat=2 \
+ 	     -std=gnu99
+ 
+ INCLUDES = -I$(srcdir) -I$(top_srcdir)/libelf -I$(top_srcdir)/lib -I..
+Index: elfutils-0.108/libelf/Makefile.am
+===================================================================
+--- elfutils-0.108.orig/libelf/Makefile.am	2005-02-25 06:46:17.000000000 +0000
++++ elfutils-0.108/libelf/Makefile.am	2006-04-07 11:37:08.000000000 +0100
+@@ -21,7 +21,7 @@
+ else
+ AM_CFLAGS =
+ endif
+-AM_CFLAGS += -Wall -Wshadow -Werror -Wunused -Wextra -Wformat=2 -std=gnu99 \
++AM_CFLAGS += -Wshadow -Wunused -Wextra -Wformat=2 -std=gnu99 \
+ 	     $($(*F)_CFLAGS)
+ INCLUDES = -I$(srcdir) -I$(top_srcdir)/lib -I..
+ GCC_INCLUDE = -I$(shell $(CC) -print-file-name=include)
+Index: elfutils-0.108/src/Makefile.am
+===================================================================
+--- elfutils-0.108.orig/src/Makefile.am	2005-05-07 21:27:58.000000000 +0100
++++ elfutils-0.108/src/Makefile.am	2006-04-07 11:38:21.000000000 +0100
+@@ -15,14 +15,13 @@
+ DEFS = -D_GNU_SOURCE -DHAVE_CONFIG_H $(YYDEBUG) \
+        -DSRCDIR=\"$(shell cd $(srcdir);pwd)\" -DOBJDIR=\"$(shell pwd)\"
+ if MUDFLAP
+-AM_CFLAGS = -Wall -Wshadow -Wunused -Wextra -std=gnu99 -fmudflap \
++AM_CFLAGS = -Wshadow -Wunused -Wextra -std=gnu99 -fmudflap \
+ 	    $(native_ld_cflags) $(if $($(*F)_no_Wunused),,-Wunused) \
+ 	    $(if $($(*F)_no_Wformat),,-Wformat=2)
+ else
+-AM_CFLAGS = -Wall -Wshadow -std=gnu99 $(native_ld_cflags) \
++AM_CFLAGS = -Wshadow -std=gnu99 $(native_ld_cflags) \
+ 	    $(if $($(*F)_no_Werror),,-Werror) \
+-	    $(if $($(*F)_no_Wunused),,-Wunused -Wextra) \
+-	    $(if $($(*F)_no_Wformat),,-Wformat=2)
++	    $(if $($(*F)_no_Wunused),,-Wunused -Wextra)
+ endif
+ if MUDFLAP
+ libmudflap = -lmudflap
+Index: elfutils-0.108/tests/Makefile.am
+===================================================================
+--- elfutils-0.108.orig/tests/Makefile.am	2005-05-08 18:56:19.000000000 +0100
++++ elfutils-0.108/tests/Makefile.am	2006-04-07 11:38:36.000000000 +0100
+@@ -14,10 +14,10 @@
+ ##
+ DEFS = -DHAVE_CONFIG_H -D_GNU_SOURCE
+ if MUDFLAP
+-AM_CFLAGS = -Wall -Werror -std=gnu99 -fmudflap\
++AM_CFLAGS = -std=gnu99 -fmudflap\
+ 	    $(if $($(*F)_no_Wformat),-Wno-format,-Wformat=2)
+ else
+-AM_CFLAGS = -Wall -Werror -std=gnu99 \
++AM_CFLAGS = -std=gnu99 \
+ 	    $(if $($(*F)_no_Wformat),-Wno-format,-Wformat=2)
+ AM_LDFLAGS = -Wl,-rpath,\$$ORIGIN/../libasm:\$$ORIGIN/../libdw:\$$ORIGIN/../libebl:\$$ORIGIN/../libelf
+ endif
diff --git a/packages/elfutils/elfutils_0.108.bb b/packages/elfutils/elfutils_0.108.bb
new file mode 100644
index 0000000000..83acc7dccb
--- /dev/null
+++ b/packages/elfutils/elfutils_0.108.bb
@@ -0,0 +1,36 @@
+SECTION = "base"
+LICENSE = "OSL"
+DESCRIPTION = "A collection of utilities and DSOs to handle compiled objects."
+DEPENDS = "libtool"
+
+SRC_URI = "http://distro.ibiblio.org/pub/linux/distributions/gentoo/distfiles/elfutils-${PV}.tar.gz \
+	   file://warnings.patch;patch=1"
+
+inherit autotools
+
+SOV = "${PV}"
+do_stage () {
+	install -m 0644 libelf/libelf.a ${STAGING_LIBDIR}/libelf.a
+	install -m 0755 libelf/libelf.so.1 ${STAGING_LIBDIR}/libelf-${SOV}.so
+	ln -sf libelf-${SOV}.so ${STAGING_LIBDIR}/libelf.so.1
+	ln -sf libelf.so.1 ${STAGING_LIBDIR}/libelf.so
+	install -m 0644 libasm/libasm.a ${STAGING_LIBDIR}/libasm.a
+	install -m 0755 libasm/libasm.so.1 ${STAGING_LIBDIR}/libasm-${SOV}.so
+	ln -sf libasm-${SOV}.so ${STAGING_LIBDIR}/libasm.so.1
+	ln -sf libasm.so.1 ${STAGING_LIBDIR}/libasm.so
+	install -m 0644 libdw/libdw.a ${STAGING_LIBDIR}/libdw.a
+	install -m 0755 libdw/libdw.so.1 ${STAGING_LIBDIR}/libdw-${SOV}.so
+	ln -sf libdw-${SOV}.so ${STAGING_LIBDIR}/libdw.so.1
+	ln -sf libdw.so.1 ${STAGING_LIBDIR}/libdw.so
+	install -m 0644 libebl/libebl.a ${STAGING_LIBDIR}/libebl.a
+	install -d ${STAGING_LIBDIR}/elfutils/
+	install -m 0755 libebl/libebl_*.so ${STAGING_LIBDIR}/elfutils/
+
+	install -m 0644 ${S}/libelf/libelf.h ${STAGING_INCDIR}/
+	install -m 0644 ${S}/libelf/gelf.h ${STAGING_INCDIR}/
+	install -m 0644 ${S}/libelf/nlist.h ${STAGING_INCDIR}/
+	install -d ${STAGING_INCDIR}/elfutils
+	install -m 0644 ${S}/libebl/libebl.h ${STAGING_INCDIR}/elfutils/
+	install -m 0644 ${S}/libdw/libdw.h ${STAGING_INCDIR}/elfutils/
+	install -m 0644 ${S}/libasm/libasm.h ${STAGING_INCDIR}/elfutils/
+}