[prev in list] [next in list] [prev in thread] [next in thread]
List: ipcop-svn
Subject: [Ipcop-svn] SF.net SVN: ipcop:[6772] ipcop/trunk
From: gespinasse () users ! sourceforge ! net
Date: 2012-08-19 19:58:10
Message-ID: E1T3BdS-00064K-MW () sfp-svn-2 ! v30 ! ch3 ! sourceforge ! com
[Download RAW message or body]
Revision: 6772
http://ipcop.svn.sourceforge.net/ipcop/?rev=6772&view=rev
Author: gespinasse
Date: 2012-08-19 19:58:10 +0000 (Sun, 19 Aug 2012)
Log Message:
-----------
Upgrade binutils to 2.22
Drop previous debian patches, that doesn't look essential.
Modified Paths:
--------------
ipcop/trunk/lfs/binutils
Removed Paths:
-------------
ipcop/trunk/src/patches/binutils-2.21_012_check_ldrunpath_length.patch
ipcop/trunk/src/patches/binutils-2.21_143_pr42602.patch
ipcop/trunk/src/patches/binutils-2.21_testsuite-ld-plugin.patch
Modified: ipcop/trunk/lfs/binutils
===================================================================
--- ipcop/trunk/lfs/binutils 2012-08-19 19:52:11 UTC (rev 6771)
+++ ipcop/trunk/lfs/binutils 2012-08-19 19:58:10 UTC (rev 6772)
@@ -33,12 +33,12 @@
include Config
PKG_NAME = binutils
-VER = 2.21.1
+VER = 2.22
HOST_ARCH = all
OTHER_SRC = yes
THISAPP = $(PKG_NAME)-$(VER)
-DL_FILE = $(THISAPP)a.tar.bz2
+DL_FILE = $(THISAPP).tar.bz2
DL_FROM = $(URL_GNU)/$(PKG_NAME)
DIR_APP = $(DIR_SRC)/$(THISAPP)
@@ -64,7 +64,7 @@
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = bde820eac53fa3a8d8696667418557ad
+$(DL_FILE)_MD5 = ee0f10756c84979622b992a4a61ea3f5
install : $(TARGET)
@@ -111,11 +111,6 @@
@$(PREBUILD)
@rm -rf $(DIR_APP) $(DIR_SRC)/binutils-build
cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE)
- cd $(DIR_APP) && patch -Np1 -i \
$(DIR_PATCHES)/$(PKG_NAME)-2.21_testsuite-ld-plugin.patch
- # borrowed from debian 2.20.1-10
- cd $(DIR_APP) && patch -Np1 -i \
$(DIR_PATCHES)/$(PKG_NAME)-2.21_012_check_ldrunpath_length.patch
- cd $(DIR_APP) && patch -Np1 -i $(DIR_PATCHES)/$(PKG_NAME)-2.21_143_pr42602.patch
-
@mkdir -p $(DIR_SRC)/binutils-build
ifeq "$(PASS)" "1"
Deleted: ipcop/trunk/src/patches/binutils-2.21_012_check_ldrunpath_length.patch
===================================================================
--- ipcop/trunk/src/patches/binutils-2.21_012_check_ldrunpath_length.patch 2012-08-19 \
19:52:11 UTC (rev 6771)
+++ ipcop/trunk/src/patches/binutils-2.21_012_check_ldrunpath_length.patch 2012-08-19 \
19:58:10 UTC (rev 6772) @@ -1,47 +0,0 @@
-#!/bin/sh -e
-## 012_check_ldrunpath_length.dpatch by Chris Chimelis <chris@debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Only generate an RPATH entry if LD_RUN_PATH is not empty, for
-## DP: cases where -rpath isn't specified. (#151024)
-
-if [ $# -ne 1 ]; then
- echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
- exit 1
-fi
-
-[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts
-patch_opts="${patch_opts:--f --no-backup-if-mismatch}"
-
-case "$1" in
- -patch) patch $patch_opts -p1 < $0;;
- -unpatch) patch $patch_opts -p1 -R < $0;;
- *)
- echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
- exit 1;;
-esac
-
-exit 0
-
-@DPATCH@
-diff -urNad binutils-2.16/ld/emultempl/elf32.em \
/tmp/dpep.u3SQkH/binutils-2.16/ld/emultempl/elf32.em
---- binutils-2.16/ld/emultempl/elf32.em 2005-04-13 19:59:07.000000000 +0200
-+++ /tmp/dpep.u3SQkH/binutils-2.16/ld/emultempl/elf32.em 2005-05-06 \
19:18:08.236669718 +0200
-@@ -1270,6 +1270,8 @@
- && command_line.rpath == NULL)
- {
- lib_path = (const char *) getenv ("LD_RUN_PATH");
-+ if ((lib_path) && (strlen (lib_path) == 0))
-+ lib_path = NULL;
- if (gld${EMULATION_NAME}_search_needed (lib_path, &n,
- force))
- break;
-@@ -1497,6 +1499,8 @@
- rpath = command_line.rpath;
- if (rpath == NULL)
- rpath = (const char *) getenv ("LD_RUN_PATH");
-+ if ((rpath) && (strlen (rpath) == 0))
-+ rpath = NULL;
-
- for (abfd = link_info.input_bfds; abfd; abfd = abfd->link_next)
- if (bfd_get_flavour (abfd) == bfd_target_elf_flavour)
Deleted: ipcop/trunk/src/patches/binutils-2.21_143_pr42602.patch
===================================================================
--- ipcop/trunk/src/patches/binutils-2.21_143_pr42602.patch 2012-08-19 19:52:11 UTC \
(rev 6771)
+++ ipcop/trunk/src/patches/binutils-2.21_143_pr42602.patch 2012-08-19 19:58:10 UTC \
(rev 6772) @@ -1,89 +0,0 @@
-#!/bin/sh -e
-## 143_pr42602.dpatch
-##
-## DP: Description: Fix PR other/42602: demangling a global constructors symbol
-
-if [ $# -ne 1 ]; then
- echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
- exit 1
-fi
-
-[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts
-patch_opts="${patch_opts:--f --no-backup-if-mismatch}"
-
-case "$1" in
- -patch) patch $patch_opts -p1 < $0;;
- -unpatch) patch $patch_opts -p1 -R < $0;;
- *)
- echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
- exit 1;;
-esac
-
-exit 0
-
-2010-01-09 H.J. Lu <hongjiu.lu@intel.com>
-
- PR other/42602
- * cp-demangle.c (d_make_demangle_mangled_name): New.
- (d_demangle_callback): Use it on DCT_GLOBAL_XTORS.
-
- * testsuite/demangle-expected: Updated.
-
-@DPATCH@
-diff --git a/libiberty/cp-demangle.c b/libiberty/cp-demangle.c
-index 43cf34a..878aeae 100644
---- a/libiberty/cp-demangle.c
-+++ b/libiberty/cp-demangle.c
-@@ -320,6 +320,9 @@ static struct demangle_component *
- d_make_name (struct d_info *, const char *, int);
-
- static struct demangle_component *
-+d_make_demangle_mangled_name (struct d_info *, const char *, int);
-+
-+static struct demangle_component *
- d_make_builtin_type (struct d_info *,
- const struct demangle_builtin_type_info *);
-
-@@ -864,6 +867,17 @@ d_make_comp (struct d_info *di, enum demangle_component_type \
type,
- return p;
- }
-
-+/* Add a new demangle mangled name component. */
-+
-+static struct demangle_component *
-+d_make_demangle_mangled_name (struct d_info *di, const char *s, int len)
-+{
-+ if (d_peek_char (di) != '_' || d_peek_next_char (di) != 'Z')
-+ return d_make_name (di, s, len);
-+ d_advance (di, 2);
-+ return d_encoding (di, 0);
-+}
-+
- /* Add a new name component. */
-
- static struct demangle_component *
-@@ -4728,7 +4742,8 @@ d_demangle_callback (const char *mangled, int options,
- (type == DCT_GLOBAL_CTORS
- ? DEMANGLE_COMPONENT_GLOBAL_CONSTRUCTORS
- : DEMANGLE_COMPONENT_GLOBAL_DESTRUCTORS),
-- d_make_name (&di, d_str (&di), strlen (d_str (&di))),
-+ d_make_demangle_mangled_name (&di, d_str (&di),
-+ strlen (d_str (&di))),
- NULL);
- d_advance (&di, strlen (d_str (&di)));
- break;
-diff --git a/libiberty/testsuite/demangle-expected \
b/libiberty/testsuite/demangle-expected
-index 6798154..578da62 100644
---- a/libiberty/testsuite/demangle-expected
-+++ b/libiberty/testsuite/demangle-expected
-@@ -3595,8 +3595,8 @@ std::_Alloc_traits<std::basic_string<char, \
std::string_char_traits<char>, libcw:
- #
- --format=gnu-v3 --no-params
- _GLOBAL__I__Z2fnv
--global constructors keyed to _Z2fnv
--global constructors keyed to _Z2fnv
-+global constructors keyed to fn()
-+global constructors keyed to fn()
- #
- --format=gnu-v3 --no-params
- _Z1rM1GFivEMS_KFivES_M1HFivES1_4whatIKS_E5what2IS8_ES3_
Deleted: ipcop/trunk/src/patches/binutils-2.21_testsuite-ld-plugin.patch
===================================================================
--- ipcop/trunk/src/patches/binutils-2.21_testsuite-ld-plugin.patch 2012-08-19 \
19:52:11 UTC (rev 6771)
+++ ipcop/trunk/src/patches/binutils-2.21_testsuite-ld-plugin.patch 2012-08-19 \
19:58:10 UTC (rev 6772) @@ -1,16 +0,0 @@
-Fix binutils test : FAIL: plugin claimfile lost symbol
-
-From upstream:
-http://sourceware.org/ml/binutils/2010-11/msg00140.html
-http://git.kernel.org/?p=devel/binutils/hjl/x86.git;a=commitdiff;h=0b4b7aa6e6e4b218ab623b5adc1eb980416bffd8
-
---- binutils-2.21/ld/testsuite/ld-plugin/plugin-6.d.old 2011-01-03 \
21:28:37.000000000 +0100
-+++ binutils-2.21/ld/testsuite/ld-plugin/plugin-6.d 2011-01-03 21:28:48.000000000 \
+0100
-@@ -26,6 +26,6 @@
- #...
- hook called: all symbols read.
- tmpdir/main.o: In function `main':
--.*ld/testsuite/ld-plugin/main.c:12: undefined reference to `func'
-+.*main.c.*: undefined reference to `func'
- hook called: cleanup.
- #...
This was sent by the SourceForge.net collaborative development platform, the world's \
largest Open Source development site.
------------------------------------------------------------------------------
Live Security Virtual Conference
Exclusive live event will cover all the ways today's security and
threat landscape has changed and how IT managers can respond. Discussions
will include endpoint security, mobile security and the latest in malware
threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/
_______________________________________________
Ipcop-svn mailing list
Ipcop-svn@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/ipcop-svn
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic