[csw-devel] SF.net SVN: gar:[7867] csw/mgar/pkg/binutils/trunk
dmichelsen at users.sourceforge.net
dmichelsen at users.sourceforge.net
Mon Jan 4 22:40:39 CET 2010
Revision: 7867
http://gar.svn.sourceforge.net/gar/?rev=7867&view=rev
Author: dmichelsen
Date: 2010-01-04 21:40:39 +0000 (Mon, 04 Jan 2010)
Log Message:
-----------
binutils: Update to 2.20, add patches
Modified Paths:
--------------
csw/mgar/pkg/binutils/trunk/Makefile
csw/mgar/pkg/binutils/trunk/checksums
Added Paths:
-----------
csw/mgar/pkg/binutils/trunk/files/0001-Remove-gcc-specific-warning-no-error.patch
csw/mgar/pkg/binutils/trunk/files/0002-Use-func-instead-of-FUNCTION.patch
Modified: csw/mgar/pkg/binutils/trunk/Makefile
===================================================================
--- csw/mgar/pkg/binutils/trunk/Makefile 2010-01-04 21:23:44 UTC (rev 7866)
+++ csw/mgar/pkg/binutils/trunk/Makefile 2010-01-04 21:40:39 UTC (rev 7867)
@@ -1,5 +1,5 @@
GARNAME = binutils
-GARVERSION = 2.19.1
+GARVERSION = 2.20
CATEGORIES = utils
DESCRIPTION = GNU binary utilities: gas, gld, gprof, and others
@@ -7,8 +7,13 @@
endef
MASTER_SITES = $(GNU_MIRROR)
-DISTFILES = $(GARNAME)-$(GARVERSION).tar.bz2
+DISTFILES = $(GARNAME)-$(GARVERSION).tar.bz2
+# These have been reported as
+# <http://sourceware.org/bugzilla/show_bug.cgi?id=11129>
+PATCHFILES = 0001-Remove-gcc-specific-warning-no-error.patch
+PATCHFILES += 0002-Use-func-instead-of-FUNCTION.patch
+
REQUIRED_PKGS = CSWzlib CSWiconv CSWggettextrt
# We define upstream file regex so we can be notifed of new upstream software release
@@ -16,7 +21,16 @@
BUILD64 = 1
CONFIGURE_ARGS = $(DIRPATHS)
+CONFIGURE_ARGS += --program-prefix=g
+ifeq ($(GARCH),i386)
+CONFIGURE_ARGS += --enable-targets=i386-pc-solaris2.10,i686-pc-mingw32
+endif
+
TEST_TARGET = check
+# Do not run tests until this is fixed:
+# <http://sourceware.org/bugzilla/show_bug.cgi?id=11128>
+SKIPTEST ?= 1
+
include gar/category.mk
Modified: csw/mgar/pkg/binutils/trunk/checksums
===================================================================
--- csw/mgar/pkg/binutils/trunk/checksums 2010-01-04 21:23:44 UTC (rev 7866)
+++ csw/mgar/pkg/binutils/trunk/checksums 2010-01-04 21:40:39 UTC (rev 7867)
@@ -1 +1,3 @@
-09a8c5821a2dfdbb20665bc0bd680791 download/binutils-2.19.1.tar.bz2
+da13e88df454002f329e47f26cc51018 0001-Remove-gcc-specific-warning-no-error.patch
+52296e0f180d98a9857913a5d9050907 0002-Use-func-instead-of-FUNCTION.patch
+ee2d3e996e9a2d669808713360fa96f8 binutils-2.20.tar.bz2
Added: csw/mgar/pkg/binutils/trunk/files/0001-Remove-gcc-specific-warning-no-error.patch
===================================================================
--- csw/mgar/pkg/binutils/trunk/files/0001-Remove-gcc-specific-warning-no-error.patch (rev 0)
+++ csw/mgar/pkg/binutils/trunk/files/0001-Remove-gcc-specific-warning-no-error.patch 2010-01-04 21:40:39 UTC (rev 7867)
@@ -0,0 +1,63 @@
+From 36557d4e77aaca996e7906ec5c9e9899f8b44135 Mon Sep 17 00:00:00 2001
+From: Dagobert Michelsen <dam at opencsw.org>
+Date: Mon, 4 Jan 2010 10:33:49 +0100
+Subject: [PATCH] Remove gcc specific warning no-error
+
+---
+ binutils/Makefile.am | 8 ++++----
+ binutils/Makefile.in | 8 ++++----
+ 2 files changed, 8 insertions(+), 8 deletions(-)
+
+diff --git a/binutils/Makefile.am b/binutils/Makefile.am
+index abade21..ff935bc 100644
+--- a/binutils/Makefile.am
++++ b/binutils/Makefile.am
+@@ -255,16 +255,16 @@ sysinfo$(EXEEXT_FOR_BUILD): sysinfo.o syslex.o
+
+ syslex.o: syslex.c sysinfo.h config.h
+ if [ -r syslex.c ]; then \
+- $(CC_FOR_BUILD) -c -I. $(AM_CFLAGS) $(CFLAGS_FOR_BUILD) syslex.c -Wno-error ; \
++ $(CC_FOR_BUILD) -c -I. $(AM_CFLAGS) $(CFLAGS_FOR_BUILD) syslex.c ; \
+ else \
+- $(CC_FOR_BUILD) -c -I. -I$(srcdir) $(AM_CFLAGS) $(CFLAGS_FOR_BUILD) $(srcdir)/syslex.c -Wno-error ;\
++ $(CC_FOR_BUILD) -c -I. -I$(srcdir) $(AM_CFLAGS) $(CFLAGS_FOR_BUILD) $(srcdir)/syslex.c ;\
+ fi
+
+ sysinfo.o: sysinfo.c
+ if [ -r sysinfo.c ]; then \
+- $(CC_FOR_BUILD) -c -I. $(AM_CFLAGS) $(CFLAGS_FOR_BUILD) sysinfo.c -Wno-error ; \
++ $(CC_FOR_BUILD) -c -I. $(AM_CFLAGS) $(CFLAGS_FOR_BUILD) sysinfo.c ; \
+ else \
+- $(CC_FOR_BUILD) -c -I. $(AM_CFLAGS) $(CFLAGS_FOR_BUILD) $(srcdir)/sysinfo.c -Wno-error ; \
++ $(CC_FOR_BUILD) -c -I. $(AM_CFLAGS) $(CFLAGS_FOR_BUILD) $(srcdir)/sysinfo.c ; \
+ fi
+
+ bin2c$(EXEEXT_FOR_BUILD):
+diff --git a/binutils/Makefile.in b/binutils/Makefile.in
+index a1f3800..543ab6c 100644
+--- a/binutils/Makefile.in
++++ b/binutils/Makefile.in
+@@ -1197,16 +1197,16 @@ sysinfo$(EXEEXT_FOR_BUILD): sysinfo.o syslex.o
+
+ syslex.o: syslex.c sysinfo.h config.h
+ if [ -r syslex.c ]; then \
+- $(CC_FOR_BUILD) -c -I. $(AM_CFLAGS) $(CFLAGS_FOR_BUILD) syslex.c -Wno-error ; \
++ $(CC_FOR_BUILD) -c -I. $(AM_CFLAGS) $(CFLAGS_FOR_BUILD) syslex.c ; \
+ else \
+- $(CC_FOR_BUILD) -c -I. -I$(srcdir) $(AM_CFLAGS) $(CFLAGS_FOR_BUILD) $(srcdir)/syslex.c -Wno-error ;\
++ $(CC_FOR_BUILD) -c -I. -I$(srcdir) $(AM_CFLAGS) $(CFLAGS_FOR_BUILD) $(srcdir)/syslex.c ;\
+ fi
+
+ sysinfo.o: sysinfo.c
+ if [ -r sysinfo.c ]; then \
+- $(CC_FOR_BUILD) -c -I. $(AM_CFLAGS) $(CFLAGS_FOR_BUILD) sysinfo.c -Wno-error ; \
++ $(CC_FOR_BUILD) -c -I. $(AM_CFLAGS) $(CFLAGS_FOR_BUILD) sysinfo.c ; \
+ else \
+- $(CC_FOR_BUILD) -c -I. $(AM_CFLAGS) $(CFLAGS_FOR_BUILD) $(srcdir)/sysinfo.c -Wno-error ; \
++ $(CC_FOR_BUILD) -c -I. $(AM_CFLAGS) $(CFLAGS_FOR_BUILD) $(srcdir)/sysinfo.c ; \
+ fi
+
+ bin2c$(EXEEXT_FOR_BUILD):
+--
+1.6.6
+
Added: csw/mgar/pkg/binutils/trunk/files/0002-Use-func-instead-of-FUNCTION.patch
===================================================================
--- csw/mgar/pkg/binutils/trunk/files/0002-Use-func-instead-of-FUNCTION.patch (rev 0)
+++ csw/mgar/pkg/binutils/trunk/files/0002-Use-func-instead-of-FUNCTION.patch 2010-01-04 21:40:39 UTC (rev 7867)
@@ -0,0 +1,39 @@
+From de1f53ab369be21c59cc9b2dd2e68aee27b19de8 Mon Sep 17 00:00:00 2001
+From: Dagobert Michelsen <dam at opencsw.org>
+Date: Mon, 4 Jan 2010 12:34:30 +0100
+Subject: [PATCH] Use func instead of FUNCTION
+
+---
+ bfd/elf32-i386.c | 2 ++
+ bfd/elf64-x86-64.c | 2 ++
+ 2 files changed, 4 insertions(+), 0 deletions(-)
+
+diff --git a/bfd/elf32-i386.c b/bfd/elf32-i386.c
+index 9de1a6c..d39fd6e 100644
+--- a/bfd/elf32-i386.c
++++ b/bfd/elf32-i386.c
+@@ -29,6 +29,8 @@
+ #include "objalloc.h"
+ #include "hashtab.h"
+
++#define __FUNCTION__ __func__
++
+ /* 386 uses REL relocations instead of RELA. */
+ #define USE_REL 1
+
+diff --git a/bfd/elf64-x86-64.c b/bfd/elf64-x86-64.c
+index 4fb325a..4f24260 100644
+--- a/bfd/elf64-x86-64.c
++++ b/bfd/elf64-x86-64.c
+@@ -31,6 +31,8 @@
+
+ #include "elf/x86-64.h"
+
++#define __FUNCTION__ __func__
++
+ /* In case we're on a 32-bit machine, construct a 64-bit "-1" value. */
+ #define MINUS_ONE (~ (bfd_vma) 0)
+
+--
+1.6.5.1
+
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the devel
mailing list