cygwin-binutils 2.29.1

5 files changed, 18 insertions, 32 deletions

diff --git a/.gitignore b/.gitignore
index 281ba04..29e2736 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 /binutils-2.25.1.tar.bz2
+/binutils-2.29.1.tar.xz
diff --git a/binutils-textdomain.patch b/binutils-textdomain.patch
index df5b1f9..72b351f 100644
--- a/binutils-textdomain.patch
+++ b/binutils-textdomain.patch
@@ -6,7 +6,7 @@
  # Define the identity of the package.
 - PACKAGE='bfd'
 + PACKAGE=cygwin-bfd
-  VERSION='2.25.1'
+  VERSION='2.29.1'
  
  
 --- a/binutils/configure
@@ -17,7 +17,7 @@
  # Define the identity of the package.
 - PACKAGE='binutils'
 + PACKAGE=cygwin-binutils
-  VERSION='2.25.1'
+  VERSION='2.29.1'
  
  
 --- a/gas/configure
@@ -28,7 +28,7 @@
  # Define the identity of the package.
 - PACKAGE='gas'
 + PACKAGE=cygwin-gas
-  VERSION='2.25.1'
+  VERSION='2.29.1'
  
  
 --- a/gprof/configure
@@ -39,7 +39,7 @@
  # Define the identity of the package.
 - PACKAGE='gprof'
 + PACKAGE=cygwin-gprof
-  VERSION='2.25.1'
+  VERSION='2.29.1'
  
  
 --- a/ld/configure
@@ -50,7 +50,7 @@
  # Define the identity of the package.
 - PACKAGE='ld'
 + PACKAGE=cygwin-ld
-  VERSION='2.25.1'
+  VERSION='2.29.1'
  
  
 --- a/opcodes/configure
@@ -61,6 +61,6 @@
  # Define the identity of the package.
 - PACKAGE='opcodes'
 + PACKAGE=cygwin-opcodes
-  VERSION='2.25.1'
+  VERSION='2.29.1'
  
  
diff --git a/cygwin-binutils.spec b/cygwin-binutils.spec
index 5b3273e..17dc558 100644
--- a/cygwin-binutils.spec
+++ b/cygwin-binutils.spec
@@ -1,8 +1,7 @@
-#%%global cygrev 3
 %global run_testsuite 0
 
 Name:           cygwin-binutils
-Version:        2.25.1
+Version:        2.29.1
 Release:        1%{?dist}
 Summary:        Cross-compiled version of binutils for Cygwin environments
 
@@ -10,14 +9,9 @@ License:        GPLv2+ and LGPLv2+ and GPLv3+ and LGPLv3+
 Group:          Development/Libraries
 
 URL:            http://www.gnu.org/software/binutils/
-%if 0%{?cygrev}
-Source0:        ftp://ftp.cygwin.com/pub/cygwin/x86_64/release/binutils/binutils-%{version}-%{cygrev}-src.tar.xz
-%else
-Source0:        http://ftpmirror.gnu.org/binutils/binutils-%{version}.tar.bz2
-%endif
+Source0:        http://ftpmirror.gnu.org/binutils/binutils-%{version}.tar.xz
 Patch0:         w32api-sysroot.patch
 Patch1:         binutils-textdomain.patch
-Patch2:         ld-pe-dll-__dso_handle.patch
 
 
 BuildRequires:  gettext-devel
@@ -66,14 +60,9 @@ understand Cygwin executables and DLLs.
 
 
 %prep
-%if 0%{?cygrev}
-%setup -q -n binutils-%{version}-%{cygrev}
-%else
 %setup -q -n binutils-%{version}
-%endif
 %patch0 -p1
 %patch1 -p1
-%patch2 -p1
 
 
 %build
@@ -90,6 +79,7 @@ CFLAGS="$RPM_OPT_FLAGS" \
   --libdir=%{_libdir} \
   --mandir=%{_mandir} \
   --infodir=%{_infodir} \
+  --with-system-zlib \
   --disable-gdb \
   --disable-libdecnumber \
   --disable-readline \
@@ -111,6 +101,7 @@ CFLAGS="$RPM_OPT_FLAGS" \
   --libdir=%{_libdir} \
   --mandir=%{_mandir} \
   --infodir=%{_infodir} \
+  --with-system-zlib \
   --disable-gdb \
   --disable-libdecnumber \
   --disable-readline \
@@ -134,6 +125,7 @@ CFLAGS="$RPM_OPT_FLAGS" \
   --libdir=%{_libdir} \
   --mandir=%{_mandir} \
   --infodir=%{_infodir} \
+  --with-system-zlib \
   --disable-gdb \
   --disable-libdecnumber \
   --disable-readline \
@@ -243,6 +235,7 @@ cat cygwin-opcodes.lang >> cygwin-binutils.lang
 %{_prefix}/%{cygwin32_target}/bin/objcopy
 %{_prefix}/%{cygwin32_target}/bin/objdump
 %{_prefix}/%{cygwin32_target}/bin/ranlib
+%{_prefix}/%{cygwin32_target}/bin/readelf
 %{_prefix}/%{cygwin32_target}/bin/strip
 %{_prefix}/%{cygwin32_target}/lib/ldscripts
 
@@ -276,11 +269,15 @@ cat cygwin-opcodes.lang >> cygwin-binutils.lang
 %{_prefix}/%{cygwin64_target}/bin/objcopy
 %{_prefix}/%{cygwin64_target}/bin/objdump
 %{_prefix}/%{cygwin64_target}/bin/ranlib
+%{_prefix}/%{cygwin64_target}/bin/readelf
 %{_prefix}/%{cygwin64_target}/bin/strip
 %{_prefix}/%{cygwin64_target}/lib/ldscripts
 
 
 %changelog
+* Wed Nov 15 2017 Yaakov Selkowitz <yselkowi@redhat.com> - 2.29.1-1
+- new version
+
 * Sun Mar 06 2016 Yaakov Selkowitz <yselkowi@redhat.com> - 2.25.1-1
 - new version
 
diff --git a/ld-pe-dll-__dso_handle.patch b/ld-pe-dll-__dso_handle.patch
deleted file mode 100644
index eb716bd..0000000
--- a/ld-pe-dll-__dso_handle.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/ld/pe-dll.c b/ld/pe-dll.c
-index d38f30d..c877e54 100644
---- a/ld/pe-dll.c
-+++ b/ld/pe-dll.c
-@@ -227,6 +227,7 @@ static const autofilter_entry_type autofilter_symbollist_i386[] =
-   { STRING_COMMA_LEN ("cygwin_premain1") },
-   { STRING_COMMA_LEN ("cygwin_premain2") },
-   { STRING_COMMA_LEN ("cygwin_premain3") },
-+  { STRING_COMMA_LEN ("__dso_handle") },
-   /* Runtime pseudo-reloc.  */
-   { STRING_COMMA_LEN ("_pei386_runtime_relocator") },
-   { STRING_COMMA_LEN ("do_pseudo_reloc") },
diff --git a/sources b/sources
index 9fc5580..4fc7df4 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-ac493a78de4fee895961d025b7905be4  binutils-2.25.1.tar.bz2
+acc9cd826edb9954ac7cecb81c727793  binutils-2.29.1.tar.xz