Revision: 25715
http://sourceforge.net/p/gar/code/25715
Author: dmichelsen
Date: 2016-05-19 12:00:41 +0000 (Thu, 19 May 2016)
Log Message:
-----------
binutils/trunk: Update to 2.26
Modified Paths:
--------------
csw/mgar/pkg/binutils/trunk/Makefile
csw/mgar/pkg/binutils/trunk/checksums
Added Paths:
-----------
csw/mgar/pkg/binutils/trunk/files/0001-Remove-existing-definition-of-SHARED-from-Solaris.patch
Removed 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 2016-05-19 07:17:27 UTC (rev
25714)
+++ csw/mgar/pkg/binutils/trunk/Makefile 2016-05-19 12:00:41 UTC (rev
25715)
@@ -1,33 +1,22 @@
NAME = binutils
-VERSION = 2.24
+VERSION = 2.26
GARTYPE = v2
DESCRIPTION = GNU binary utilities: gas, gld, gprof, and others
define BLURB
endef
-MASTER_SITES = $(GNU_MIRROR)
-DISTFILES = $(DISTNAME).tar.bz2
+MASTER_SITES += $(GNU_MIRROR)
+DISTFILES += $(DISTNAME).tar.bz2
-# PATCHFILES = 0001-Remove-gcc-specific-warning-no-error.patch
-# PATCHFILES += 0002-Use-func-instead-of-FUNCTION.patch
+PATCHFILES += 0001-Remove-existing-definition-of-SHARED-from-Solaris.patch
-# 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
-
-#where can we build?
PACKAGING_PLATFORMS += solaris9-sparc solaris9-i386
PACKAGING_PLATFORMS += solaris10-sparc solaris10-i386
-# EXTRA_CPPFLAGS += -features=extensions -D__FUNCTION__=__func__
+GARCOMPILER = GNU
-# We need GNU grep
-EXTRA_CONFIGURE_EXPORTS += GREP
-CONFIGURE_ENV_GREP = /opt/csw/bin/ggrep
-
-
+#CONFIGURE_ARGS = $(DIRPATHS) GREP=/opt/csw/bin/ggrep
CONFIGURE_ARGS += $(DIRPATHS)
CONFIGURE_ARGS += --program-prefix=g
# http://sourceware.org/bugzilla/show_bug.cgi?id=12265
@@ -37,37 +26,25 @@
CONFIGURE_ARGS += --enable-targets=all
CONFIGURE_ARGS += --enable-64-bit-bfd
-#CONFIGURE_ARGS-i386 += --enable-targets=i386-pc-solaris2.10,i686-pc-mingw32
-#CONFIGURE_ARGS += $(CONFIGURE_ARGS_$(GARCH))
-
-#CONFIGURE_ARGS += --enable-64-bit-bfd --enable-targets=all
-
-# These are now two tests failing:
-# Sparc:
-# Running
/home/dam/mgar/pkg/binutils/trunk/work/solaris9-sparc/build-isa-sparcv8/binutils-2.21.1/gas/testsuite/gas/elf/elf.exp
...
-# FAIL: group section name
-# i386:
-# Running
/home/dam/mgar/pkg/binutils/trunk/work/solaris9-i386/build-isa-i386/binutils-2.21.1/gas/testsuite/gas/i386/i386.exp
...
-# FAIL: x86-64 local PIC
-# SKIPTEST ?= 1
-
-GARCOMPILER = GNU
-
RUNTIME_DEP_PKGS_CSWbinutils += CSWlibiconv2
RUNTIME_DEP_PKGS_CSWbinutils += CSWlibintl8
RUNTIME_DEP_PKGS_CSWbinutils += CSWlibz1
-RUNTIME_DEP_PKGS_CSWbinutils-i386_5.10 += CSWlibfl2
-RUNTIME_DEP_PKGS_CSWbinutils-i386_5.11 += CSWlibfl2
-RUNTIME_DEP_PKGS_CSWbinutils +=
$(RUNTIME_DEP_PKGS_CSWbinutils-$(GARCH)_$(GAROSREL))
+RUNTIME_DEP_PKGS_CSWbinutils-5.10-i386 += CSWlibfl2
+RUNTIME_DEP_PKGS_CSWbinutils +=
$(RUNTIME_DEP_PKGS_CSWbinutils-$(GAROSREL)-$(GARCH))
+# We need grep -q
+CONFIGURE_ENV_PATH = /opt/csw/gnu:$(PATH)
+BUILD_ENV_PATH = /opt/csw/gnu:$(PATH)
+
+# This is just an extra search path /usr/local/lib in addition to /opt/csw/lib
CHECKPKG_OVERRIDES_CSWbinutils += file-with-bad-content
-#Until removed from GDB:
+# Until removed from GDB:
CHECKPKG_OVERRIDES_CSWbinutils +=
file-collision|/opt/csw/share/locale/uk/LC_MESSAGES/bfd.mo|CSWbinutils|CSWgdb
CHECKPKG_OVERRIDES_CSWbinutils +=
file-collision|/opt/csw/share/locale/it/LC_MESSAGES/opcodes.mo|CSWbinutils|CSWgdb
+CHECKPKG_OVERRIDES_CSWbinutils +=
file-collision|/opt/csw/include/plugin-api.h|CSWbinutils|CSWgdb
include gar/category.mk
-
post-install-modulated:
@# Every package carries his own links in /opt/csw/gnu
ginstall -d $(DESTDIR)$(prefix)/gnu
Modified: csw/mgar/pkg/binutils/trunk/checksums
===================================================================
--- csw/mgar/pkg/binutils/trunk/checksums 2016-05-19 07:17:27 UTC (rev
25714)
+++ csw/mgar/pkg/binutils/trunk/checksums 2016-05-19 12:00:41 UTC (rev
25715)
@@ -1 +1 @@
-e0f71a7b2ddab0f8612336ac81d9636b binutils-2.24.tar.bz2
+64146a0faa3b411ba774f47d41de239f binutils-2.26.tar.bz2
Added:
csw/mgar/pkg/binutils/trunk/files/0001-Remove-existing-definition-of-SHARED-from-Solaris.patch
===================================================================
---
csw/mgar/pkg/binutils/trunk/files/0001-Remove-existing-definition-of-SHARED-from-Solaris.patch
(rev 0)
+++
csw/mgar/pkg/binutils/trunk/files/0001-Remove-existing-definition-of-SHARED-from-Solaris.patch
2016-05-19 12:00:41 UTC (rev 25715)
@@ -0,0 +1,26 @@
+From 52eb0b7d60523d371da65cb51dff9624221f2702 Mon Sep 17 00:00:00 2001
+From: Dagobert Michelsen <d...@opencsw.org>
+Date: Thu, 19 May 2016 11:42:37 +0200
+Subject: [PATCH] Remove existing definition of SHARED from Solaris
+
+---
+ ld/deffilep.y | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/ld/deffilep.y b/ld/deffilep.y
+index bf4cf5f..c2f0995 100644
+--- a/ld/deffilep.y
++++ b/ld/deffilep.y
+@@ -108,6 +108,9 @@ static int lex_forced_token = 0;
+ static const char *lex_parse_string = 0;
+ static const char *lex_parse_string_end = 0;
+
++/* Solaris has a colliding definition in /usr/include/sys/mman.h:92 */
++#undef SHARED
++
+ %}
+
+ %union {
+--
+2.0.3
+
Deleted:
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
2016-05-19 07:17:27 UTC (rev 25714)
+++
csw/mgar/pkg/binutils/trunk/files/0001-Remove-gcc-specific-warning-no-error.patch
2016-05-19 12:00:41 UTC (rev 25715)
@@ -1,63 +0,0 @@
-From 36557d4e77aaca996e7906ec5c9e9899f8b44135 Mon Sep 17 00:00:00 2001
-From: Dagobert Michelsen <d...@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
-
Deleted:
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
2016-05-19 07:17:27 UTC (rev 25714)
+++ csw/mgar/pkg/binutils/trunk/files/0002-Use-func-instead-of-FUNCTION.patch
2016-05-19 12:00:41 UTC (rev 25715)
@@ -1,39 +0,0 @@
-From de1f53ab369be21c59cc9b2dd2e68aee27b19de8 Mon Sep 17 00:00:00 2001
-From: Dagobert Michelsen <d...@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.
