- fix building using gcc 5

[packages/crossmingw64-gcc.git] / crossmingw64-gcc.spec

diff --git a/crossmingw64-gcc.spec b/crossmingw64-gcc.spec
index 1dff3bebbb7a36a7529f5097b30749e0ee5debf9..b360223645493290e3f6a04b036258f88128b72b 100644 (file)
--- a/crossmingw64-gcc.spec
+++ b/crossmingw64-gcc.spec
@@ -9,41 +9,48 @@ Summary(pl.UTF-8):    Skrośne narzędzia programistyczne GNU dla Mingw64 - gcc
 Summary(pt_BR.UTF-8):  Utilitários para desenvolvimento de binários da GNU - Mingw64 gcc
 Summary(tr.UTF-8):     GNU geliştirme araçları - Mingw64 gcc
 Name:          crossmingw64-gcc
-Version:       4.5.1
-Release:       0.3
+Version:       4.7.2
+Release:       2
 Epoch:         1
 License:       GPL v3+
 Group:         Development/Languages
 Source0:       ftp://gcc.gnu.org/pub/gcc/releases/gcc-%{version}/gcc-%{version}.tar.bz2
-# Source0-md5: 48231a8e33ed6e058a341c53b819de1a
-# svn co https://mingw-w64.svn.sourceforge.net/svnroot/mingw-w64/branches/releases/v1.0/mingw-w64-crt mingw64-crt
-%define                _rev    3654
-Source1:       mingw64-crt.tar.bz2
-# Source1-md5: fd2acf22ae08c8929e384bd74c0cfa55
+# Source0-md5: cc308a0891e778cfda7a151ab8a6e762
+# svn co https://mingw-w64.svn.sourceforge.net/svnroot/mingw-w64/stable/v2.x/mingw-w64-crt mingw64-crt
+%define                _rev    5515
+Source1:       mingw64-crt.tar.xz
+# Source1-md5: bf9051e7e4deb445e9e8877ca68211e1
 Patch0:                gcc-branch.diff
+# Patch0-md5:  2add58e2b9d9874ba62e05ca9b6b513f
 Patch1:                gcc-mingw-dirs.patch
+Patch2:                gnu_inline-mismatch.patch
+URL:           http://mingw-w64.sourceforge.net/
 BuildRequires: autoconf
 BuildRequires: automake
 BuildRequires: bison
-BuildRequires: crossmingw64-binutils
+BuildRequires: crossmingw64-binutils >= 2.22.51.0.1
 %{!?with_bootstrap:BuildRequires:      crossmingw64-gcc}
 BuildRequires: crossmingw64-headers
 BuildRequires: flex
 BuildRequires: gmp-devel >= 4.1
 BuildRequires: libmpc-devel
 BuildRequires: mpfr-devel >= 2.3.0
+BuildRequires: subversion >= 1.7
 BuildRequires: texinfo >= 4.2
 Requires:      crossmingw64-binutils
 Requires:      crossmingw64-headers
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
-%define                target          x86_64-pc-mingw32
+%define                target          x86_64-w64-mingw32
 %define                arch            %{_prefix}/%{target}
 %define                gccarch         %{_libdir}/gcc/%{target}
 %define                gcclib          %{gccarch}/%{version}
 
 %define                _noautostrip    .*/lib.*\\.a
 
+%define                Werror_cflags   %{nil}
+%define                _ssp_cflags             %{nil}
+
 # workaround bootstrap bug: http://gcc.gnu.org/bugzilla/PR25672
 %define                filterout       -march=i486 -march=i686 -mtune=pentium4
 
@@ -73,6 +80,7 @@ This package contains cross targeted g++ and libstdc++.
 %setup -q -n gcc-%{version} -a 1
 %patch0 -p0
 %patch1 -p1
+%patch2 -p1
 
 # override snapshot version.
 echo %{version} > gcc/BASE-VER
@@ -112,7 +120,9 @@ TEXCONFIG=false \
        --disable-multilib \
        --disable-nls \
        --disable-libmudflap \
+       --disable-libquadmath \
        --disable-libssp \
+       --disable-libitm \
        --disable-plugin \
        --disable-lto \
        --enable-c99 \
