X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=crossmingw32-gcc.spec;h=3322eff930c8c06cabb5ee6394cf8ce794c5aaab;hb=7fc2a2bbad880b9a815ec5483f049ea4f54a09ec;hp=9ed105360dde180153181fa3e07e4c5f86ce8c2a;hpb=59d75dd280ad4c48525a54dc69d93831f9661522;p=packages%2Fcrossmingw32-gcc.git

diff --git a/crossmingw32-gcc.spec b/crossmingw32-gcc.spec
index 9ed1053..3322eff 100644
--- a/crossmingw32-gcc.spec
+++ b/crossmingw32-gcc.spec
@@ -1,10 +1,10 @@
 %bcond_with     bootstrap
 %define		DASHED_SNAP	%{nil}
 %define		SNAP		%(echo %{DASHED_SNAP} | sed -e "s#-##g")
-%define		GCC_VERSION	3.3.2
-%define	apiver	2.4
+%define		GCC_VERSION	3.4.1
+%define	apiver	2.5
 %define	apisrc	w32api-%{apiver}
-%define runver	3.2
+%define runver	3.3
 %define	runsrc	mingw-runtime-%{runver}
 Summary:	Cross Mingw32 GNU binary utility development utilities - gcc
 Summary(es):	Utilitarios para desarrollo de binarios de la GNU - Mingw32 gcc
@@ -19,20 +19,21 @@ Epoch:		1
 License:	GPL
 Group:		Development/Languages
 Source0:	ftp://gcc.gnu.org/pub/gcc/releases/gcc-%{GCC_VERSION}/gcc-%{GCC_VERSION}.tar.bz2
-# Source0-md5:	65999f654102f5438ac8562d13a6eced
+# Source0-md5:	31b459062499f9f68d451db9cbf3205c
 Source1:	http://dl.sourceforge.net/mingw/%{apisrc}.tar.gz
-# Source1-md5:	9f9b9a7a7ef14e112924fea46b3360ce
+# Source1-md5:	be74d8925d1e273336ecb0d9225867f1
 Source2:	http://dl.sourceforge.net/mingw/%{runsrc}.tar.gz
-# Source2-md5:	ecfd49e08f20a88b7ba11a755f2b53c2
-Patch0:		%{name}-noioctl.patch
+# Source2-md5:	49c4a72951cb34c86b7583970dc058e9
+Patch0:		gcc-nodebug.patch
+Patch1:		%{name}-noioctl.patch
 BuildRequires:	autoconf
 BuildRequires:	automake
 BuildRequires:	bison
 BuildRequires:	crossmingw32-binutils >= 2.14.90.0.4.1-2
 BuildRequires:	flex
 %if %{without bootstrap}
-BuildRequires:	crossmingw32-runtime >= 3.0
-BuildRequires:	crossmingw32-w32api >= 2.3
+BuildRequires:	crossmingw32-runtime >= 3.3
+BuildRequires:	crossmingw32-w32api >= 2.5
 %endif
 Requires:	crossmingw32-binutils >= 2.14.90.0.4.1-2
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -42,8 +43,8 @@ BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 %define		target		i386-mingw32
 %define		target_platform i386-pc-mingw32
 %define		arch		%{_prefix}/%{target}
-%define		gccarch		%{_prefix}/lib/gcc-lib/%{target}
-%define		gcclib		%{_prefix}/lib/gcc-lib/%{target}/%{version}
+%define		gccarch		%{_libdir}/gcc/%{target}
+%define		gcclib		%{_libdir}/gcc/%{target}/%{version}
 
 %description
 crossmingw32 is a complete cross-compiling development system for
@@ -176,10 +177,10 @@ mkdir winsup
 tar xzf %{SOURCE1} -C winsup
 tar xzf %{SOURCE2} -C winsup
 %endif
-%patch -p1
+%{!?debug:%patch0 -p1}
+%patch1 -p1
 
 %build
