From 5353894673f96f62990b37ef734805319659b4df Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Mon, 3 Nov 2008 18:46:24 +0000 Subject: [PATCH 01/23] Setup of module mingw32-binutils --- .cvsignore | 0 Makefile | 21 +++++++++++++++++++++ sources | 0 3 files changed, 21 insertions(+) create mode 100644 .cvsignore create mode 100644 Makefile create mode 100644 sources diff --git a/.cvsignore b/.cvsignore new file mode 100644 index 0000000..e69de29 diff --git a/Makefile b/Makefile new file mode 100644 index 0000000..e187360 --- /dev/null +++ b/Makefile @@ -0,0 +1,21 @@ +# Makefile for source rpm: mingw32-binutils +# $Id$ +NAME := mingw32-binutils +SPECFILE = $(firstword $(wildcard *.spec)) + +define find-makefile-common +for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done +endef + +MAKEFILE_COMMON := $(shell $(find-makefile-common)) + +ifeq ($(MAKEFILE_COMMON),) +# attept a checkout +define checkout-makefile-common +test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 +endef + +MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) +endif + +include $(MAKEFILE_COMMON) diff --git a/sources b/sources new file mode 100644 index 0000000..e69de29 From e3393a471856b29c99ecaa1af414cfd37672f354 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Thu, 6 Nov 2008 13:50:25 +0000 Subject: [PATCH 02/23] Initial import. --- .cvsignore | 1 + import.log | 1 + mingw32-binutils.spec | 87 +++++++++++++++++++++++++++++++++++++++++++ sources | 1 + 4 files changed, 90 insertions(+) create mode 100644 import.log create mode 100644 mingw32-binutils.spec diff --git a/.cvsignore b/.cvsignore index e69de29..29e5fa7 100644 --- a/.cvsignore +++ b/.cvsignore @@ -0,0 +1 @@ +binutils-2.18.50-20080109-2-src.tar.gz diff --git a/import.log b/import.log new file mode 100644 index 0000000..afdc46c --- /dev/null +++ b/import.log @@ -0,0 +1 @@ +mingw32-binutils-2_18_50_20080109_2-8_fc9:HEAD:mingw32-binutils-2.18.50_20080109_2-8.fc9.src.rpm:1225979077 diff --git a/mingw32-binutils.spec b/mingw32-binutils.spec new file mode 100644 index 0000000..0505945 --- /dev/null +++ b/mingw32-binutils.spec @@ -0,0 +1,87 @@ +%define binutils_version 2.18.50 +%define mingw32_binutils_version 20080109-2 +%define mingw32_binutils_rpmvers %{expand:%(echo %{mingw32_binutils_version} | tr - _)} + +Name: mingw32-binutils +Version: %{binutils_version}_%{mingw32_binutils_rpmvers} +Release: 8%{?dist} +Summary: MinGW Windows binutils + +License: GPLv2+ and LGPLv2+ and GPLv3+ and LGPLv3+ +Group: Development/Libraries +URL: http://www.mingw.org/ +Source0: http://dl.sourceforge.net/sourceforge/mingw/binutils-%{binutils_version}-%{mingw32_binutils_version}-src.tar.gz +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) + +BuildRequires: flex +BuildRequires: bison +BuildRequires: texinfo +BuildRequires: mingw32-filesystem >= 26 + +Requires: mingw32-filesystem >= 26 + +Provides: mingw-binutils = %{version} +Obsoletes: mingw-binutils < 2.18.50_20080109_2-8 + + +%description +MinGW Windows binutils (utilities like 'strip', 'as', 'ld') which +understand Windows executables and DLLs. + + +%prep +%setup -q -n binutils-%{binutils_version} + + +%build +mkdir -p build +cd build +CFLAGS="$RPM_OPT_FLAGS" \ +../configure \ + --build=%_build --host=%_host \ + --target=%{_mingw32_target} \ + --verbose --disable-nls \ + --without-included-gettext \ + --disable-win32-registry \ + --disable-werror \ + --with-sysroot=%{_mingw32_sysroot} \ + --prefix=%{_prefix} --bindir=%{_bindir} \ + --includedir=%{_includedir} --libdir=%{_libdir} \ + --mandir=%{_mandir} --infodir=%{_infodir} + +make all + + +%install +rm -rf $RPM_BUILD_ROOT + +cd build +make DESTDIR=$RPM_BUILD_ROOT install + +# These files conflict with ordinary binutils. +rm -rf $RPM_BUILD_ROOT%{_infodir} +rm -f ${RPM_BUILD_ROOT}%{_libdir}/libiberty* + + +%clean +rm -rf $RPM_BUILD_ROOT + + +%files +%defattr(-,root,root) +%{_mandir}/man1/* +%{_bindir}/i686-pc-mingw32-* +%{_prefix}/i686-pc-mingw32/bin +%{_prefix}/i686-pc-mingw32/lib/ldscripts + + +%changelog +* Wed Sep 24 2008 Richard W.M. Jones - 2.18.50_20080109_2-8 +- Rename mingw -> mingw32. +- BR mingw32-filesystem >= 26. + +* Thu Sep 4 2008 Richard W.M. Jones - 2.18.50_20080109_2-7 +- Use mingw-filesystem. + +* Mon Jul 7 2008 Richard W.M. Jones - 2.18.50_20080109_2-5 +- Initial RPM release, largely based on earlier work from several sources. diff --git a/sources b/sources index e69de29..9b8004e 100644 --- a/sources +++ b/sources @@ -0,0 +1 @@ +b03863598b784394a0de6be60eab37aa binutils-2.18.50-20080109-2-src.tar.gz From ae6ac22433f4f0d4c251367b2887b53fd72dc85a Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Sat, 29 Nov 2008 16:04:48 +0000 Subject: [PATCH 03/23] - Must runtime-require mingw32-filesystem. Fri Nov 21 2008 Levente Farkas - 2.18.50_20080109_2-9 - BR mingw32-filesystem >= 38 --- mingw32-binutils.spec | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/mingw32-binutils.spec b/mingw32-binutils.spec index 0505945..6ad8230 100644 --- a/mingw32-binutils.spec +++ b/mingw32-binutils.spec @@ -4,7 +4,7 @@ Name: mingw32-binutils Version: %{binutils_version}_%{mingw32_binutils_rpmvers} -Release: 8%{?dist} +Release: 10%{?dist} Summary: MinGW Windows binutils License: GPLv2+ and LGPLv2+ and GPLv3+ and LGPLv3+ @@ -16,12 +16,10 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: flex BuildRequires: bison BuildRequires: texinfo -BuildRequires: mingw32-filesystem >= 26 +BuildRequires: mingw32-filesystem >= 38 -Requires: mingw32-filesystem >= 26 - -Provides: mingw-binutils = %{version} -Obsoletes: mingw-binutils < 2.18.50_20080109_2-8 +# NB: This must be left in. +Requires: mingw32-filesystem >= 38 %description @@ -76,6 +74,12 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Sat Nov 29 2008 Richard W.M. Jones - 2.18.50_20080109_2-10 +- Must runtime-require mingw32-filesystem. + +* Fri Nov 21 2008 Levente Farkas - 2.18.50_20080109_2-9 +- BR mingw32-filesystem >= 38 + * Wed Sep 24 2008 Richard W.M. Jones - 2.18.50_20080109_2-8 - Rename mingw -> mingw32. - BR mingw32-filesystem >= 26. From b3f966b2feab42440bcd4ec5cc93e83e3c37db62 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Mon, 15 Dec 2008 23:05:27 +0000 Subject: [PATCH 04/23] New upstream version 2.19. --- .cvsignore | 2 +- mingw32-binutils.spec | 15 +++++++++------ sources | 2 +- 3 files changed, 11 insertions(+), 8 deletions(-) diff --git a/.cvsignore b/.cvsignore index 29e5fa7..0e1e198 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -binutils-2.18.50-20080109-2-src.tar.gz +binutils-2.19-src.tar.gz diff --git a/mingw32-binutils.spec b/mingw32-binutils.spec index 6ad8230..01203ee 100644 --- a/mingw32-binutils.spec +++ b/mingw32-binutils.spec @@ -1,16 +1,16 @@ -%define binutils_version 2.18.50 -%define mingw32_binutils_version 20080109-2 -%define mingw32_binutils_rpmvers %{expand:%(echo %{mingw32_binutils_version} | tr - _)} +%define binutils_version 2.19 +#%define mingw32_binutils_version 20080109-2 +#%define mingw32_binutils_rpmvers %{expand:%(echo %{mingw32_binutils_version} | tr - _)} Name: mingw32-binutils -Version: %{binutils_version}_%{mingw32_binutils_rpmvers} -Release: 10%{?dist} +Version: %{binutils_version} +Release: 1%{?dist} Summary: MinGW Windows binutils License: GPLv2+ and LGPLv2+ and GPLv3+ and LGPLv3+ Group: Development/Libraries URL: http://www.mingw.org/ -Source0: http://dl.sourceforge.net/sourceforge/mingw/binutils-%{binutils_version}-%{mingw32_binutils_version}-src.tar.gz +Source0: http://dl.sourceforge.net/sourceforge/mingw/binutils-%{binutils_version}-src.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: flex @@ -74,6 +74,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Mon Dec 15 2008 Richard W.M. Jones - 2.19-1 +- New upstream version 2.19. + * Sat Nov 29 2008 Richard W.M. Jones - 2.18.50_20080109_2-10 - Must runtime-require mingw32-filesystem. diff --git a/sources b/sources index 9b8004e..937b9c2 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -b03863598b784394a0de6be60eab37aa binutils-2.18.50-20080109-2-src.tar.gz +46c655f95370be0b0eed0ae952def9d2 binutils-2.19-src.tar.gz From cc4a835c7edf38d16e02960ff13bee32a5d73695 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Tue, 10 Feb 2009 23:24:46 +0000 Subject: [PATCH 05/23] New upstream version 2.19.1. --- mingw32-binutils.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mingw32-binutils.spec b/mingw32-binutils.spec index 01203ee..4bc9428 100644 --- a/mingw32-binutils.spec +++ b/mingw32-binutils.spec @@ -1,4 +1,4 @@ -%define binutils_version 2.19 +%define binutils_version 2.19.1 #%define mingw32_binutils_version 20080109-2 #%define mingw32_binutils_rpmvers %{expand:%(echo %{mingw32_binutils_version} | tr - _)} @@ -74,6 +74,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Tue Feb 10 2009 Richard W.M. Jones - 2.19.1-1 +- New upstream version 2.19.1. + * Mon Dec 15 2008 Richard W.M. Jones - 2.19-1 - New upstream version 2.19. From 250431bbe88db61d3ac44d0aea6edb894f4c9663 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Tue, 10 Feb 2009 23:37:16 +0000 Subject: [PATCH 06/23] New sources. --- .cvsignore | 2 +- mingw32-binutils.spec | 2 +- sources | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.cvsignore b/.cvsignore index 0e1e198..6aa2d31 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -binutils-2.19-src.tar.gz +binutils-2.19.1-mingw32-src.tar.gz diff --git a/mingw32-binutils.spec b/mingw32-binutils.spec index 4bc9428..b67d3e6 100644 --- a/mingw32-binutils.spec +++ b/mingw32-binutils.spec @@ -10,7 +10,7 @@ Summary: MinGW Windows binutils License: GPLv2+ and LGPLv2+ and GPLv3+ and LGPLv3+ Group: Development/Libraries URL: http://www.mingw.org/ -Source0: http://dl.sourceforge.net/sourceforge/mingw/binutils-%{binutils_version}-src.tar.gz +Source0: http://dl.sourceforge.net/sourceforge/mingw/binutils-%{binutils_version}-mingw32-src.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: flex diff --git a/sources b/sources index 937b9c2..759eae7 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -46c655f95370be0b0eed0ae952def9d2 binutils-2.19-src.tar.gz +ad3f2b5fdcd599a772ad75fec2c384d8 binutils-2.19.1-mingw32-src.tar.gz From a124d5b93531c7c5983f8c5a3102d2a0765af298 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Fri, 20 Feb 2009 21:12:05 +0000 Subject: [PATCH 07/23] Rebuild for mingw32-gcc 4.4 --- mingw32-binutils.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/mingw32-binutils.spec b/mingw32-binutils.spec index b67d3e6..9fc4b8e 100644 --- a/mingw32-binutils.spec +++ b/mingw32-binutils.spec @@ -4,7 +4,7 @@ Name: mingw32-binutils Version: %{binutils_version} -Release: 1%{?dist} +Release: 2%{?dist} Summary: MinGW Windows binutils License: GPLv2+ and LGPLv2+ and GPLv3+ and LGPLv3+ @@ -16,7 +16,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: flex BuildRequires: bison BuildRequires: texinfo -BuildRequires: mingw32-filesystem >= 38 +BuildRequires: mingw32-filesystem >= 49 # NB: This must be left in. Requires: mingw32-filesystem >= 38 @@ -74,6 +74,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Fri Feb 20 2009 Richard W.M. Jones - 2.19.1-2 +- Rebuild for mingw32-gcc 4.4 + * Tue Feb 10 2009 Richard W.M. Jones - 2.19.1-1 - New upstream version 2.19.1. From 7316d9a5e4ae289621e13f1eba34b844c2450fd7 Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Thu, 26 Feb 2009 00:54:39 +0000 Subject: [PATCH 08/23] - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild --- mingw32-binutils.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mingw32-binutils.spec b/mingw32-binutils.spec index 9fc4b8e..10ab1fe 100644 --- a/mingw32-binutils.spec +++ b/mingw32-binutils.spec @@ -4,7 +4,7 @@ Name: mingw32-binutils Version: %{binutils_version} -Release: 2%{?dist} +Release: 3%{?dist} Summary: MinGW Windows binutils License: GPLv2+ and LGPLv2+ and GPLv3+ and LGPLv3+ @@ -74,6 +74,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Wed Feb 25 2009 Fedora Release Engineering - 2.19.1-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + * Fri Feb 20 2009 Richard W.M. Jones - 2.19.1-2 - Rebuild for mingw32-gcc 4.4 From f3cbf4917693c065e678d5340d55d996e76cb6b8 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Tue, 10 Mar 2009 13:50:32 +0000 Subject: [PATCH 09/23] - Switch to using upstream (GNU) binutils 2.19.1. It's exactly the same as the MinGW version now. --- .cvsignore | 2 +- mingw32-binutils.spec | 18 +++++++++--------- sources | 2 +- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/.cvsignore b/.cvsignore index 6aa2d31..57db3bb 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -binutils-2.19.1-mingw32-src.tar.gz +binutils-2.19.1.tar.bz2 diff --git a/mingw32-binutils.spec b/mingw32-binutils.spec index 10ab1fe..5b369d2 100644 --- a/mingw32-binutils.spec +++ b/mingw32-binutils.spec @@ -1,16 +1,12 @@ -%define binutils_version 2.19.1 -#%define mingw32_binutils_version 20080109-2 -#%define mingw32_binutils_rpmvers %{expand:%(echo %{mingw32_binutils_version} | tr - _)} - Name: mingw32-binutils -Version: %{binutils_version} -Release: 3%{?dist} +Version: 2.19.1 +Release: 4%{?dist} Summary: MinGW Windows binutils License: GPLv2+ and LGPLv2+ and GPLv3+ and LGPLv3+ Group: Development/Libraries -URL: http://www.mingw.org/ -Source0: http://dl.sourceforge.net/sourceforge/mingw/binutils-%{binutils_version}-mingw32-src.tar.gz +URL: http://www.gnu.org/software/binutils/ +Source0: http://ftp.gnu.org/gnu/binutils/binutils-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: flex @@ -28,7 +24,7 @@ understand Windows executables and DLLs. %prep -%setup -q -n binutils-%{binutils_version} +%setup -q -n binutils-%{version} %build @@ -74,6 +70,10 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Tue Mar 10 2009 Richard W.M. Jones - 2.19.1-4 +- Switch to using upstream (GNU) binutils 2.19.1. It's exactly the + same as the MinGW version now. + * Wed Feb 25 2009 Fedora Release Engineering - 2.19.1-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild diff --git a/sources b/sources index 759eae7..452d8f2 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -ad3f2b5fdcd599a772ad75fec2c384d8 binutils-2.19.1-mingw32-src.tar.gz +09a8c5821a2dfdbb20665bc0bd680791 binutils-2.19.1.tar.bz2 From fbaf4400f664e0530dbba8df10c1564f2bd742f0 Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Sat, 25 Jul 2009 12:14:24 +0000 Subject: [PATCH 10/23] - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild --- mingw32-binutils.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mingw32-binutils.spec b/mingw32-binutils.spec index 5b369d2..e408d71 100644 --- a/mingw32-binutils.spec +++ b/mingw32-binutils.spec @@ -1,6 +1,6 @@ Name: mingw32-binutils Version: 2.19.1 -Release: 4%{?dist} +Release: 5%{?dist} Summary: MinGW Windows binutils License: GPLv2+ and LGPLv2+ and GPLv3+ and LGPLv3+ @@ -70,6 +70,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Sat Jul 25 2009 Fedora Release Engineering - 2.19.1-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild + * Tue Mar 10 2009 Richard W.M. Jones - 2.19.1-4 - Switch to using upstream (GNU) binutils 2.19.1. It's exactly the same as the MinGW version now. From 47da1f4c8d9caf0863f4f7888df0a5200811402c Mon Sep 17 00:00:00 2001 From: Kalev Lember Date: Thu, 17 Sep 2009 12:55:53 +0000 Subject: [PATCH 11/23] Update to 2.19.51.0.14 --- .cvsignore | 2 +- mingw32-binutils.spec | 11 +++++++---- sources | 2 +- 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/.cvsignore b/.cvsignore index 57db3bb..3ef1fb0 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -binutils-2.19.1.tar.bz2 +binutils-2.19.51.0.14.tar.bz2 diff --git a/mingw32-binutils.spec b/mingw32-binutils.spec index e408d71..b12b643 100644 --- a/mingw32-binutils.spec +++ b/mingw32-binutils.spec @@ -1,12 +1,12 @@ Name: mingw32-binutils -Version: 2.19.1 -Release: 5%{?dist} +Version: 2.19.51.0.14 +Release: 1%{?dist} Summary: MinGW Windows binutils License: GPLv2+ and LGPLv2+ and GPLv3+ and LGPLv3+ Group: Development/Libraries -URL: http://www.gnu.org/software/binutils/ -Source0: http://ftp.gnu.org/gnu/binutils/binutils-%{version}.tar.bz2 +URL: http://sources.redhat.com/binutils +Source0: ftp://ftp.kernel.org/pub/linux/devel/binutils/binutils-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: flex @@ -70,6 +70,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Wed Sep 16 2009 Kalev Lember - 2.19.51.0.14-1 +- Update to 2.19.51.0.14 + * Sat Jul 25 2009 Fedora Release Engineering - 2.19.1-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild diff --git a/sources b/sources index 452d8f2..1f34f8c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -09a8c5821a2dfdbb20665bc0bd680791 binutils-2.19.1.tar.bz2 +e0b485a3ff9392da1351dc3fb61a3d10 binutils-2.19.51.0.14.tar.bz2 From c3a125d00b674f8d5a583e7d77999be2f85f6c41 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Wed, 25 Nov 2009 23:18:47 +0000 Subject: [PATCH 12/23] Fix typo that causes a failure to update the common directory. (releng #2781) --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index e187360..66c332d 100644 --- a/Makefile +++ b/Makefile @@ -1,10 +1,10 @@ # Makefile for source rpm: mingw32-binutils -# $Id$ +# $Id: Makefile,v 1.1 2008/11/03 18:46:24 ausil Exp $ NAME := mingw32-binutils SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done +for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) From 5f19d596243768c69419602076e602cc615295a5 Mon Sep 17 00:00:00 2001 From: Kalev Lember Date: Thu, 13 May 2010 20:05:06 +0000 Subject: [PATCH 13/23] Update to 2.20.1 --- .cvsignore | 2 +- mingw32-binutils.spec | 9 ++++++--- sources | 2 +- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/.cvsignore b/.cvsignore index 3ef1fb0..7d755a7 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -binutils-2.19.51.0.14.tar.bz2 +binutils-2.20.1.tar.bz2 diff --git a/mingw32-binutils.spec b/mingw32-binutils.spec index b12b643..318e632 100644 --- a/mingw32-binutils.spec +++ b/mingw32-binutils.spec @@ -1,12 +1,12 @@ Name: mingw32-binutils -Version: 2.19.51.0.14 +Version: 2.20.1 Release: 1%{?dist} Summary: MinGW Windows binutils License: GPLv2+ and LGPLv2+ and GPLv3+ and LGPLv3+ Group: Development/Libraries -URL: http://sources.redhat.com/binutils -Source0: ftp://ftp.kernel.org/pub/linux/devel/binutils/binutils-%{version}.tar.bz2 +URL: http://www.gnu.org/software/binutils/ +Source0: http://ftp.gnu.org/gnu/binutils/binutils-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: flex @@ -70,6 +70,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Thu May 13 2010 Kalev Lember - 2.20.1-1 +- Update to 2.20.1 + * Wed Sep 16 2009 Kalev Lember - 2.19.51.0.14-1 - Update to 2.19.51.0.14 diff --git a/sources b/sources index 1f34f8c..1691323 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -e0b485a3ff9392da1351dc3fb61a3d10 binutils-2.19.51.0.14.tar.bz2 +9cdfb9d6ec0578c166d3beae5e15c4e5 binutils-2.20.1.tar.bz2 From d359dc3c23c4078454a0d1cb8e8d710de4e1852a Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 29 Jul 2010 03:18:31 +0000 Subject: [PATCH 14/23] dist-git conversion --- .cvsignore => .gitignore | 0 Makefile | 21 --------------------- import.log | 1 - 3 files changed, 22 deletions(-) rename .cvsignore => .gitignore (100%) delete mode 100644 Makefile delete mode 100644 import.log diff --git a/.cvsignore b/.gitignore similarity index 100% rename from .cvsignore rename to .gitignore diff --git a/Makefile b/Makefile deleted file mode 100644 index 66c332d..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: mingw32-binutils -# $Id: Makefile,v 1.1 2008/11/03 18:46:24 ausil Exp $ -NAME := mingw32-binutils -SPECFILE = $(firstword $(wildcard *.spec)) - -define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done -endef - -MAKEFILE_COMMON := $(shell $(find-makefile-common)) - -ifeq ($(MAKEFILE_COMMON),) -# attept a checkout -define checkout-makefile-common -test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 -endef - -MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) -endif - -include $(MAKEFILE_COMMON) diff --git a/import.log b/import.log deleted file mode 100644 index afdc46c..0000000 --- a/import.log +++ /dev/null @@ -1 +0,0 @@ -mingw32-binutils-2_18_50_20080109_2-8_fc9:HEAD:mingw32-binutils-2.18.50_20080109_2-8.fc9.src.rpm:1225979077 From 24ae27b92e5dc96b340e3ccf4ee9660c8b17cbad Mon Sep 17 00:00:00 2001 From: Richard Jones Date: Tue, 7 Sep 2010 10:35:43 +0100 Subject: [PATCH 15/23] Synchronize with Fedora native version (2.20.51.0.10). --- .gitignore | 1 + mingw32-binutils.spec | 6 +++++- sources | 2 +- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 7d755a7..dd02b00 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ binutils-2.20.1.tar.bz2 +/binutils-2.20.51.0.10.tar.bz2 diff --git a/mingw32-binutils.spec b/mingw32-binutils.spec index 318e632..f36cf11 100644 --- a/mingw32-binutils.spec +++ b/mingw32-binutils.spec @@ -1,5 +1,5 @@ Name: mingw32-binutils -Version: 2.20.1 +Version: 2.20.51.0.10 Release: 1%{?dist} Summary: MinGW Windows binutils @@ -70,6 +70,10 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Tue Sep 7 2010 Richard W.M. Jones - 2.20.51.0.10-1 +- Synchronize with Fedora native version (2.20.51.0.10). +- Note however that we are not using any Fedora patches. + * Thu May 13 2010 Kalev Lember - 2.20.1-1 - Update to 2.20.1 diff --git a/sources b/sources index 1691323..07f1d6c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -9cdfb9d6ec0578c166d3beae5e15c4e5 binutils-2.20.1.tar.bz2 +e7dfcff0aeb3e590f1403a761271103f binutils-2.20.51.0.10.tar.bz2 From 3b4f6eb6ec63f2ed30b1ef0d6dfbfcd4d12753a9 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Tue, 8 Feb 2011 12:02:23 -0600 Subject: [PATCH 16/23] - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild --- mingw32-binutils.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mingw32-binutils.spec b/mingw32-binutils.spec index f36cf11..5f7fca2 100644 --- a/mingw32-binutils.spec +++ b/mingw32-binutils.spec @@ -1,6 +1,6 @@ Name: mingw32-binutils Version: 2.20.51.0.10 -Release: 1%{?dist} +Release: 2%{?dist} Summary: MinGW Windows binutils License: GPLv2+ and LGPLv2+ and GPLv3+ and LGPLv3+ @@ -70,6 +70,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Tue Feb 08 2011 Fedora Release Engineering - 2.20.51.0.10-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild + * Tue Sep 7 2010 Richard W.M. Jones - 2.20.51.0.10-1 - Synchronize with Fedora native version (2.20.51.0.10). - Note however that we are not using any Fedora patches. From 26d2be0f41d83d8cba5a61dc08d9659fc606f899 Mon Sep 17 00:00:00 2001 From: Kalev Lember Date: Thu, 17 Mar 2011 14:58:10 +0200 Subject: [PATCH 17/23] Update to 2.21 Also require recent enough mingw32-filesystem to avoid rpm macro breakage with automatically generated (illegal) LD.BFD variable name. --- .gitignore | 1 + mingw32-binutils.spec | 9 ++++++--- sources | 2 +- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index dd02b00..c5d06c4 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ binutils-2.20.1.tar.bz2 /binutils-2.20.51.0.10.tar.bz2 +/binutils-2.21.tar.bz2 diff --git a/mingw32-binutils.spec b/mingw32-binutils.spec index 5f7fca2..bba5ed9 100644 --- a/mingw32-binutils.spec +++ b/mingw32-binutils.spec @@ -1,6 +1,6 @@ Name: mingw32-binutils -Version: 2.20.51.0.10 -Release: 2%{?dist} +Version: 2.21 +Release: 1%{?dist} Summary: MinGW Windows binutils License: GPLv2+ and LGPLv2+ and GPLv3+ and LGPLv3+ @@ -15,7 +15,7 @@ BuildRequires: texinfo BuildRequires: mingw32-filesystem >= 49 # NB: This must be left in. -Requires: mingw32-filesystem >= 38 +Requires: mingw32-filesystem >= 65 %description @@ -70,6 +70,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Thu Mar 17 2011 Kalev Lember - 2.21-1 +- Update to 2.21 + * Tue Feb 08 2011 Fedora Release Engineering - 2.20.51.0.10-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild diff --git a/sources b/sources index 07f1d6c..5e7aca2 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -e7dfcff0aeb3e590f1403a761271103f binutils-2.20.51.0.10.tar.bz2 +c84c5acc9d266f1a7044b51c85a823f5 binutils-2.21.tar.bz2 From e8523ce48fe8d922650ebb6818ec3dfc455dbc64 Mon Sep 17 00:00:00 2001 From: Kalev Lember Date: Thu, 17 Mar 2011 14:59:15 +0200 Subject: [PATCH 18/23] Use runtime pseudo reloc v1 by default The version of mingw32-runtime we have does not support v2. --- mingw32-binutils-2.21-pseudo_reloc_v1.patch | 12 ++++++++++++ mingw32-binutils.spec | 4 ++++ 2 files changed, 16 insertions(+) create mode 100644 mingw32-binutils-2.21-pseudo_reloc_v1.patch diff --git a/mingw32-binutils-2.21-pseudo_reloc_v1.patch b/mingw32-binutils-2.21-pseudo_reloc_v1.patch new file mode 100644 index 0000000..116d9c7 --- /dev/null +++ b/mingw32-binutils-2.21-pseudo_reloc_v1.patch @@ -0,0 +1,12 @@ +diff -up binutils-2.21/ld/emultempl/pe.em.pseudo_reloc_v1 binutils-2.21/ld/emultempl/pe.em +--- binutils-2.21/ld/emultempl/pe.em.pseudo_reloc_v1 2010-09-22 11:03:41.000000000 +0300 ++++ binutils-2.21/ld/emultempl/pe.em 2011-03-17 13:53:13.000000000 +0200 +@@ -100,7 +100,7 @@ fragment < - 2.21-1 - Update to 2.21 +- Added a patch to use runtime pseudo reloc v1 by default as the version of + mingw32-runtime we have does not support v2. * Tue Feb 08 2011 Fedora Release Engineering - 2.20.51.0.10-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild From eeaebcf37c6a9cef314ae50f8af884d41dc85346 Mon Sep 17 00:00:00 2001 From: Kalev Lember Date: Thu, 17 Mar 2011 15:08:41 +0200 Subject: [PATCH 19/23] Spec file cleanups Don't own the /usr/i686-pc-mingw32/bin/ directory and use %defattr(-,root,root,-) --- mingw32-binutils.spec | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/mingw32-binutils.spec b/mingw32-binutils.spec index 80a49bd..eff173e 100644 --- a/mingw32-binutils.spec +++ b/mingw32-binutils.spec @@ -64,10 +64,10 @@ rm -rf $RPM_BUILD_ROOT %files -%defattr(-,root,root) +%defattr(-,root,root,-) %{_mandir}/man1/* %{_bindir}/i686-pc-mingw32-* -%{_prefix}/i686-pc-mingw32/bin +%{_prefix}/i686-pc-mingw32/bin/* %{_prefix}/i686-pc-mingw32/lib/ldscripts @@ -76,6 +76,7 @@ rm -rf $RPM_BUILD_ROOT - Update to 2.21 - Added a patch to use runtime pseudo reloc v1 by default as the version of mingw32-runtime we have does not support v2. +- Don't own the /usr/i686-pc-mingw32/bin/ directory * Tue Feb 08 2011 Fedora Release Engineering - 2.20.51.0.10-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild From c433fa87b69d64b962ced97145087fc159807157 Mon Sep 17 00:00:00 2001 From: Kalev Lember Date: Tue, 10 May 2011 23:03:19 +0300 Subject: [PATCH 20/23] Default to runtime pseudo reloc v2 now that mingw32-runtime 3.18 is in --- mingw32-binutils-2.21-pseudo_reloc_v1.patch | 12 ------------ mingw32-binutils.spec | 7 ++++--- 2 files changed, 4 insertions(+), 15 deletions(-) delete mode 100644 mingw32-binutils-2.21-pseudo_reloc_v1.patch diff --git a/mingw32-binutils-2.21-pseudo_reloc_v1.patch b/mingw32-binutils-2.21-pseudo_reloc_v1.patch deleted file mode 100644 index 116d9c7..0000000 --- a/mingw32-binutils-2.21-pseudo_reloc_v1.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -up binutils-2.21/ld/emultempl/pe.em.pseudo_reloc_v1 binutils-2.21/ld/emultempl/pe.em ---- binutils-2.21/ld/emultempl/pe.em.pseudo_reloc_v1 2010-09-22 11:03:41.000000000 +0300 -+++ binutils-2.21/ld/emultempl/pe.em 2011-03-17 13:53:13.000000000 +0200 -@@ -100,7 +100,7 @@ fragment < - 2.21-2 +- Default to runtime pseudo reloc v2 now that mingw32-runtime 3.18 is in + * Thu Mar 17 2011 Kalev Lember - 2.21-1 - Update to 2.21 - Added a patch to use runtime pseudo reloc v1 by default as the version of From 8301d311ab127c8180a5562c773ca990fc0b1efb Mon Sep 17 00:00:00 2001 From: Erik van Pienbroek Date: Wed, 11 Jan 2012 00:14:43 +0100 Subject: [PATCH 21/23] Update to 2.22 - Update to 2.22 - Dropped unneeded RPM tags - Use parallel make --- .gitignore | 1 + mingw32-binutils.spec | 19 ++++++++----------- sources | 2 +- 3 files changed, 10 insertions(+), 12 deletions(-) diff --git a/.gitignore b/.gitignore index c5d06c4..dc2d9e0 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ binutils-2.20.1.tar.bz2 /binutils-2.20.51.0.10.tar.bz2 /binutils-2.21.tar.bz2 +/binutils-2.22.tar.bz2 diff --git a/mingw32-binutils.spec b/mingw32-binutils.spec index 250d444..09d2b0f 100644 --- a/mingw32-binutils.spec +++ b/mingw32-binutils.spec @@ -1,13 +1,12 @@ Name: mingw32-binutils -Version: 2.21 -Release: 2%{?dist} +Version: 2.22 +Release: 1%{?dist} Summary: MinGW Windows binutils License: GPLv2+ and LGPLv2+ and GPLv3+ and LGPLv3+ Group: Development/Libraries URL: http://www.gnu.org/software/binutils/ Source0: http://ftp.gnu.org/gnu/binutils/binutils-%{version}.tar.bz2 -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: flex BuildRequires: bison @@ -43,12 +42,10 @@ CFLAGS="$RPM_OPT_FLAGS" \ --includedir=%{_includedir} --libdir=%{_libdir} \ --mandir=%{_mandir} --infodir=%{_infodir} -make all +make all %{?_smp_mflags} %install -rm -rf $RPM_BUILD_ROOT - cd build make DESTDIR=$RPM_BUILD_ROOT install @@ -57,12 +54,7 @@ rm -rf $RPM_BUILD_ROOT%{_infodir} rm -f ${RPM_BUILD_ROOT}%{_libdir}/libiberty* -%clean -rm -rf $RPM_BUILD_ROOT - - %files -%defattr(-,root,root,-) %{_mandir}/man1/* %{_bindir}/i686-pc-mingw32-* %{_prefix}/i686-pc-mingw32/bin/* @@ -70,6 +62,11 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Tue Jan 10 2012 Erik van Pienbroek - 2.22-1 +- Update to 2.22 +- Dropped unneeded RPM tags +- Use parallel make + * Tue May 10 2011 Kalev Lember - 2.21-2 - Default to runtime pseudo reloc v2 now that mingw32-runtime 3.18 is in diff --git a/sources b/sources index 5e7aca2..a4742f0 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -c84c5acc9d266f1a7044b51c85a823f5 binutils-2.21.tar.bz2 +ee0f10756c84979622b992a4a61ea3f5 binutils-2.22.tar.bz2 From 63f0eb56f53518c48b7c8ab3c11387bd810e1f4e Mon Sep 17 00:00:00 2001 From: Erik van Pienbroek Date: Sun, 26 Feb 2012 00:53:26 +0100 Subject: [PATCH 22/23] Update to 2.22.52 20120225 snapshot and dropped some obsolete configure arguments --- .gitignore | 1 + mingw32-binutils.spec | 20 ++++++++++++-------- sources | 2 +- 3 files changed, 14 insertions(+), 9 deletions(-) diff --git a/.gitignore b/.gitignore index dc2d9e0..b8f8abc 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ binutils-2.20.1.tar.bz2 /binutils-2.20.51.0.10.tar.bz2 /binutils-2.21.tar.bz2 /binutils-2.22.tar.bz2 +/binutils-2.22.52.tar.bz2 diff --git a/mingw32-binutils.spec b/mingw32-binutils.spec index 09d2b0f..edf6497 100644 --- a/mingw32-binutils.spec +++ b/mingw32-binutils.spec @@ -1,5 +1,5 @@ Name: mingw32-binutils -Version: 2.22 +Version: 2.22.52 Release: 1%{?dist} Summary: MinGW Windows binutils @@ -33,14 +33,14 @@ CFLAGS="$RPM_OPT_FLAGS" \ ../configure \ --build=%_build --host=%_host \ --target=%{_mingw32_target} \ - --verbose --disable-nls \ - --without-included-gettext \ - --disable-win32-registry \ - --disable-werror \ + --disable-nls \ --with-sysroot=%{_mingw32_sysroot} \ - --prefix=%{_prefix} --bindir=%{_bindir} \ - --includedir=%{_includedir} --libdir=%{_libdir} \ - --mandir=%{_mandir} --infodir=%{_infodir} + --prefix=%{_prefix} \ + --bindir=%{_bindir} \ + --includedir=%{_includedir} \ + --libdir=%{_libdir} \ + --mandir=%{_mandir} \ + --infodir=%{_infodir} make all %{?_smp_mflags} @@ -62,6 +62,10 @@ rm -f ${RPM_BUILD_ROOT}%{_libdir}/libiberty* %changelog +* Sat Feb 25 2012 Erik van Pienbroek - 2.22.52-1 +- Update to 2.22.52 20120225 snapshot +- Dropped some obsolete configure arguments + * Tue Jan 10 2012 Erik van Pienbroek - 2.22-1 - Update to 2.22 - Dropped unneeded RPM tags diff --git a/sources b/sources index a4742f0..22f4014 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -ee0f10756c84979622b992a4a61ea3f5 binutils-2.22.tar.bz2 +3e3a3dd1eb98a4b2e3bc18eb775c6b3c binutils-2.22.52.tar.bz2 From e1cce8f6145045b2801441e428a09ec518547b07 Mon Sep 17 00:00:00 2001 From: Erik van Pienbroek Date: Mon, 27 Feb 2012 17:09:24 +0100 Subject: [PATCH 23/23] Rebuild using the i686-w64-mingw32 triplet - Bump the BR/R: mingw32-filesystem to >= 95 - Rebuild using the i686-w64-mingw32 triplet - Temporary provide mingw-strip, mingw-objdump and mingw-objcopy in preparation for win32+win64 support --- mingw32-binutils.spec | 23 ++++++++++++++++++----- 1 file changed, 18 insertions(+), 5 deletions(-) diff --git a/mingw32-binutils.spec b/mingw32-binutils.spec index edf6497..8c39404 100644 --- a/mingw32-binutils.spec +++ b/mingw32-binutils.spec @@ -11,10 +11,10 @@ Source0: http://ftp.gnu.org/gnu/binutils/binutils-%{version}.tar.bz2 BuildRequires: flex BuildRequires: bison BuildRequires: texinfo -BuildRequires: mingw32-filesystem >= 49 +BuildRequires: mingw32-filesystem >= 95 # NB: This must be left in. -Requires: mingw32-filesystem >= 65 +Requires: mingw32-filesystem >= 95 %description @@ -53,18 +53,31 @@ make DESTDIR=$RPM_BUILD_ROOT install rm -rf $RPM_BUILD_ROOT%{_infodir} rm -f ${RPM_BUILD_ROOT}%{_libdir}/libiberty* +# Temporary provide mingw-strip, mingw-objdump and mingw-objcopy +# in preparation for win32+win64 support +ln -s %{_mingw32_strip} $RPM_BUILD_ROOT%{_bindir}/%{mingw_strip} +ln -s %{_mingw32_objdump} $RPM_BUILD_ROOT%{_bindir}/%{mingw_objdump} +ln -s %{_mingw32_objcopy} $RPM_BUILD_ROOT%{_bindir}/%{mingw_objcopy} + %files %{_mandir}/man1/* -%{_bindir}/i686-pc-mingw32-* -%{_prefix}/i686-pc-mingw32/bin/* -%{_prefix}/i686-pc-mingw32/lib/ldscripts +%{_bindir}/%{mingw_strip} +%{_bindir}/%{mingw_objdump} +%{_bindir}/%{mingw_objcopy} +%{_bindir}/%{_mingw32_target}-* +%{_prefix}/%{_mingw32_target}/bin/* +%{_prefix}/%{_mingw32_target}/lib/ldscripts %changelog * Sat Feb 25 2012 Erik van Pienbroek - 2.22.52-1 - Update to 2.22.52 20120225 snapshot +- Bump the BR/R: mingw32-filesystem to >= 95 +- Rebuild using the i686-w64-mingw32 triplet - Dropped some obsolete configure arguments +- Temporary provide mingw-strip, mingw-objdump and mingw-objcopy + in preparation for win32+win64 support * Tue Jan 10 2012 Erik van Pienbroek - 2.22-1 - Update to 2.22