SPECS: crossmingw64-gcc.spec - disable sjlj exceptions, fix R:, fix files f...

[pluto]

Author: pluto                        Date: Wed Jul  2 12:50:13 2008 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- disable sjlj exceptions, fix R:, fix files for bootstrap.

---- Files affected:
SPECS:
   crossmingw64-gcc.spec (1.1 -> 1.2) 

---- Diffs:

================================================================
Index: SPECS/crossmingw64-gcc.spec
diff -u SPECS/crossmingw64-gcc.spec:1.1 SPECS/crossmingw64-gcc.spec:1.2
--- SPECS/crossmingw64-gcc.spec:1.1	Tue Jul  1 17:24:21 2008
+++ SPECS/crossmingw64-gcc.spec	Wed Jul  2 14:50:08 2008
@@ -28,7 +28,6 @@
 BuildRequires:	mpfr-devel
 BuildRequires:	texinfo >= 4.2
 Requires:	crossmingw64-binutils
-Requires:	gcc-dirs
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define		target		x86_64-mingw32
@@ -88,6 +87,7 @@
 	--with-build-sysroot=$build_sysroot \
 	--disable-shared \
 	--enable-threads=win32 \
+	--disable-sjlj-exceptions \
 	--enable-languages="c%{!?with_bootstrap:,c++}" \
 	--enable-c99 \
 	--enable-long-long \
@@ -101,6 +101,8 @@
 	--enable-__cxa_atexit \
 	--disable-libmudflap \
 	--disable-libssp \
+	--with-pkgversion="PLD-Linux" \
+	--with-bugurl="http://bugs.pld-linux.org" \
 	--target=%{target}
 
 %{__make} all
@@ -118,10 +120,8 @@
 
 cd ..
 
-mv -f $RPM_BUILD_ROOT%{arch}/bin/%{target}-* $RPM_BUILD_ROOT%{_bindir}
-
-# already in arch/lib, shouldn't be here
-rm $RPM_BUILD_ROOT%{_libdir}/libiberty.a
+mv $RPM_BUILD_ROOT%{arch}/bin/%{target}-* $RPM_BUILD_ROOT%{_bindir}
+#rm $RPM_BUILD_ROOT%{_libdir}/libiberty.a
 
 gccdir=$RPM_BUILD_ROOT%{gcclib}
 mv $gccdir/include-fixed/{limits,syslimits}.h $gccdir/include
@@ -133,15 +133,6 @@
 %{target}-strip -g -R.note -R.comment $RPM_BUILD_ROOT%{gcclib}/libgcov.a
 %endif
 
-#if %{without bootstrap}
-# restore hardlinks
-#ln -f $RPM_BUILD_ROOT%{_bindir}/%{target}-{g++,c++}
-#ln -f $RPM_BUILD_ROOT%{arch}/bin/{g++,c++}
-#endif
-
-# the same... make hardlink
-ln -f $RPM_BUILD_ROOT%{arch}/bin/gcc $RPM_BUILD_ROOT%{_bindir}/%{target}-gcc
-
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -151,16 +142,38 @@
 %attr(755,root,root) %{_bindir}/%{target}-cpp
 %attr(755,root,root) %{_bindir}/%{target}-gcov
 %attr(755,root,root) %{arch}/bin/gcc
-#{arch}/lib/libiberty.a
 %dir %{gccarch}
 %dir %{gcclib}
+%dir %{gcclib}/include
+%{gcclib}/include/ammintrin.h
+%{gcclib}/include/bmmintrin.h
+%{gcclib}/include/cpuid.h
+%{gcclib}/include/emmintrin.h
+%{gcclib}/include/float.h
+%{gcclib}/include/iso646.h
+%{gcclib}/include/limits.h
+%{gcclib}/include/mm3dnow.h
+%{gcclib}/include/mm_malloc.h
+%{gcclib}/include/mmintrin-common.h
+%{gcclib}/include/mmintrin.h
+%{gcclib}/include/nmmintrin.h
+%{gcclib}/include/pmmintrin.h
+%{gcclib}/include/smmintrin.h
+%{gcclib}/include/stdarg.h
+%{gcclib}/include/stdbool.h
+%{gcclib}/include/stddef.h
+%{gcclib}/include/stdfix.h
+%{gcclib}/include/syslimits.h
+%{gcclib}/include/tgmath.h
+%{gcclib}/include/tmmintrin.h
+%{gcclib}/include/unwind.h
+%{gcclib}/include/varargs.h
+%{gcclib}/include/xmmintrin.h
 %attr(755,root,root) %{gcclib}/cc1
 %attr(755,root,root) %{gcclib}/collect2
 %{gcclib}/libgcc.a
 %{gcclib}/libgcov.a
 %{gcclib}/specs*
-%dir %{gcclib}/include
-
 %{_mandir}/man1/%{target}-cpp.1*
 %{_mandir}/man1/%{target}-gcc.1*
 %{_mandir}/man1/%{target}-gcov.1*
@@ -185,5 +198,8 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.2  2008/07/02 12:50:08  pluto
+- disable sjlj exceptions, fix R:, fix files for bootstrap.
+
 Revision 1.1  2008/07/01 15:24:21  pluto
 - initial spec dropin, install/files nfy. i'll commit all my scriptology soon...
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/crossmingw64-gcc.spec?r1=1.1&r2=1.2&f=u