Sat, 26 Mar 2011 17:31:59 +0100
Upgrade to current upstream vendor version and correct autoconf logic.
binutils/binutils.patch | file | annotate | diff | comparison | revisions | |
binutils/binutils.spec | file | annotate | diff | comparison | revisions |
1.1 --- a/binutils/binutils.patch Sat Mar 26 17:30:52 2011 +0100 1.2 +++ b/binutils/binutils.patch Sat Mar 26 17:31:59 2011 +0100 1.3 @@ -8,9 +8,9 @@ 1.4 linker under Solaris 10/amd64. 1.5 1.6 Index: include/elf/common.h 1.7 ---- include/elf/common.h.orig 2007-08-28 19:19:40 +0200 1.8 -+++ include/elf/common.h 2007-08-29 09:30:04 +0200 1.9 -@@ -353,6 +353,9 @@ 1.10 +--- include/elf/common.h.orig 2010-05-18 05:31:06.000000000 +0200 1.11 ++++ include/elf/common.h 2010-12-09 16:48:56.000000000 +0100 1.12 +@@ -474,6 +474,9 @@ 1.13 #define SHT_SUNW_verdef 0x6ffffffd /* Versions defined by file */ 1.14 #define SHT_SUNW_verneed 0x6ffffffe /* Versions needed by file */ 1.15 #define SHT_SUNW_versym 0x6fffffff /* Symbol versions */ 1.16 @@ -21,9 +21,9 @@ 1.17 #define SHT_GNU_verdef SHT_SUNW_verdef 1.18 #define SHT_GNU_verneed SHT_SUNW_verneed 1.19 Index: bfd/elf.c 1.20 ---- bfd/elf.c.orig 2007-08-28 19:19:33 +0200 1.21 -+++ bfd/elf.c 2007-08-29 09:30:04 +0200 1.22 -@@ -1793,6 +1793,11 @@ 1.23 +--- bfd/elf.c.orig 2010-10-29 14:10:24.000000000 +0200 1.24 ++++ bfd/elf.c 2010-12-09 16:48:57.000000000 +0100 1.25 +@@ -1884,6 +1884,11 @@ 1.26 elf_tdata (abfd)->dynverref_hdr = *hdr; 1.27 return _bfd_elf_make_section_from_shdr (abfd, hdr, name, shindex); 1.28 1.29 @@ -35,7 +35,7 @@ 1.30 case SHT_SHLIB: 1.31 return TRUE; 1.32 1.33 -@@ -4682,6 +4687,12 @@ 1.34 +@@ -5036,6 +5041,12 @@ 1.35 else 1.36 i_ehdrp->e_type = ET_REL; 1.37 1.38 @@ -49,9 +49,9 @@ 1.39 { 1.40 case bfd_arch_unknown: 1.41 Index: bfd/elf64-x86-64.c 1.42 ---- bfd/elf64-x86-64.c.orig 2007-08-06 21:59:33 +0200 1.43 -+++ bfd/elf64-x86-64.c 2007-08-29 09:30:04 +0200 1.44 -@@ -345,7 +345,11 @@ 1.45 +--- bfd/elf64-x86-64.c.orig 2010-10-21 14:29:02.000000000 +0200 1.46 ++++ bfd/elf64-x86-64.c 2010-12-09 16:48:57.000000000 +0100 1.47 +@@ -360,7 +360,11 @@ 1.48 /* The name of the dynamic interpreter. This is put in the .interp 1.49 section. */ 1.50 1.51 @@ -69,9 +69,9 @@ 1.52 Support FreeBSD >= 4.10 by fixing platform detection. 1.53 1.54 Index: bfd/configure 1.55 ---- bfd/configure.orig 2007-08-28 22:19:51 +0200 1.56 -+++ bfd/configure 2007-08-29 09:30:04 +0200 1.57 -@@ -17459,6 +17459,10 @@ 1.58 +--- bfd/configure.orig 2010-12-08 09:37:34.000000000 +0100 1.59 ++++ bfd/configure 2010-12-09 16:48:57.000000000 +0100 1.60 +@@ -13876,6 +13876,10 @@ 1.61 i[3-7]86-*-bsdi) 1.62 COREFILE= 1.63 ;; 1.64 @@ -88,8 +88,8 @@ 1.65 Fight problems with --disable-nls under Solaris 1.66 1.67 Index: gas/asintl.h 1.68 ---- gas/asintl.h.orig 2007-08-06 21:59:49 +0200 1.69 -+++ gas/asintl.h 2007-08-29 09:30:04 +0200 1.70 +--- gas/asintl.h.orig 2007-07-03 13:01:02.000000000 +0200 1.71 ++++ gas/asintl.h 2010-12-09 16:48:57.000000000 +0100 1.72 @@ -20,6 +20,11 @@ 1.73 Software Foundation, 51 Franklin Street - Fifth Floor, Boston, MA 1.74 02110-1301, USA. */ 1.75 @@ -103,8 +103,8 @@ 1.76 # ifndef ENABLE_NLS 1.77 /* The Solaris version of locale.h always includes libintl.h. If we have 1.78 Index: ld/ld.h 1.79 ---- ld/ld.h.orig 2007-08-06 22:00:19 +0200 1.80 -+++ ld/ld.h 2007-08-29 09:30:04 +0200 1.81 +--- ld/ld.h.orig 2009-11-26 14:45:25.000000000 +0100 1.82 ++++ ld/ld.h 2010-12-09 16:48:57.000000000 +0100 1.83 @@ -23,6 +23,11 @@ 1.84 #ifndef LD_H 1.85 #define LD_H 1.86 @@ -118,9 +118,9 @@ 1.87 #endif 1.88 #ifndef SEEK_CUR 1.89 Index: ld/Makefile.in 1.90 ---- ld/Makefile.in.orig 2007-08-06 22:29:54 +0200 1.91 -+++ ld/Makefile.in 2007-08-29 09:30:04 +0200 1.92 -@@ -287,7 +287,7 @@ 1.93 +--- ld/Makefile.in.orig 2010-11-05 11:34:22.000000000 +0100 1.94 ++++ ld/Makefile.in 2010-12-09 16:48:57.000000000 +0100 1.95 +@@ -360,7 +360,7 @@ 1.96 # We put the scripts in the directory $(scriptdir)/ldscripts. 1.97 # We can't put the scripts in $(datadir) because the SEARCH_DIR 1.98 # directives need to be different for native and cross linkers. 1.99 @@ -132,11 +132,11 @@ 1.100 1.101 ----------------------------------------------------------------------------- 1.102 1.103 -workaround problems under Mac OS X. 1.104 +Workaround problems under Mac OS X. 1.105 1.106 Index: libiberty/fibheap.c 1.107 ---- libiberty/fibheap.c.orig 2005-05-10 17:33:33 +0200 1.108 -+++ libiberty/fibheap.c 2007-08-29 09:30:04 +0200 1.109 +--- libiberty/fibheap.c.orig 2009-05-29 05:01:15.000000000 +0200 1.110 ++++ libiberty/fibheap.c 2010-12-09 16:48:57.000000000 +0100 1.111 @@ -34,8 +34,11 @@ 1.112 #include "libiberty.h" 1.113 #include "fibheap.h" 1.114 @@ -161,38 +161,18 @@ 1.115 any problems and this message really confused, just disable it for now. 1.116 1.117 Index: bfd/elf-eh-frame.c 1.118 ---- bfd/elf-eh-frame.c.orig 2007-08-06 21:59:22 +0200 1.119 -+++ bfd/elf-eh-frame.c 2007-11-11 15:46:44 +0100 1.120 -@@ -970,9 +970,11 @@ 1.121 - return offset != sec->rawsize; 1.122 +--- bfd/elf-eh-frame.c.orig 2010-04-09 16:40:15.000000000 +0200 1.123 ++++ bfd/elf-eh-frame.c 2010-12-09 16:48:57.000000000 +0100 1.124 +@@ -909,9 +909,11 @@ 1.125 + goto success; 1.126 1.127 - free_no_table: 1.128 + free_no_table: 1.129 +#if 0 1.130 (*info->callbacks->einfo) 1.131 (_("%P: error in %B(%A); no .eh_frame_hdr table will be created.\n"), 1.132 abfd, sec); 1.133 +#endif 1.134 - if (ehbuf) 1.135 - free (ehbuf); 1.136 + hdr_info->table = FALSE; 1.137 if (sec_info) 1.138 -Index: bfd/elflink.c 1.139 -diff -Nau bfd/elflink.c.orig bfd/elflink.c 1.140 ---- bfd/elflink.c.orig 2007-08-24 16:01:08.000000000 +0200 1.141 -+++ bfd/elflink.c 2009-01-11 14:07:54.705525343 +0100 1.142 -@@ -4231,7 +4231,15 @@ 1.143 - h->ref_regular_nonweak = 1; 1.144 - } 1.145 - else 1.146 -- h->def_regular = 1; 1.147 -+ { 1.148 -+ h->def_regular = 1; 1.149 -+ if (h->def_dynamic) 1.150 -+ { 1.151 -+ h->def_dynamic = 0; 1.152 -+ h->ref_dynamic = 1; 1.153 -+ h->dynamic_def = 1; 1.154 -+ } 1.155 -+ } 1.156 - if (! info->executable 1.157 - || h->def_dynamic 1.158 - || h->ref_dynamic) 1.159 + free (sec_info); 1.160 +
2.1 --- a/binutils/binutils.spec Sat Mar 26 17:30:52 2011 +0100 2.2 +++ b/binutils/binutils.spec Sat Mar 26 17:31:59 2011 +0100 2.3 @@ -1,6 +1,6 @@ 2.4 ## 2.5 ## binutils.spec -- OpenPKG RPM Package Specification 2.6 -## Copyright (c) 2000-2008 OpenPKG Foundation e.V. <http://openpkg.net/> 2.7 +## Copyright (c) 2000-2010 OpenPKG Foundation e.V. <http://openpkg.net/> 2.8 ## 2.9 ## Permission to use, copy, modify, and distribute this software for 2.10 ## any purpose with or without fee is hereby granted, provided that 2.11 @@ -31,8 +31,8 @@ 2.12 Class: CORE 2.13 Group: Compiler 2.14 License: GPL 2.15 -Version: 2.18 2.16 -Release: 20090106 2.17 +Version: 2.21 2.18 +Release: 20101212 2.19 2.20 # list of sources 2.21 Source0: ftp://sources.redhat.com/pub/binutils/releases/binutils-%{version}.tar.bz2 2.22 @@ -41,8 +41,8 @@ 2.23 # build information 2.24 Prefix: %{l_prefix} 2.25 BuildRoot: %{l_buildroot} 2.26 -BuildPreReq: OpenPKG, openpkg >= 20060419, make 2.27 -PreReq: OpenPKG, openpkg >= 20060419 2.28 +BuildPreReq: OpenPKG, openpkg >= 20060823, make 2.29 +PreReq: OpenPKG, openpkg >= 20060823 2.30 AutoReq: no 2.31 AutoReqProv: no 2.32 2.33 @@ -96,6 +96,8 @@ 2.34 CONFIG_SHELL="%{l_bash}" \ 2.35 ./configure \ 2.36 --prefix=%{l_prefix} \ 2.37 + --mandir=%{l_prefix}/man \ 2.38 + --infodir=%{l_prefix}/info \ 2.39 --includedir=%{l_prefix}/include/binutils \ 2.40 --libdir=%{l_prefix}/lib/binutils \ 2.41 --disable-werror \ 2.42 @@ -103,7 +105,7 @@ 2.43 $ARGS 2.44 2.45 # build package 2.46 - %{l_make} %{l_mflags} 2.47 + %{l_make} %{l_mflags} GREP="grep" 2.48 2.49 %install 2.50 rm -rf $RPM_BUILD_ROOT 2.51 @@ -112,6 +114,8 @@ 2.52 %{l_make} %{l_mflags} install \ 2.53 prefix=$RPM_BUILD_ROOT%{l_prefix} \ 2.54 exec_prefix=$RPM_BUILD_ROOT%{l_prefix} \ 2.55 + mandir=$RPM_BUILD_ROOT%{l_prefix}/man \ 2.56 + infodir=$RPM_BUILD_ROOT%{l_prefix}/info \ 2.57 includedir=$RPM_BUILD_ROOT%{l_prefix}/include/binutils \ 2.58 libdir=$RPM_BUILD_ROOT%{l_prefix}/lib/binutils 2.59 2.60 @@ -143,6 +147,7 @@ 2.61 rm -f $RPM_BUILD_ROOT%{l_prefix}/man/man1/dlltool.1 2.62 rm -f $RPM_BUILD_ROOT%{l_prefix}/man/man1/nlmconv.1 2.63 rm -f $RPM_BUILD_ROOT%{l_prefix}/man/man1/windres.1 2.64 + rm -f $RPM_BUILD_ROOT%{l_prefix}/man/man1/windmc.1 2.65 rm -rf $RPM_BUILD_ROOT%{l_prefix}/*-*-* 2.66 rm -rf $RPM_BUILD_ROOT%{l_prefix}/bin/c++filt 2.67 strip $RPM_BUILD_ROOT%{l_prefix}/bin/* >/dev/null 2>&1 || true