X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=crossmingw32-binutils.spec;h=1c7291d2b21781971a83a83f9c65451391d7332f;hb=a0bbb20;hp=18732c573adb3ec722840231956f26be69d6822b;hpb=4f6edba53311e5518c237b08f0a51de793e45025;p=packages%2Fcrossmingw32-binutils.git

diff --git a/crossmingw32-binutils.spec b/crossmingw32-binutils.spec
index 18732c5..1c7291d 100644
--- a/crossmingw32-binutils.spec
+++ b/crossmingw32-binutils.spec
@@ -5,19 +5,22 @@ 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.21.52.0.1
+Version:	2.36.1
 Release:	1
 License:	GPL v3+
 Group:		Development/Tools
-Source0:	ftp://ftp.kernel.org/pub/linux/devel/binutils/binutils-%{version}.tar.bz2
-# Source0-md5:	32cee6ed103fc428cd802bac938ea7b3
-URL:		http://sources.redhat.com/binutils/
-BuildRequires:	automake
+Source0:	https://ftp.gnu.org/gnu/binutils/binutils-%{version}.tar.lz
+# Source0-md5:	c5b19413fba1faa491ae884ce7f3129f
+URL:		http://www.sourceware.org/binutils/
+BuildRequires:	autoconf >= 2.69
+BuildRequires:	automake >= 1:1.11
 BuildRequires:	bash
 BuildRequires:	bison
 BuildRequires:	flex
-BuildRequires:	gettext-devel
+BuildRequires:	gettext-tools
+BuildRequires:	lzip
 BuildRequires:	perl-tools-pod
+BuildRequires:	tar >= 1:1.22
 BuildRequires:	texinfo >= 4.2
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -45,13 +48,28 @@ Ten pakiet zawiera binutils generujące skrośnie binaria dla Win32.
 %prep
 %setup -q -n binutils-%{version}
 
-%build
-cp /usr/share/automake/config.sub .
+# file contains hacks for ac 2.69 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}" \
@@ -81,12 +99,8 @@ rm -rf $RPM_BUILD_ROOT
 	infodir=$RPM_BUILD_ROOT%{_infodir} \
 	libdir=$RPM_BUILD_ROOT%{_libdir}
 
-# remove this man page unless we cross-build for netware platform.
-# however, this should be done in Makefiles.
-%{__rm} $RPM_BUILD_ROOT%{_mandir}/man1/*nlmconv.1
-
-# libiberty.a is ELF not PE
-%{__rm} $RPM_BUILD_ROOT%{_libdir}/libiberty.a
+# not prefixed, keep infos only from native packages
+%{__rm} -r $RPM_BUILD_ROOT%{_infodir}
 
 # "filesystem" for crossmingw32-* packages (move to crossmingw32-dirs?)
 install -d $RPM_BUILD_ROOT%{arch}/lib/pkgconfig
@@ -112,6 +126,7 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{arch}/bin/objcopy
 %attr(755,root,root) %{arch}/bin/objdump
 %attr(755,root,root) %{arch}/bin/ranlib
+%attr(755,root,root) %{arch}/bin/readelf
 %attr(755,root,root) %{arch}/bin/strip
 %{arch}/lib/ldscripts
 %attr(755,root,root) %{_bindir}/%{target}-addr2line