@@ -123,6 +133,7 @@ TEXCONFIG=false \
        --with-gxx-include-dir=%{arch}/include/c++/%{version} \
        --enable-fully-dynamic-string \
        --enable-libstdcxx-allocator=new \
+       --enable-symvers=gnu-versioned-namespace \
        --disable-libstdcxx-pch \
        --enable-__cxa_atexit \
        --with-pkgversion="PLD-Linux" \
@@ -131,7 +142,7 @@ TEXCONFIG=false \
        --host=%{_target_platform} \
        --target=%{target}
 
-%{__make} -j4
+%{__make}
 cd ..
 
 cd mingw64-crt
@@ -153,6 +164,7 @@ cd BUILDDIR
        DESTDIR=$RPM_BUILD_ROOT
 
 install gcc/specs $RPM_BUILD_ROOT%{gcclib}
+
 cd ..
 
 gccdir=$RPM_BUILD_ROOT%{gcclib}
@@ -181,20 +193,25 @@ rm -rf $RPM_BUILD_ROOT
 %dir %{gccarch}
 %dir %{gcclib}
 %dir %{gcclib}/include
-%{gcclib}/include/abmintrin.h
 %{gcclib}/include/ammintrin.h
+%{gcclib}/include/avx2intrin.h
 %{gcclib}/include/avxintrin.h
+%{gcclib}/include/bmi2intrin.h
+%{gcclib}/include/bmiintrin.h
 %{gcclib}/include/bmmintrin.h
 %{gcclib}/include/cpuid.h
 %{gcclib}/include/cross-stdarg.h
 %{gcclib}/include/emmintrin.h
+%{gcclib}/include/f16cintrin.h
 %{gcclib}/include/float.h
 %{gcclib}/include/fma4intrin.h
+%{gcclib}/include/fmaintrin.h
 %{gcclib}/include/ia32intrin.h
 %{gcclib}/include/immintrin.h
 %{gcclib}/include/iso646.h
 %{gcclib}/include/limits.h
 %{gcclib}/include/lwpintrin.h
+%{gcclib}/include/lzcntintrin.h
 %{gcclib}/include/mm3dnow.h
 %{gcclib}/include/mm_malloc.h
 %{gcclib}/include/mmintrin.h
@@ -202,12 +219,15 @@ rm -rf $RPM_BUILD_ROOT
 %{gcclib}/include/pmmintrin.h
 %{gcclib}/include/popcntintrin.h
 %{gcclib}/include/smmintrin.h
+%{gcclib}/include/tbmintrin.h
+%{gcclib}/include/stdalign.h
 %{gcclib}/include/stdarg.h
 %{gcclib}/include/stdbool.h
 %{gcclib}/include/stddef.h
 %{gcclib}/include/stdfix.h
 %{gcclib}/include/stdint-gcc.h
 %{gcclib}/include/stdint.h
+%{gcclib}/include/stdnoreturn.h
 %{gcclib}/include/syslimits.h
 %{gcclib}/include/tgmath.h
 %{gcclib}/include/tmmintrin.h
@@ -223,7 +243,7 @@ rm -rf $RPM_BUILD_ROOT
 %{gcclib}/*.o
 %{gcclib}/libgcc.a
 %if %{without bootstrap}
-%{_bindir}/libgcc_s_sjlj-1.dll
+%{arch}/lib/libgcc_s_sjlj-1.dll
 %{gcclib}/libgcc_eh.a
 %endif
 %{gcclib}/libgcov.a
@@ -235,6 +255,7 @@ rm -rf $RPM_BUILD_ROOT
 %if %{without bootstrap}
 %exclude %{arch}/include/c++
 %exclude %{arch}/lib/libstdc++.a
+%exclude %{arch}/lib/libstdc++.dll.a
 %exclude %{arch}/lib/libsupc++.a
 %endif
 %{arch}/lib/*.o
@@ -244,7 +265,9 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/%{target}-[cg]++
 %attr(755,root,root) %{gcclib}/cc1plus
+%{arch}/lib/libstdc++-7.dll
 %{arch}/lib/libstdc++.a
+%{arch}/lib/libstdc++.dll.a
 %{arch}/lib/libstdc++.la
 %{arch}/lib/libsupc++.a
 %{arch}/lib/libsupc++.la