X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=crossmingw32-gcc.spec;h=7adf0204ab70150bcda417c21f099ff6a5af9b48;hb=c07647a9da2b85fe6872376a7de5af2f6254964a;hp=1173c37467e014d6320bb6f62aa2f665f94abd5c;hpb=ca564fcebc8a370a20f4dc66529210473f1f0e0b;p=packages%2Fcrossmingw32-gcc.git

diff --git a/crossmingw32-gcc.spec b/crossmingw32-gcc.spec
index 1173c37..7adf020 100644
--- a/crossmingw32-gcc.spec
+++ b/crossmingw32-gcc.spec
@@ -1,10 +1,11 @@
 #
-# TODO:
-# - openmp
-#
 # Conditional build:
-%bcond_with	bootstrap	# bootstrap build (using binary w32api/mingwrt)
+%bcond_with	bootstrap	# bootstrap build (using binary w32api/mingwrt, no gomp)
+%bcond_without	gomp		# OpenMP libraries
 #
+%if %{with bootstrap}
+%undefine	with_gomp
+%endif
 Summary:	Cross MinGW32 GNU binary utility development utilities - gcc
 Summary(es.UTF-8):	Utilitarios para desarrollo de binarios de la GNU - MinGW32 gcc
 Summary(fr.UTF-8):	Utilitaires de développement binaire de GNU - MinGW32 gcc
@@ -12,34 +13,41 @@ Summary(pl.UTF-8):	Skrośne narzędzia programistyczne GNU dla MinGW32 - gcc
 Summary(pt_BR.UTF-8):	Utilitários para desenvolvimento de binários da GNU - MinGW32 gcc
 Summary(tr.UTF-8):	GNU geliştirme araçları - MinGW32 gcc
 Name:		crossmingw32-gcc
-Version:	4.6.3
-Release:	5
+Version:	4.9.3
+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:	773092fe5194353b02bb0110052a972e
-%define		apiver	3.17
-Source1:	http://downloads.sourceforge.net/mingw/w32api-%{apiver}-2-mingw32-dev.tar.lzma
-# Source1-md5:	c3a86ffa6b8c21de868df54e4e38f05e
-%define		runver	3.20
-Source2:	http://downloads.sourceforge.net/mingw/mingwrt-%{runver}-mingw32-dev.tar.gz
-# Source2-md5:	2d2f5c8165ff9c29661a5be96336a4f7
-# svn diff -x --ignore-eol-style svn://gcc.gnu.org/svn/gcc/tags/gcc_4_6_1_release svn://gcc.gnu.org/svn/gcc/branches/gcc-4_6-branch > gcc-branch.diff
+Source0:	https://ftp.gnu.org/gnu/gcc/gcc-%{version}/gcc-%{version}.tar.bz2
+# Source0-md5:	6f831b4d251872736e8e9cc09746f327
+%define		mingw32_ver	4.0.3
+Source1:	http://downloads.sourceforge.net/mingw/mingwrt-%{mingw32_ver}-1-mingw32-dev.tar.lzma
+# Source1-md5:	c2c9aa82e0cb47abac01760525684858
+Source2:	gcc-optimize-la.pl
+# svn diff -x --ignore-eol-style --force svn://gcc.gnu.org/svn/gcc/tags/gcc_4_9_3_release svn://gcc.gnu.org/svn/gcc/branches/gcc-4_9-branch > gcc-branch.diff
 Patch100:	gcc-branch.diff
+# Patch100-md5:	253cbf4cc2f71d9c9362f4a3be25bb17
 Patch0:		%{name}-buildsystem1.patch
 Patch1:		%{name}-buildsystem2.patch
 Patch2:		%{name}-lfs.patch
-BuildRequires:	autoconf
-BuildRequires:	automake
+Patch12:	gcc-isl0.15-1.patch
+Patch13:	gcc-isl0.15-2.patch
+URL:		http://gcc.gnu.org/
+BuildRequires:	autoconf >= 2.64
+BuildRequires:	automake >= 1:1.9.3
 BuildRequires:	bison
 BuildRequires:	crossmingw32-binutils >= 2.15.91.0.2-2
