- updated to 2.25.51.0.1

- merged libdir,am patches from native

diff --git a/binutils-am.patch b/binutils-am.patch
new file mode 100644 (file)
index 0000000..f1d1945
--- /dev/null
+++ b/binutils-am.patch
@@ -0,0 +1,22 @@
+--- binutils-2.23.51.0.9/gas/doc/Makefile.am.orig      2013-02-04 21:04:42.928606932 +0100
++++ binutils-2.23.51.0.9/gas/doc/Makefile.am   2013-02-04 21:31:30.648573422 +0100
+@@ -17,7 +17,7 @@
+ # <http://www.gnu.org/licenses/>.
+ #
+ 
+-AUTOMAKE_OPTIONS = 1.8 cygnus
++AUTOMAKE_OPTIONS = 1.8
+ 
+ # What version of the manual you want; "all" includes everything
+ CONFIG=all
+--- binutils-2.23.51.0.9/bfd/doc/Makefile.am.orig      2013-02-02 00:24:54.000000000 +0100
++++ binutils-2.23.51.0.9/bfd/doc/Makefile.am   2013-02-05 19:33:46.556919813 +0100
+@@ -17,7 +17,7 @@
+ # <http://www.gnu.org/licenses/>.
+ #
+ 
+-AUTOMAKE_OPTIONS = 1.9 cygnus
++AUTOMAKE_OPTIONS = 1.9
+ 
+ DOCFILES = aoutx.texi  archive.texi archures.texi \
+       bfdt.texi  cache.texi coffcode.texi \

diff --git a/binutils-libdir.patch b/binutils-libdir.patch
new file mode 100644 (file)
index 0000000..b280a40
--- /dev/null
+++ b/binutils-libdir.patch
@@ -0,0 +1,45 @@
+--- binutils-2.25.51.0.1/bfd/Makefile.am.orig  2015-03-15 11:04:52.000000000 +0100
++++ binutils-2.25.51.0.1/bfd/Makefile.am       2015-03-17 20:08:55.482838510 +0100
+@@ -46,7 +46,7 @@
+ WARN_CFLAGS = @WARN_CFLAGS@
+ NO_WERROR = @NO_WERROR@
+ AM_CFLAGS = $(WARN_CFLAGS)
+-AM_CPPFLAGS = -DBINDIR='"$(bindir)"'
++AM_CPPFLAGS = -DBINDIR='"$(bindir)"' -DLIBDIR='"$(libdir)"'
+ if PLUGINS
+ bfdinclude_HEADERS += $(INCDIR)/plugin-api.h
+ LIBDL = @lt_cv_dlopen_libs@
+--- binutils-2.25.51.0.1/bfd/plugin.c.orig     2015-03-15 11:04:52.000000000 +0100
++++ binutils-2.25.51.0.1/bfd/plugin.c  2015-03-17 21:03:28.116034504 +0100
+@@ -404,8 +404,7 @@
+ static int
+ load_plugin (bfd *abfd)
+ {
+-  char *plugin_dir;
+-  char *p;
++  const char *p = LIBDIR "/bfd-plugins";
+   DIR *d;
+   struct dirent *ent;
+   int found = 0;
+@@ -416,13 +415,6 @@
+   if (plugin_program_name == NULL)
+     return 0;
+ 
+-  plugin_dir = concat (BINDIR, "/../lib/bfd-plugins", NULL);
+-  p = make_relative_prefix (plugin_program_name,
+-                          BINDIR,
+-                          plugin_dir);
+-  free (plugin_dir);
+-  plugin_dir = NULL;
+-
+   d = opendir (p);
+   if (!d)
+     goto out;
+@@ -441,7 +433,6 @@
+     }
+ 
+  out:
+-  free (p);
+   if (d)
+     closedir (d);
+ 

diff --git a/crossmingw32-binutils.spec b/crossmingw32-binutils.spec
index 01816dce4cab841d76837eaa22185017309e5a46..7b2606079b63dbb15490686d22ca7a33866c0365 100644 (file)
--- a/crossmingw32-binutils.spec
+++ b/crossmingw32-binutils.spec
@@ -5,13 +5,15 @@ Summary(pl.UTF-8):    Skrośne narzędzia programistyczne GNU dla MinGW32 - binutil
 Summary(pt_BR.UTF-8):  Utilitários para desenvolvimento de binários da GNU - MinGW32 binutils
 Summary(tr.UTF-8):     GNU geliştirme araçları - MinGW32 binutils
 Name:          crossmingw32-binutils
-Version:       2.24.51.0.4
+Version:       2.25.51.0.1
 Release:       1
 License:       GPL v3+
 Group:         Development/Tools
 #Source0:      https://www.kernel.org/pub/linux/devel/binutils/binutils-%{version}.tar.xz
-Source0:       binutils-%{version}.tar.bz2
-# Source0-md5: a44a86209c84e2072824183c4b0a11f4
+Source0:       binutils-%{version}.tar.xz
+# Source0-md5: 4d3bd9694a1c9c318e7afe6db4a23b69
+Patch0:                binutils-libdir.patch
+Patch1:                binutils-am.patch
 URL:           http://sources.redhat.com/binutils/
 BuildRequires: autoconf >= 2.64
 BuildRequires: automake >= 1:1.11
@@ -48,14 +50,31 @@ Ten pakiet zawiera binutils generujące skrośnie binaria dla Win32.
 
 %prep
 %setup -q -n binutils-%{version}
+%patch0 -p1
+%patch1 -p1
 
-%build
-cp /usr/share/automake/config.sub .
+# file contains hacks for ac 2.64 only
+%{__rm} config/override.m4
+%{__sed} -i '/^m4_include(config\/override\.m4/d' configure.ac
 
-# Because of a bug in binutils-2.9.1, a cross libbfd.so* is not named
-# lib<target>bfd.so*. To prevent confusion with native binutils, we
-# forget about shared libraries right now, and do not install libbfd.a
-# [the same applies to binutils 2.10.1.0.4]
+%build
+cp -f /usr/share/automake/config.* .
+%{__aclocal}
+%{__autoconf}
+
+# non-standard regeneration (needed because of libdir patch)
+# AM_BINUTILS_WARNINGS in bfd/warning.m4, ZW_GNU_GETTEXT_SISTER_DIR in config/gettext-sister.m4
+for dir in gas bfd; do
+       cd $dir || exit 1
+       %{__aclocal} -I .. -I ../config -I ../bfd
+       %{__automake} Makefile
+       %{__automake} doc/Makefile
+       %{__autoconf}
+       cd ..
+done
+
+# We don't install libbfd (nor use shared binutils libraries) to avoid
+# conflict with native binutils.
 
 # ldscripts won't be generated properly if SHELL is not bash...
 CFLAGS="%{rpmcflags}" \