X-Git-Url: http://git.pld-linux.org/?p=packages%2Fcrossmingw64-binutils.git;a=blobdiff_plain;f=crossmingw64-binutils.spec;h=f2c2c769b9e5f0f01043548dd252fac6c82a01e6;hp=463363700f256b845805d765b56381a395552350;hb=49abba7;hpb=ad1482d75c78fd81125ede3a22c707db5395beb8

diff --git a/crossmingw64-binutils.spec b/crossmingw64-binutils.spec
index 4633637..f2c2c76 100644
--- a/crossmingw64-binutils.spec
+++ b/crossmingw64-binutils.spec
@@ -1,36 +1,42 @@
-Summary:	Cross Mingw64 GNU binary utility development utilities - binutils
-Summary(es.UTF-8):	Utilitarios para desarrollo de binarios de la GNU - Mingw64 binutils
-Summary(fr.UTF-8):	Utilitaires de développement binaire de GNU - Mingw64 binutils
-Summary(pl.UTF-8):	Skrośne narzędzia programistyczne GNU dla Mingw64 - binutils
-Summary(pt_BR.UTF-8):	Utilitários para desenvolvimento de binários da GNU - Mingw64 binutils
-Summary(tr.UTF-8):	GNU geliştirme araçları - Mingw64 binutils
+Summary:	Cross MinGW-W64 GNU binary utility development utilities - binutils
+Summary(es.UTF-8):	Utilitarios para desarrollo de binarios de la GNU - MinGW-W64 binutils
+Summary(fr.UTF-8):	Utilitaires de développement binaire de GNU - MinGW-W64 binutils
+Summary(pl.UTF-8):	Skrośne narzędzia programistyczne GNU dla MinGW-W64 - binutils
+Summary(pt_BR.UTF-8):	Utilitários para desenvolvimento de binários da GNU - MinGW-W64 binutils
+Summary(tr.UTF-8):	GNU geliştirme araçları - MinGW-W64 binutils
 Name:		crossmingw64-binutils
-Version:	2.23.51.0.8
+Version:	2.37
 Release:	1
 License:	GPL v3+
 Group:		Development/Tools
-Source0:	http://www.kernel.org/pub/linux/devel/binutils/binutils-%{version}.tar.bz2
-# Source0-md5:	52db235c4e05928827a37ae1e8213bc7
-URL:		http://sources.redhat.com/binutils/
-BuildRequires:	automake
+Source0:	https://ftp.gnu.org/gnu/binutils/binutils-%{version}.tar.lz
+# Source0-md5:	a030c64f442d224aa3baa04a11f8cf34
+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:	zlib-devel
+BuildRequires:	gettext-tools
+BuildRequires:	lzip
+BuildRequires:	perl-tools-pod
+BuildRequires:	tar >= 1:1.22
 # not necessary unless we patch .texi docs; but they are not packaged here anyway
 #BuildRequires:	texinfo >= 4.2
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
+# mingw-w64 project uses x86_64-w64-mingw32 triplet for 64-bit Windows
+# and (i?86-w64-mingw32 for 32-bit Windows)
 %define		target		x86_64-w64-mingw32
 %define		arch		%{_prefix}/%{target}
 
 %description
 crossmingw64 is a complete cross-compiling development system for
 building stand-alone Microsoft Windows applications under Linux using
-the Mingw64 build libraries. This includes a binutils, gcc with g++
-and objc, and libstdc++, all cross targeted to x86_64-mingw32, along
-with supporting Win64 libraries in 'coff' format from free sources.
+the MinGW64 build libraries. This includes a binutils, gcc with g++
+and objc, and libstdc++, all cross targeted to x86_64-w64-mingw32,
+along with supporting Win64 libraries in 'coff' format from free
+sources.
 
 This package contains cross targeted binutils.
 
@@ -38,46 +44,73 @@ This package contains cross targeted binutils.
 crossmingw64 jest kompletnym systemem do kroskompilacji, pozwalającym
 budować aplikacje MS Windows pod Linuksem używając bibliotek mingw64.
 System składa się z binutils, gcc z g++ i objc, libstdc++ - wszystkie
-generujące kod dla platformy x86_64-mingw32, oraz z bibliotek w formacie
-COFF.
+generujące kod dla platformy x86_64-w64-mingw32, oraz z bibliotek
+Win64 w formacie COFF.
 
-Ten pakiet zawiera binutils generujące skrośnie binaria dla Win64.
+Ten pakiet zawiera binutils generujące skrośnie binaria dla
+64-bitowych Windows.
 
 %prep
 %setup -q -n binutils-%{version}
 