-BuildRequires:	flex
-BuildRequires:	libmpc-devel
+%{?with_gomp:BuildRequires:	crossmingw32-pthreads-w32}
 %if %{without bootstrap}
 BuildRequires:	crossmingw32-runtime >= 3.5
 BuildRequires:	crossmingw32-w32api >= 3.1
 %endif
+BuildRequires:	cloog-isl-devel >= 0.17.0
+BuildRequires:	cloog-isl-devel < 0.19
+BuildRequires:	flex
+BuildRequires:	gmp-devel >= 4.1
+BuildRequires:	isl-devel >= 0.13
+BuildRequires:	libmpc-devel
 BuildRequires:	mpfr-devel
 BuildRequires:	perl-tools-pod
 BuildRequires:	texinfo >= 4.2
@@ -65,8 +73,9 @@ BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 # functions with printf format attribute but with special parser and also
 # receiving non constant format strings
 %define		Werror_cflags	%{nil}
-
 %define		_ssp_cflags	%{nil}
+# -fPIC is not valid for target platform
+%define		filterout_c	-fPIC
 
 %description
 crossmingw32 is a complete cross-compiling development system for
@@ -102,6 +111,46 @@ libgcc DLL library for Windows.
 %description -n crossmingw32-libgcc-dll -l pl.UTF-8
 Biblioteka DLL libgcc dla Windows.
 
+%package -n crossmingw32-libgomp
+Summary:	GNU OpenMP library - cross MinGW32 version
+Summary(pl.UTF-8):	Biblioteka GNU OpenMP - wersja skrośna MinGW32
+License:	GPL v3+ with GCC Runtime Library Exception v3.1
+Group:		Development/Libraries
+Requires:	%{name} = %{epoch}:%{version}-%{release}
+
+%description -n crossmingw32-libgomp
+This package contains cross MinGW32 version of GNU OpenMP library.
+
+%description -n crossmingw32-libgomp -l pl.UTF-8
+Ten pakiet zawiera wersję skrośną MinGW32 biblioteki GNU OpenMP.
+
+%package -n crossmingw32-libgomp-static
+Summary:	Static GNU OpenMP library - cross MinGW32 version
+Summary(pl.UTF-8):	Statyczna biblioteka GNU OpenMP - wersja skrośna MinGW32
+License:	GPL v3+ with GCC Runtime Library Exception v3.1
+Group:		Development/Libraries
+Requires:	crossmingw32-libgomp = %{epoch}:%{version}-%{release}
+
+%description -n crossmingw32-libgomp-static
+Static GNU OpenMP library - cross MinGW32 version.
+
+%description -n crossmingw32-libgomp-static -l pl.UTF-8
+Statyczna biblioteka GNU OpenMP - wersja skrośna MinGW32.
+
+%package -n crossmingw32-libgomp-dll
+Summary:	DLL GNU OpenMP library for Windows
+Summary(pl.UTF-8):	Biblioteka DLL GNU OpenMP dla Windows
+License:	GPL v3+ with GCC Runtime Library Exception v3.1
+Group:		Development/Libraries
+Requires:	crossmingw32-libgcc-dll = %{epoch}:%{version}-%{release}
+Requires:	crossmingw32-pthreads-dll
+
+%description -n crossmingw32-libgomp-dll
+DLL GNU OpenMP library for Windows.
+
+%description -n crossmingw32-libgomp-dll -l pl.UTF-8
+Biblioteka DLL GNU OpenMP dla Windows.
+
 %package c++
 Summary:	MinGW32 binary utility development utilities - g++
 Summary(pl.UTF-8):	Zestaw narzędzi MinGW32 - g++
@@ -229,7 +278,7 @@ Ten pakiet zawiera kompilator Fortranu generujący kod pod Win32.
 
 %package -n crossmingw32-libgfortran-static
 Summary:	Static Fortran library - cross MinGW32 version
