[mingw-gcc] Update to gcc 4.7.0 final release
Erik van Pienbroek
epienbro at fedoraproject.org
Wed Mar 28 22:44:00 UTC 2012
commit 148029ede6c2543d4f31f4261cceb601c1bbca38
Author: Erik van Pienbroek <epienbro at fedoraproject.org>
Date: Thu Mar 29 00:41:51 2012 +0200
Update to gcc 4.7.0 final release
- Update to gcc 4.7.0 final release (20120322 snapshot)
- Dropped upstreamed patches
- Enable the testsuite
Note that the testsuite can currently only perform the compile/linking
tests on the Koji builders. To make the execution tests using wine work
some dejagnu hacking is needed as binfmt isn't set up in the Koji
builders. Help is welcome in that area
.gitignore | 1 +
gcc-4.7-fix-float128-soft-float.patch | 86 ---------------------------------
gcc-r184560.patch | 24 ---------
mingw-gcc.spec | 41 ++++++++-------
sources | 2 +-
5 files changed, 24 insertions(+), 130 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 7461fc0..d00b4e7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,4 @@ gcc-4.5.1.tar.bz2
/gcc-4.7.0-20120106.tar.bz2
/gcc-4.7.0-20120126.tar.bz2
/gcc-4.7.0-20120224.tar.bz2
+/gcc-4.7.0-20120322.tar.bz2
diff --git a/mingw-gcc.spec b/mingw-gcc.spec
index eeb2469..393533c 100644
--- a/mingw-gcc.spec
+++ b/mingw-gcc.spec
@@ -13,16 +13,13 @@
%global enable_libgomp 1
# Run the testsuite
-%global enable_tests 0
+%global enable_tests 1
-%global mingw_build_win32 1
-%global mingw_build_win64 1
-
-%global snapshot_date 20120224
+%global snapshot_date 20120322
Name: mingw-gcc
Version: 4.7.0
-Release: 0.9.%{snapshot_date}%{?dist}
+Release: 1.%{snapshot_date}%{?dist}
Summary: MinGW Windows cross-compiler (GCC) for C
License: GPLv3+ and GPLv3+ with exceptions and GPLv2+ with exceptions
@@ -35,14 +32,6 @@ URL: http://gcc.gnu.org
Source0: gcc-%{version}-%{snapshot_date}.tar.bz2
#Source0: ftp://ftp.gnu.org/gnu/gcc/gcc-%{version}/gcc-%{version}.tar.bz2
-# Recommended by upstream mingw-w64
-# Already upstreamed in gcc r184560
-Patch0: gcc-r184560.patch
-
-# Fix float128 soft-float for mingw targets
-# http://gcc.gnu.org/ml/gcc-patches/2012-02/msg01309.html
-Patch1: gcc-4.7-fix-float128-soft-float.patch
-
BuildRequires: texinfo
BuildRequires: mingw32-filesystem >= 95
BuildRequires: mingw64-filesystem >= 95
@@ -73,9 +62,12 @@ BuildRequires: mingw64-pthreads
%endif
%endif
%if 0%{enable_tests}
-BuildRequires: wine
+# The x86_64 build repo doesn't contain the i686 wine packages
+# so we can't BR: wine here, only wine-wow :(
+BuildRequires: wine-wow
BuildRequires: autogen
BuildRequires: dejagnu
+BuildRequires: sharutils
%endif
%endif
@@ -211,10 +203,6 @@ needed for OpenMP v3.0 support for the win32 target.
%prep
%setup -q -n gcc-%{version}-%{snapshot_date}
-%patch0 -p0
-pushd libgcc
-%patch1 -p0
-popd
echo 'Fedora MinGW %{version}-%{release}' > gcc/DEV-PHASE
@@ -292,6 +280,10 @@ export WINEPREFIX=/tmp/.wine_gcc_testsuite
rm -rf $WINEPREFIX
mkdir $WINEPREFIX
+%ifarch x86_64
+export WINELOADER=/usr/bin/wine64
+%endif
+
# The command below will fail, but that's intentional
# We only have to call a wine binary which triggers
# the generation and population of a wine prefix
@@ -317,6 +309,7 @@ cp %{mingw32_bindir}/pthreadGC2.dll $SYSTEM32_DIR
cp build_win32/i686-w64-mingw32/libgomp/.libs/libgomp-1.dll $SYSTEM32_DIR
%endif
+%ifarch x86_64
SYSTEM64_DIR=$WINEPREFIX/drive_c/windows/system32
cp build_win64/x86_64-w64-mingw32/libquadmath/.libs/libquadmath-0.dll $SYSTEM64_DIR
cp build_win64/x86_64-w64-mingw32/libgfortran/.libs/libgfortran-3.dll $SYSTEM64_DIR
@@ -332,6 +325,7 @@ cp %{mingw64_bindir}/pthreadGC2.dll $SYSTEM64_DIR
%endif
cp build_win64/x86_64-w64-mingw32/libgomp/.libs/libgomp-1.dll $SYSTEM64_DIR
%endif
+%endif
# According to Kai Tietz (of the mingw-w64 project) it's recommended
# to set the environment variable GCOV_PREFIX_STRIP
@@ -339,6 +333,7 @@ export GCOV_PREFIX_STRIP=1000
# Run the testsuite
# Code taken from the native Fedora GCC package to collect testsuite results
+%ifarch i386 i586 i686
pushd build_win32
make -k check %{?_smp_mflags} || :
echo ====================TESTING WIN32=========================
@@ -352,7 +347,9 @@ pushd build_win32
| uuencode testlogs-%{mingw32_target}.tar.bz2 || :
rm -rf testlogs-%{mingw32_target}-%{version}-%{release}
popd
+%endif
+%ifarch x86_64
pushd build_win64
make -k check %{?_smp_mflags} || :
echo ====================TESTING WIN64=========================
@@ -366,6 +363,7 @@ pushd build_win64
| uuencode testlogs-%{mingw64_target}.tar.bz2 || :
rm -rf testlogs-%{mingw64_target}-%{version}-%{release}
popd
+%endif
%endif
@@ -636,6 +634,11 @@ rm -f $RPM_BUILD_ROOT%{_bindir}/%{mingw64_target}-%{mingw64_target}-*
%changelog
+* Wed Mar 28 2012 Erik van Pienbroek <epienbro at fedoraproject.org> - 4.7.0-1.20120322
+- Update to gcc 4.7.0 final release (20120322 snapshot)
+- Dropped upstreamed patches
+- Enable the testsuite
+
* Tue Mar 6 2012 Erik van Pienbroek <epienbro at fedoraproject.org> - 4.7.0-0.9.20120224
- Re-enable libgomp support
diff --git a/sources b/sources
index b733364..ffab66c 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-efd453ff4dfe84ed08aa1f2287b299ef gcc-4.7.0-20120224.tar.bz2
+94a2e611439eddb196421be8dee7828e gcc-4.7.0-20120322.tar.bz2
More information about the scm-commits
mailing list