+# file contains hacks for ac 2.69 only
+%{__rm} config/override.m4
+%{__sed} -i '/^m4_include(config\/override\.m4/d' configure.ac
+
 %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}" \
 LDFLAGS="%{rpmldflags}" \
 CONFIG_SHELL="/bin/bash" \
 ./configure \
-	--disable-shared \
 	--disable-nls \
+	--disable-shared \
 	--prefix=%{_prefix} \
 	--libdir=%{_libdir} \
-	--libexecdir=%{_libdir} \
 	--mandir=%{_mandir} \
 	--infodir=%{_infodir} \
-	--with-sysroot=%{arch} \
 	--host=%{_target_platform} \
 	--build=%{_target_platform} \
 	--target=%{target}
 
-%{__make} all
+%{__make} all \
+	tooldir=%{_prefix}
 
 %install
 rm -rf $RPM_BUILD_ROOT
 
 %{__make} install \
-	DESTDIR=$RPM_BUILD_ROOT
+	INSTALL='$$s/install-sh -c' \
+	prefix=$RPM_BUILD_ROOT%{_prefix} \
+	mandir=$RPM_BUILD_ROOT%{_mandir} \
+	infodir=$RPM_BUILD_ROOT%{_infodir} \
+	libdir=$RPM_BUILD_ROOT%{_libdir}
+
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/bfd-plugins/*.a
 
-# 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
+# not prefixed, keep infos only from native packages
+%{__rm} -r $RPM_BUILD_ROOT%{_infodir}
 
-# libiberty.a is ELF not PE
-rm $RPM_BUILD_ROOT%{_libdir}/libiberty.a
+# "filesystem" for crossmingw32-* packages (move to crossmingw32-dirs?)
+install -d $RPM_BUILD_ROOT%{arch}/lib/pkgconfig
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -85,10 +118,59 @@ rm -rf $RPM_BUILD_ROOT
 %files
 %defattr(644,root,root,755)
 %doc README
+# mingw64 directory tree
 %dir %{arch}
 %dir %{arch}/lib
+%dir %{arch}/lib/pkgconfig
 %dir %{arch}/bin
-%attr(755,root,root) %{arch}/bin/*
+# binutils files
+%attr(755,root,root) %{arch}/bin/ar
+%attr(755,root,root) %{arch}/bin/as
+%attr(755,root,root) %{arch}/bin/dlltool
+%attr(755,root,root) %{arch}/bin/ld
+%attr(755,root,root) %{arch}/bin/ld.bfd
+%attr(755,root,root) %{arch}/bin/nm
+%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}-*
-%{_mandir}/man1/%{target}-*
+%attr(755,root,root) %{_bindir}/%{target}-addr2line
+%attr(755,root,root) %{_bindir}/%{target}-ar
+%attr(755,root,root) %{_bindir}/%{target}-as
+%attr(755,root,root) %{_bindir}/%{target}-c++filt
+%attr(755,root,root) %{_bindir}/%{target}-dlltool
+%attr(755,root,root) %{_bindir}/%{target}-dllwrap
+%attr(755,root,root) %{_bindir}/%{target}-elfedit
+%attr(755,root,root) %{_bindir}/%{target}-gprof
+%attr(755,root,root) %{_bindir}/%{target}-ld
+%attr(755,root,root) %{_bindir}/%{target}-ld.bfd
+%attr(755,root,root) %{_bindir}/%{target}-nm
+%attr(755,root,root) %{_bindir}/%{target}-objcopy
+%attr(755,root,root) %{_bindir}/%{target}-objdump
+%attr(755,root,root) %{_bindir}/%{target}-ranlib
+%attr(755,root,root) %{_bindir}/%{target}-readelf
+%attr(755,root,root) %{_bindir}/%{target}-size
+%attr(755,root,root) %{_bindir}/%{target}-strings
+%attr(755,root,root) %{_bindir}/%{target}-strip
+%attr(755,root,root) %{_bindir}/%{target}-windmc
+%attr(755,root,root) %{_bindir}/%{target}-windres
+%{_mandir}/man1/%{target}-addr2line.1*
+%{_mandir}/man1/%{target}-ar.1*
+%{_mandir}/man1/%{target}-as.1*
+%{_mandir}/man1/%{target}-c++filt.1*
+%{_mandir}/man1/%{target}-dlltool.1*
+%{_mandir}/man1/%{target}-elfedit.1*
+%{_mandir}/man1/%{target}-gprof.1*
+%{_mandir}/man1/%{target}-ld.1*
+%{_mandir}/man1/%{target}-nm.1*
+%{_mandir}/man1/%{target}-objcopy.1*
+%{_mandir}/man1/%{target}-objdump.1*
+%{_mandir}/man1/%{target}-ranlib.1*
+%{_mandir}/man1/%{target}-readelf.1*
+%{_mandir}/man1/%{target}-size.1*
+%{_mandir}/man1/%{target}-strings.1*
+%{_mandir}/man1/%{target}-strip.1*
+%{_mandir}/man1/%{target}-windmc.1*
+%{_mandir}/man1/%{target}-windres.1*