-Summary(pl.UTF-8):	Statyczna biblioteka Fortrana - wersja skrośna MinGW32
+Summary(pl.UTF-8):	Statyczna biblioteka Fortranu - wersja skrośna MinGW32
 Group:		Development/Libraries
 Requires:	%{name}-fortran = %{epoch}:%{version}-%{release}
 
@@ -237,7 +286,7 @@ Requires:	%{name}-fortran = %{epoch}:%{version}-%{release}
 Static Fortran library - cross MinGW32 version.
 
 %description -n crossmingw32-libgfortran-static -l pl.UTF-8
-Statyczna biblioteka Fortrana - wersja skrośna MinGW32.
+Statyczna biblioteka Fortranu - wersja skrośna MinGW32.
 
 %package -n crossmingw32-libgfortran-dll
 Summary:	libgfortran DLL library for Windows
@@ -324,12 +373,13 @@ Ten pakiet zawiera kompilator Javy generujący kod pod Win32.
 %patch100 -p0
 %patch0 -p1
 %patch2 -p1
+%patch12 -p1
+%patch13 -p1
 
 %if %{with bootstrap}
-# note: "winsup" dirs below are special, handled by gcc's configure
-install -d winsup/{mingw,w32api}
-tar xf %{SOURCE1} -C winsup/w32api
-tar xf %{SOURCE2} -C winsup/mingw
+# note: "winsup" dir is special, handled by gcc's configure
+install -d winsup/mingw
+tar xf %{SOURCE1} -C winsup/mingw
 %endif
 
 # override snapshot version.
@@ -341,7 +391,7 @@ rm -rf builddir && install -d builddir && cd builddir
 %if %{with bootstrap}
 install -d %{target}/winsup
 ln -sf ../../../winsup/mingw/lib %{target}/winsup/mingw
-ln -sf ../../../winsup/w32api %{target}/winsup/w32api
+ln -sf ../../../winsup/mingw/include %{target}/winsup/w32api
 WINSUPDIR=$(cd ..; pwd)/winsup
 %endif
 
@@ -357,28 +407,32 @@ TEXCONFIG=false \
 	--libexecdir=%{_libdir} \
 	--infodir=%{_infodir} \
 	--mandir=%{_mandir} \
+	--with-build-time-tools=%{arch}/bin \
 	%{!?with_bootstrap:--with-headers=%{arch}/include} \
 	--with-libs=%{!?with_bootstrap:%{arch}/lib}%{?with_bootstrap:${WINSUPDIR}/mingw/lib} \
-	--with-build-time-tools=%{arch}/bin \
 	--with-dwarf2 \
 	--with-gnu-as \
 	--with-gnu-ld \
 	--with-mangler-in-ld \
 	--with-long-double-128 \
+	--with-cloog \
+	--with-ppl \
+	--disable-isl-version-check \
+	--enable-shared \
 	--enable-threads \
 	--enable-languages="c,c++,fortran,java,objc" \
 	--enable-c99 \
-	--enable-long-long \
 	--enable-fully-dynamic-string \
+	--enable-libgomp \
 	--enable-libstdcxx-allocator=new \
+	--enable-long-long \
 	--enable-version-specific-runtime-libs \
-	--enable-shared \
+	--disable-libssp \
+	--disable-multilib \
 	--disable-nls \
-	--disable-symvers \
 	--disable-sjlj-exceptions \
+	--disable-symvers \
 	--disable-win32-registry \
-	--disable-multilib \
-	--disable-libssp \
 	--target=%{target}
 
 cd ..
@@ -393,9 +447,6 @@ install -d $RPM_BUILD_ROOT%{_bindir}
 %{__make} -C builddir install \
 	DESTDIR=$RPM_BUILD_ROOT
 
