SPECS: crossmingw64-gcc.spec - c++ part finished.

[pluto]

Author: pluto                        Date: Thu Jul  3 13:01:29 2008 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- c++ part finished.

---- Files affected:
SPECS:
   crossmingw64-gcc.spec (1.4 -> 1.5) 

---- Diffs:

================================================================
Index: SPECS/crossmingw64-gcc.spec
diff -u SPECS/crossmingw64-gcc.spec:1.4 SPECS/crossmingw64-gcc.spec:1.5
--- SPECS/crossmingw64-gcc.spec:1.4	Thu Jul  3 13:02:52 2008
+++ SPECS/crossmingw64-gcc.spec	Thu Jul  3 15:01:24 2008
@@ -1,7 +1,7 @@
 # $Revision$, $Date$
 #
 # Conditional build:
-%bcond_with	bootstrap	# bootstrap build (only pure C compiler w/o startfiles)
+%bcond_with	bootstrap	# bootstrap build (only C compiler)
 #
 Summary:	Cross Mingw64 GNU binary utility development utilities - gcc
 Summary(es.UTF-8):	Utilitarios para desarrollo de binarios de la GNU - Mingw64 gcc
@@ -105,8 +105,7 @@
 	--host=%{_target_platform} \
 	--target=%{target}
 
-%{__make} all-gcc -j2
-%{__make} all-target-libgcc
+%{__make} -j2
 
 cd ..
 
@@ -134,11 +133,11 @@
 build_sysroot=`pwd`/winsup
 
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{_bindir},%{_datadir},%{arch}/mingw/include}
+install -d $RPM_BUILD_ROOT{%{_bindir},%{_datadir},%{arch}/lib,%{arch}/mingw/include}
 
 cd BUILDDIR
 
-%{__make} install-gcc install-target-libgcc \
+%{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT
 
 install gcc/specs $RPM_BUILD_ROOT%{gcclib}
@@ -156,8 +155,8 @@
 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}
+mv $RPM_BUILD_ROOT%{_prefix}/x86_64-pc-mingw32/lib/* \
+	$RPM_BUILD_ROOT%{arch}/lib
 
 %if 0%{!?debug:1}
 %{target}-strip -g -R.note -R.comment $RPM_BUILD_ROOT%{gcclib}/libgcc.a
@@ -210,21 +209,25 @@
 %{_mandir}/man1/%{target}-gcov.1*
 %{arch}/include
 %{arch}/lib/*.a
+%if %{without bootstrap}
+%exclude %{arch}/include/c++
+%exclude %{arch}/lib/libstdc++.a
+%exclude %{arch}/lib/libsupc++.a
+%endif
 %{arch}/lib/*.o
 %dir %{arch}/mingw
 %{arch}/mingw/include
 
-%if 0
+%if %{without bootstrap}
 %files c++
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/%{target}-[cg]++
-%attr(755,root,root) %{arch}/bin/[cg]++
 %attr(755,root,root) %{gcclib}/cc1plus
 %{arch}/lib/libstdc++.a
 %{arch}/lib/libstdc++.la
 %{arch}/lib/libsupc++.a
 %{arch}/lib/libsupc++.la
-%{arch}/include/g++
+%{arch}/include/c++
 %{_mandir}/man1/%{target}-g++.1*
 %endif
 
@@ -234,6 +237,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.5  2008/07/03 13:01:24  pluto
+- c++ part finished.
+
 Revision 1.4  2008/07/03 11:02:52  pluto
 - build'n'install crt.
 
================================================================

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