# HG changeset patch # User Michael Schloh von Bennewitz # Date 1343721767 -7200 # Node ID 7543b0b3134d0ae3b3a15aaa11e39a56310418b1 # Parent d9798afea31cd14d3f574691e454ec26de4d7c26 Resynchronize with upstream package maintainer version. diff -r d9798afea31c -r 7543b0b3134d binutils/binutils.patch --- a/binutils/binutils.patch Tue Jul 31 09:41:21 2012 +0200 +++ b/binutils/binutils.patch Tue Jul 31 10:02:47 2012 +0200 @@ -8,9 +8,9 @@ linker under Solaris 10/amd64. Index: include/elf/common.h ---- include/elf/common.h.orig 2010-05-18 05:31:06.000000000 +0200 -+++ include/elf/common.h 2010-12-09 16:48:56.000000000 +0100 -@@ -474,6 +474,9 @@ +--- include/elf/common.h.orig 2011-07-22 22:22:36.000000000 +0200 ++++ include/elf/common.h 2011-11-22 21:09:42.000000000 +0100 +@@ -475,6 +475,9 @@ #define SHT_SUNW_verdef 0x6ffffffd /* Versions defined by file */ #define SHT_SUNW_verneed 0x6ffffffe /* Versions needed by file */ #define SHT_SUNW_versym 0x6fffffff /* Symbol versions */ @@ -21,9 +21,9 @@ #define SHT_GNU_verdef SHT_SUNW_verdef #define SHT_GNU_verneed SHT_SUNW_verneed Index: bfd/elf.c ---- bfd/elf.c.orig 2010-10-29 14:10:24.000000000 +0200 -+++ bfd/elf.c 2010-12-09 16:48:57.000000000 +0100 -@@ -1884,6 +1884,11 @@ +--- bfd/elf.c.orig 2011-07-03 15:37:06.000000000 +0200 ++++ bfd/elf.c 2011-11-22 21:09:42.000000000 +0100 +@@ -1907,6 +1907,11 @@ elf_tdata (abfd)->dynverref_hdr = *hdr; return _bfd_elf_make_section_from_shdr (abfd, hdr, name, shindex); @@ -35,7 +35,7 @@ case SHT_SHLIB: return TRUE; -@@ -5036,6 +5041,12 @@ +@@ -5103,6 +5108,12 @@ else i_ehdrp->e_type = ET_REL; @@ -49,16 +49,18 @@ { case bfd_arch_unknown: Index: bfd/elf64-x86-64.c ---- bfd/elf64-x86-64.c.orig 2010-10-21 14:29:02.000000000 +0200 -+++ bfd/elf64-x86-64.c 2010-12-09 16:48:57.000000000 +0100 -@@ -360,7 +360,11 @@ +--- bfd/elf64-x86-64.c.orig 2011-11-21 10:29:25.000000000 +0100 ++++ bfd/elf64-x86-64.c 2011-11-22 21:12:41.000000000 +0100 +@@ -512,8 +512,13 @@ /* The name of the dynamic interpreter. This is put in the .interp section. */ +#if defined(OPENPKG_OS_SOLARIS) -+#define ELF_DYNAMIC_INTERPRETER "/lib/amd64/ld.so.1" ++#define ELF64_DYNAMIC_INTERPRETER "/lib/amd64/ld.so.1" ++#define ELF32_DYNAMIC_INTERPRETER "/lib/ld32.so.1" +#else - #define ELF_DYNAMIC_INTERPRETER "/lib/ld64.so.1" + #define ELF64_DYNAMIC_INTERPRETER "/lib/ld64.so.1" + #define ELF32_DYNAMIC_INTERPRETER "/lib/ld32.so.1" +#endif /* If ELIMINATE_COPY_RELOCS is non-zero, the linker will try to avoid @@ -66,30 +68,11 @@ ----------------------------------------------------------------------------- -Support FreeBSD >= 4.10 by fixing platform detection. - -Index: bfd/configure ---- bfd/configure.orig 2010-12-08 09:37:34.000000000 +0100 -+++ bfd/configure 2010-12-09 16:48:57.000000000 +0100 -@@ -13876,6 +13876,10 @@ - i[3-7]86-*-bsdi) - COREFILE= - ;; -+ i[3456]86-*-freebsd4.1[0-9]*) -+ COREFILE='' -+ TRAD_HEADER='"hosts/i386bsd.h"' -+ ;; - i[3-7]86-*-bsd* | i[3-7]86-*-freebsd[123] | i[3-7]86-*-freebsd[123]\.* | i[3-7]86-*-freebsd4\.[01234] | i[3-7]86-*-freebsd4\.[01234]\.* | i[3-7]86-*-freebsd*aout*) - COREFILE=trad-core.lo - TRAD_HEADER='"hosts/i386bsd.h"' - ------------------------------------------------------------------------------ - Fight problems with --disable-nls under Solaris Index: gas/asintl.h --- gas/asintl.h.orig 2007-07-03 13:01:02.000000000 +0200 -+++ gas/asintl.h 2010-12-09 16:48:57.000000000 +0100 ++++ gas/asintl.h 2011-11-22 21:09:42.000000000 +0100 @@ -20,6 +20,11 @@ Software Foundation, 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA. */ @@ -103,8 +86,8 @@ # ifndef ENABLE_NLS /* The Solaris version of locale.h always includes libintl.h. If we have Index: ld/ld.h ---- ld/ld.h.orig 2009-11-26 14:45:25.000000000 +0100 -+++ ld/ld.h 2010-12-09 16:48:57.000000000 +0100 +--- ld/ld.h.orig 2011-07-16 09:58:40.000000000 +0200 ++++ ld/ld.h 2011-11-22 21:09:42.000000000 +0100 @@ -23,6 +23,11 @@ #ifndef LD_H #define LD_H @@ -118,9 +101,9 @@ #endif #ifndef SEEK_CUR Index: ld/Makefile.in ---- ld/Makefile.in.orig 2010-11-05 11:34:22.000000000 +0100 -+++ ld/Makefile.in 2010-12-09 16:48:57.000000000 +0100 -@@ -360,7 +360,7 @@ +--- ld/Makefile.in.orig 2011-07-22 22:22:37.000000000 +0200 ++++ ld/Makefile.in 2011-11-22 21:09:42.000000000 +0100 +@@ -366,7 +366,7 @@ # We put the scripts in the directory $(scriptdir)/ldscripts. # We can't put the scripts in $(datadir) because the SEARCH_DIR # directives need to be different for native and cross linkers. @@ -136,7 +119,7 @@ Index: libiberty/fibheap.c --- libiberty/fibheap.c.orig 2009-05-29 05:01:15.000000000 +0200 -+++ libiberty/fibheap.c 2010-12-09 16:48:57.000000000 +0100 ++++ libiberty/fibheap.c 2011-11-22 21:09:42.000000000 +0100 @@ -34,8 +34,11 @@ #include "libiberty.h" #include "fibheap.h" @@ -161,9 +144,9 @@ any problems and this message really confused, just disable it for now. Index: bfd/elf-eh-frame.c ---- bfd/elf-eh-frame.c.orig 2010-04-09 16:40:15.000000000 +0200 -+++ bfd/elf-eh-frame.c 2010-12-09 16:48:57.000000000 +0100 -@@ -909,9 +909,11 @@ +--- bfd/elf-eh-frame.c.orig 2011-06-20 15:18:47.000000000 +0200 ++++ bfd/elf-eh-frame.c 2011-11-22 21:09:42.000000000 +0100 +@@ -913,9 +913,11 @@ goto success; free_no_table: @@ -175,4 +158,3 @@ hdr_info->table = FALSE; if (sec_info) free (sec_info); - diff -r d9798afea31c -r 7543b0b3134d binutils/binutils.spec --- a/binutils/binutils.spec Tue Jul 31 09:41:21 2012 +0200 +++ b/binutils/binutils.spec Tue Jul 31 10:02:47 2012 +0200 @@ -1,6 +1,6 @@ ## ## binutils.spec -- OpenPKG RPM Package Specification -## Copyright (c) 2000-2010 OpenPKG Foundation e.V. +## Copyright (c) 2000-2011 OpenPKG Foundation e.V. ## ## Permission to use, copy, modify, and distribute this software for ## any purpose with or without fee is hereby granted, provided that @@ -21,6 +21,11 @@ ## SUCH DAMAGE. ## +# package version +%define V_opkg 2.22 +%define V_base 2.22 +%define V_patch %nil + # package information Name: binutils Summary: GNU Binary Utilities @@ -31,20 +36,16 @@ Class: CORE Group: Compiler License: GPL -Version: 2.21 -Release: 20101212 +Version: %{V_opkg} +Release: 20111122 # list of sources -Source0: ftp://sources.redhat.com/pub/binutils/releases/binutils-%{version}.tar.bz2 +Source0: ftp://sources.redhat.com/pub/binutils/releases/binutils-%{V_base}.tar.bz2 Patch0: binutils.patch # build information -Prefix: %{l_prefix} -BuildRoot: %{l_buildroot} -BuildPreReq: OpenPKG, openpkg >= 20060823, make -PreReq: OpenPKG, openpkg >= 20060823 -AutoReq: no -AutoReqProv: no +BuildPreReq: OpenPKG, openpkg >= 20100101, make +PreReq: OpenPKG, openpkg >= 20100101 %description Binutils is a collection of binary utilities. It includes: ld @@ -61,13 +62,13 @@ %track prog binutils = { - version = %{version} + version = %{V_base} url = ftp://sources.redhat.com/pub/binutils/releases/ regex = binutils-(__VER__)\.tar\.bz2 } %prep - %setup -q + %setup -q -n binutils-%{V_base} %patch -p0 %build @@ -105,10 +106,9 @@ $ARGS # build package - %{l_make} %{l_mflags} GREP="grep" + %{l_make} %{l_mflags} %install - rm -rf $RPM_BUILD_ROOT # build package %{l_make} %{l_mflags} install \ @@ -158,5 +158,4 @@ %files -f files %clean - rm -rf $RPM_BUILD_ROOT