-# host (ELF) library
-%{__rm} $RPM_BUILD_ROOT%{_libdir}/libiberty.a
-
 mv $RPM_BUILD_ROOT%{gcclibdir}/include-fixed/{limits,syslimits}.h $RPM_BUILD_ROOT%{gcclibdir}/include
 %{__rm} -r $RPM_BUILD_ROOT%{gcclibdir}/include-fixed
 %{__rm} -r $RPM_BUILD_ROOT%{gcclibdir}/install-tools
@@ -423,6 +474,13 @@ fi
 %{target}-strip -g -R.comment -R.note $RPM_BUILD_ROOT%{gcclibdir}/lib*.a
 %endif
 
+# avoid -L poisoning in *.la
+for f in libcaf_single.la libgfortran.la libgfortranbegin.la libobjc.la libquadmath.la %{?with_gomp:libgomp.la} ; do
+	file="$RPM_BUILD_ROOT%{gcclibdir}/$f"
+	%{__perl} %{SOURCE2} "$file" %{gcclibdir} >"${file}.fixed"
+	%{__mv} "${file}.fixed" "$file"
+done
+
 # for pretty-printers see native gcc
 %{__rm} $RPM_BUILD_ROOT%{gcclibdir}/libstdc++.dll.a-gdb.py
 %{__rm} -r $RPM_BUILD_ROOT%{_datadir}/gcc-%{version}/python/libstdcxx
@@ -446,9 +504,11 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_bindir}/%{target}-gcov
 %attr(755,root,root) %{arch}/bin/%{target}-gcc
 %attr(755,root,root) %{arch}/bin/%{target}-gcc-%{version}
+%attr(755,root,root) %{arch}/bin/%{target}-gcc-ar
+%attr(755,root,root) %{arch}/bin/%{target}-gcc-nm
+%attr(755,root,root) %{arch}/bin/%{target}-gcc-ranlib
 %attr(755,root,root) %{arch}/bin/%{target}-cpp
 %attr(755,root,root) %{arch}/bin/%{target}-gcov
-%attr(755,root,root) %{arch}/bin/gcc
 %dir %{gccarchdir}
 %dir %{gcclibdir}
 %attr(755,root,root) %{gcclibdir}/cc1
@@ -473,13 +533,27 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(644,root,root,755)
 %{_dlldir}/libgcc_s_dw2-1.dll
 
+%if %{with gomp}
+%files -n crossmingw32-libgomp
+%defattr(644,root,root,755)
+%{gcclibdir}/libgomp.dll.a
+%{gcclibdir}/libgomp.la
+%{gcclibdir}/libgomp.spec
+
+%files -n crossmingw32-libgomp-static
+%defattr(644,root,root,755)
+%{gcclibdir}/libgomp.a
+
+%files -n crossmingw32-libgomp-dll
+%defattr(644,root,root,755)
+%{_dlldir}/libgomp-1.dll
+%endif
+
 %files c++
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/%{target}-g++
 %attr(755,root,root) %{arch}/bin/%{target}-c++
 %attr(755,root,root) %{arch}/bin/%{target}-g++
-%attr(755,root,root) %{arch}/bin/c++
-%attr(755,root,root) %{arch}/bin/g++
 %attr(755,root,root) %{gcclibdir}/cc1plus
 %{gcclibdir}/libstdc++.dll.a
 %{gcclibdir}/libstdc++.la
@@ -509,15 +583,16 @@ rm -rf $RPM_BUILD_ROOT
 
 %files -n crossmingw32-libobjc-dll
 %defattr(644,root,root,755)
-%{_dlldir}/libobjc-3.dll
+%{_dlldir}/libobjc-4.dll
 
 %files fortran
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/%{target}-gfortran
 %attr(755,root,root) %{arch}/bin/%{target}-gfortran
-%attr(755,root,root) %{arch}/bin/gfortran
 %attr(755,root,root) %{gcclibdir}/f951
 %{gcclibdir}/finclude
+%{gcclibdir}/libcaf_single.a
+%{gcclibdir}/libcaf_single.la
 %{gcclibdir}/libgfortran.dll.a
 %{gcclibdir}/libgfortran.la
 %{gcclibdir}/libgfortran.spec