From e2d2ea5da2f7c37abcbd0b24a384771dd9c3c894 Mon Sep 17 00:00:00 2001
From: Yaakov Selkowitz <yselkowitz@users.sourceforge.net>
Date: Thu, 27 Mar 2014 00:44:38 -0500
Subject: cygwin-binutils 2.24.51-1

---
 cygwin-binutils.spec | 54 +++++++++++++++++++++++++++++++++++++++-------------
 1 file changed, 41 insertions(+), 13 deletions(-)

(limited to 'cygwin-binutils.spec')

diff --git a/cygwin-binutils.spec b/cygwin-binutils.spec
index 81de125..4eb52b8 100644
--- a/cygwin-binutils.spec
+++ b/cygwin-binutils.spec
@@ -1,7 +1,7 @@
 %global run_testsuite 0
 
 Name:           cygwin-binutils
-Version:        2.23.52
+Version:        2.24.51
 Release:        1%{?dist}
 Summary:        Cross-compiled version of binutils for Cygwin environments
 
@@ -9,9 +9,10 @@ License:        GPLv2+ and LGPLv2+ and GPLv3+ and LGPLv3+
 Group:          Development/Libraries
 
 URL:            http://www.gnu.org/software/binutils/
-Source0:        ftp://sourceware.org/pub/binutils/snapshots/binutils-%{version}.tar.bz2
+Source0:        ftp://ftp.cygwin.com/pub/cygwin/x86_64/release/binutils/binutils-%{version}-2-src.tar.xz
 Patch0:         w32api-sysroot.patch
-Patch1:         x86-64-pc32-relocs.patch
+Patch1:         binutils-textdomain.patch
+Patch2:         ld-parallel-make.patch
 
 
 BuildRequires:  flex
@@ -59,9 +60,10 @@ understand Cygwin executables and DLLs.
 
 
 %prep
-%setup -q -n binutils-%{version}
+%setup -q -n binutils-%{version}-2
 %patch0 -p1
-%patch1 -p0
+%patch1 -p1
+%patch2 -p1
 
 
 %build
@@ -71,14 +73,17 @@ CFLAGS="$RPM_OPT_FLAGS" \
 ../configure \
   --build=%_build --host=%_host \
   --target=%{cygwin32_target} \
-  --disable-nls \
   --with-sysroot=%{cygwin32_sysroot} \
   --prefix=%{_prefix} \
   --bindir=%{_bindir} \
   --includedir=%{_includedir} \
   --libdir=%{_libdir} \
   --mandir=%{_mandir} \
-  --infodir=%{_infodir}
+  --infodir=%{_infodir} \
+  --disable-gdb \
+  --disable-libdecnumber \
+  --disable-readline \
+  --disable-sim
 
 make all %{?_smp_mflags}
 popd
@@ -89,14 +94,17 @@ CFLAGS="$RPM_OPT_FLAGS" \
 ../configure \
   --build=%_build --host=%_host \
   --target=%{cygwin64_target} \
-  --disable-nls \
   --with-sysroot=%{cygwin64_sysroot} \
   --prefix=%{_prefix} \
   --bindir=%{_bindir} \
   --includedir=%{_includedir} \
   --libdir=%{_libdir} \
   --mandir=%{_mandir} \
-  --infodir=%{_infodir}
+  --infodir=%{_infodir} \
+  --disable-gdb \
+  --disable-libdecnumber \
+  --disable-readline \
+  --disable-sim
 
 make all %{?_smp_mflags}
 popd
@@ -109,14 +117,17 @@ CFLAGS="$RPM_OPT_FLAGS" \
   --build=%_build --host=%_host \
   --target=%{cygwin64_target} \
   --enable-targets=%{cygwin64_target},%{cygwin32_target} \
-  --disable-nls \
   --with-sysroot=%{cygwin64_sysroot} \
   --prefix=%{_prefix} \
   --bindir=%{_bindir} \
   --includedir=%{_includedir} \
   --libdir=%{_libdir} \
   --mandir=%{_mandir} \
-  --infodir=%{_infodir}
+  --infodir=%{_infodir} \
+  --disable-gdb \
+  --disable-libdecnumber \
+  --disable-readline \
+  --disable-sim
 
 make %{?_smp_mflags}
 popd
@@ -163,7 +174,6 @@ make -C build_multilib install DESTDIR=$RPM_BUILD_ROOT/multilib
 
 # These files conflict with ordinary binutils.
 rm -rf $RPM_BUILD_ROOT%{_infodir}
-rm -f $RPM_BUILD_ROOT%{_libdir}/libiberty*
 
 # Keep the multilib versions of the strip, objdump and objcopy commands
 # We need these for the RPM integration as these tools must be able to
@@ -173,8 +183,20 @@ mv $RPM_BUILD_ROOT/multilib%{_bindir}/%{cygwin64_objdump} $RPM_BUILD_ROOT%{_bind
 mv $RPM_BUILD_ROOT/multilib%{_bindir}/%{cygwin64_objcopy} $RPM_BUILD_ROOT%{_bindir}/%{cygwin_objcopy}
 rm -rf $RPM_BUILD_ROOT/multilib
 
+%find_lang cygwin-binutils
+%find_lang cygwin-bfd
+%find_lang cygwin-gas
+%find_lang cygwin-gprof
+%find_lang cygwin-ld
+%find_lang cygwin-opcodes
+cat cygwin-bfd.lang >> cygwin-binutils.lang
+cat cygwin-gas.lang >> cygwin-binutils.lang
+cat cygwin-gprof.lang >> cygwin-binutils.lang
+cat cygwin-ld.lang >> cygwin-binutils.lang
+cat cygwin-opcodes.lang >> cygwin-binutils.lang
 
-%files -n cygwin-binutils-generic
+
+%files -n cygwin-binutils-generic -f cygwin-binutils.lang
 %doc COPYING
 %{_mandir}/man1/*
 %{_bindir}/%{cygwin_strip}
@@ -212,6 +234,7 @@ rm -rf $RPM_BUILD_ROOT/multilib
 %{_prefix}/%{cygwin32_target}/bin/objdump
 %{_prefix}/%{cygwin32_target}/bin/ranlib
 %{_prefix}/%{cygwin32_target}/bin/strip
+%{_prefix}/%{cygwin32_target}/lib/default-manifest.o
 %{_prefix}/%{cygwin32_target}/lib/ldscripts
 
 %files -n cygwin64-binutils
@@ -245,10 +268,15 @@ rm -rf $RPM_BUILD_ROOT/multilib
 %{_prefix}/%{cygwin64_target}/bin/objdump
 %{_prefix}/%{cygwin64_target}/bin/ranlib
 %{_prefix}/%{cygwin64_target}/bin/strip
+%{_prefix}/%{cygwin64_target}/lib/default-manifest.o
 %{_prefix}/%{cygwin64_target}/lib/ldscripts
 
 
 %changelog
+* Wed Mar 26 2014 Yaakov Selkowitz <cygwin-ports-general@lists.sourceforge.net> - 2.24.51-1
+- Updated snapshot with default manifest support.
+- Enable NLS.
+
 * Wed Jun 26 2013 Yaakov Selkowitz <cygwin-ports-general@lists.sourceforge.net> - 2.23.52-1
 - Make package compliant with new Cygwin packaging scheme.
 - Add Cygwin 64bit support.
-- 
cgit