merge of 51a0862298fec5cdcacebfb2714635fbeaf4a67a

     and f9023067ac9702507b8c8e6d17e25a86e9c7eab1

1 files changed, 29 insertions, 29 deletions

diff --git a/packages/elfutils/elfutils-0.108/warnings.patch b/packages/elfutils/elfutils-0.108/warnings.patch
index 1c283d8530..9de027ee26 100644
--- a/packages/elfutils/elfutils-0.108/warnings.patch
+++ b/packages/elfutils/elfutils-0.108/warnings.patch
@@ -1,7 +1,7 @@
 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
+--- elfutils-0.108.orig/configure.ac	2006-04-10 19:18:34.000000000 +0100
++++ elfutils-0.108/configure.ac	2006-04-10 19:19:33.000000000 +0100
 @@ -49,6 +49,10 @@
  dnl Add all the languages for which translations are available.
  ALL_LINGUAS=
@@ -15,108 +15,108 @@ Index: elfutils-0.108/configure.ac
  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
+--- elfutils-0.108.orig/lib/Makefile.am	2006-04-10 19:18:34.000000000 +0100
++++ elfutils-0.108/lib/Makefile.am	2006-04-10 19:19:33.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)
++AM_CFLAGS += -fpic -Wshadow -Wunused $($(*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
+--- elfutils-0.108.orig/libasm/Makefile.am	2006-04-10 19:18:34.000000000 +0100
++++ elfutils-0.108/libasm/Makefile.am	2006-04-10 19:19:33.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
++AM_CFLAGS += -Wshadow -Wunused -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
+--- elfutils-0.108.orig/libcpu/Makefile.am	2006-04-10 19:18:34.000000000 +0100
++++ elfutils-0.108/libcpu/Makefile.am	2006-04-10 19:19:33.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
++AM_CFLAGS = -Wshadow -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
+--- elfutils-0.108.orig/libdw/Makefile.am	2006-04-10 19:18:34.000000000 +0100
++++ elfutils-0.108/libdw/Makefile.am	2006-04-10 19:19:33.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
++AM_CFLAGS += -Wshadow -Wunused -Wformat=2 -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
+--- elfutils-0.108.orig/libebl/Makefile.am	2006-04-10 19:18:34.000000000 +0100
++++ elfutils-0.108/libebl/Makefile.am	2006-04-10 19:19:33.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 \
++AM_CFLAGS += -fpic -Wshadow -Wunused -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
+--- elfutils-0.108.orig/libelf/Makefile.am	2006-04-10 19:18:34.000000000 +0100
++++ elfutils-0.108/libelf/Makefile.am	2006-04-10 19:19:33.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 \
++AM_CFLAGS += -Wshadow -Wunused -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 @@
+--- elfutils-0.108.orig/src/Makefile.am	2006-04-10 19:18:34.000000000 +0100
++++ elfutils-0.108/src/Makefile.am	2006-04-10 19:20:19.000000000 +0100
+@@ -15,14 +15,12 @@
  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 \
++AM_CFLAGS = -Wshadow -Wunused -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_Werror),,-Werror) \
 -	    $(if $($(*F)_no_Wunused),,-Wunused -Wextra) \
 -	    $(if $($(*F)_no_Wformat),,-Wformat=2)
-+	    $(if $($(*F)_no_Wunused),,-Wunused -Wextra)
++AM_CFLAGS = -Wshadow -std=gnu99 $(native_ld_cflags) \
++	    $(if $($(*F)_no_Werror),,-Werror)	    
  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
+--- elfutils-0.108.orig/tests/Makefile.am	2006-04-10 19:18:34.000000000 +0100
++++ elfutils-0.108/tests/Makefile.am	2006-04-10 19:19:33.000000000 +0100
 @@ -14,10 +14,10 @@
  ##
  DEFS = -DHAVE_CONFIG_H -D_GNU_SOURCE