- explicit cross build setup, fix cflags for target libgcc (pr25672).

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

diff --git a/crossmingw64-gcc.spec b/crossmingw64-gcc.spec
index 18ee617a3750a044db7e846b6b079418d0e26518..19b0567c134b9c8e2f285c30c17fdb787f241d7b 100644 (file)
--- a/crossmingw64-gcc.spec
+++ b/crossmingw64-gcc.spec
@@ -19,6 +19,8 @@ Source0:      ftp://gcc.gnu.org/pub/gcc/releases/gcc-%{version}/gcc-%{version}.tar.bz
 Source1:       http://dl.sourceforge.net/mingw-w64/mingw-w64-snapshot-20080424.tar.bz2
 # Source1-md5: e2eea49233efd0be3a40fc774abeb1a2
 Patch0:                %{name}-no_include64.patch
+Patch1:                %{name}-no_red_zone.patch
+Patch2:                %{name}-pr25672.patch
 BuildRequires: autoconf
 BuildRequires: automake
 BuildRequires: bison
@@ -61,6 +63,8 @@ This package contains cross targeted g++ and (static) libstdc++.
 %prep
 %setup -q -n gcc-%{version} -a 1
 %patch0 -p1
+%patch1 -p1
+%patch2 -p1
 mkdir -p winsup/mingw
 cp -ar trunk/mingw-w64-headers/include winsup/mingw
 
@@ -104,7 +108,7 @@ TEXCONFIG=false \
        --host=%{_target_platform} \
        --target=%{target}
 
-%{__make} -j2
+%{__make}
 
 cd ..
 
@@ -154,13 +158,14 @@ cp -ar $build_sysroot/mingw/include $RPM_BUILD_ROOT%{arch}
 make -C trunk/mingw-w64-crt install \
        DESTDIR=$RPM_BUILD_ROOT
 
-mv $RPM_BUILD_ROOT%{_prefix}/x86_64-pc-mingw32/lib/* \
-       $RPM_BUILD_ROOT%{arch}/lib
+find $RPM_BUILD_ROOT%{_prefix}/x86_64-pc-mingw32/lib -type f \
+       -exec mv "{}" "$RPM_BUILD_ROOT%{arch}/lib" ";"
 
 %if 0%{!?debug:1}
 %{target}-strip -g -R.note -R.comment $RPM_BUILD_ROOT%{gcclib}/libgcc.a
 %{target}-strip -g -R.note -R.comment $RPM_BUILD_ROOT%{gcclib}/libgcov.a
-%{target}-strip -g -R.note -R.comment $RPM_BUILD_ROOT%{arch}/lib/*.{a,o}
+find $RPM_BUILD_ROOT%{arch}/lib -type f -name '*.a' -o -name '*.o' \
+        -exec %{target}-strip -g -R.note -R.comment "{}" ";"
 %endif
 
 %clean