-cp /usr/share/automake/config.sub .
 cd gcc-%{version}
 %if %{with bootstrap}
 for tool in as ar dlltool ld nm ranlib strip ; do
@@ -190,10 +191,22 @@ build_tooldir=`pwd`/winsup
 build_tooldir=%{arch}
 %endif
 
+cp /usr/share/automake/config.sub .
+cp /usr/share/automake/config.sub boehm-gc
+
 rm -rf obj-%{target_platform} && install -d obj-%{target_platform} && cd obj-%{target_platform}
 
+# note: alpha's -mieee and sparc's -mtune=* are not valid for target's g++
 CFLAGS="%{rpmcflags}" \
+%ifarch alpha
+CXXFLAGS="`echo '%{rpmcflags}' | sed -e 's/ \?-mieee\>//'`"  \
+%else
+%ifarch sparc sparc64 sparcv9
+CXXFLAGS="`echo '%{rpmcflags}' | sed -e 's/ \?-mtune[=0-9a-z]*//'`" \
+%else
 CXXFLAGS="%{rpmcflags}"  \
+%endif
+%endif
 LDFLAGS="%{rpmldflags}" \
 TEXCONFIG=false \
 ../configure \
@@ -201,6 +214,8 @@ TEXCONFIG=false \
 	--infodir=%{_infodir} \
 	--mandir=%{_mandir} \
 	--bindir=%{arch}/bin \
+	--libdir=%{_libdir} \
+	--libexecdir=%{_libexecdir} \
 	--includedir=%{arch}/include \
 	--enable-languages="c,c++,f77,java,objc" \
 	--with-gnu-as \
@@ -222,9 +237,8 @@ TEXCONFIG=false \
 	NM_FOR_TARGET="%{target}-nm"
 
 # build libobjc.dll for Objective C
-# to trzeba wywo³ywaæ z katalogu obj-%{target_platform}/%{target}/libobjc
-# ale trzeba podaæ jeszcze GCC_FOR_TARGET - a mi siê nie chce.
-# BTW, ten dll jest do czego¶ potrzebny???
+# it must be called from obj-%{target_platform}/%{target}/libobjc, but
+# GCC_FOR_TARGET must be passed
 #
 #make -C %{target}/libobjc \
 #	LDFLAGS="%{rpmldflags}" \
@@ -291,10 +305,13 @@ rm -rf $RPM_BUILD_ROOT
 %dir %{gcclib}
 %attr(755,root,root) %{gcclib}/cc1
 %{gcclib}/libgcc.a
+%{gcclib}/libgcov.a
 %{gcclib}/specs*
 %{gcclib}/include
 
+%{_mandir}/man1/%{target}-cpp.1*
 %{_mandir}/man1/%{target}-gcc.1*
+%{_mandir}/man1/%{target}-gcov.1*
 
 %files c++
 %defattr(644,root,root,755)
@@ -327,10 +344,17 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/%{target}-gcj
 %attr(755,root,root) %{_bindir}/%{target}-gcjh
+%attr(755,root,root) %{_bindir}/%{target}-grepjar
+%attr(755,root,root) %{_bindir}/%{target}-jar
 %attr(755,root,root) %{_bindir}/%{target}-jcf-dump
 %attr(755,root,root) %{_bindir}/%{target}-jv-scan
-%attr(755,root,root) %{arch}/bin/grepjar
-%attr(755,root,root) %{arch}/bin/jar
+#%attr(755,root,root) %{arch}/bin/grepjar
+#%attr(755,root,root) %{arch}/bin/jar
 %attr(755,root,root) %{gcclib}/jc1
 %attr(755,root,root) %{gcclib}/jvgenmain
 %{_mandir}/man1/%{target}-gcj.1*
+%{_mandir}/man1/%{target}-gcjh.1*
+%{_mandir}/man1/%{target}-grepjar.1*
+%{_mandir}/man1/%{target}-jar.1*
+%{_mandir}/man1/%{target}-jcf-dump.1*
+%{_mandir}/man1/%{target}-jv-scan.1*