rpms/mingw32-gcc/devel mingw32-gcc.spec,1.10,1.11

[Kalev Lember]

Author: kalev

Update of /cvs/pkgs/rpms/mingw32-gcc/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7679

Modified Files:
	mingw32-gcc.spec 
Log Message:
Enable libgomp support.



Index: mingw32-gcc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-gcc/devel/mingw32-gcc.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- mingw32-gcc.spec	22 Nov 2009 22:13:04 -0000	1.10
+++ mingw32-gcc.spec	17 Dec 2009 19:34:50 -0000	1.11
@@ -5,7 +5,7 @@
 
 Name:           mingw32-gcc
 Version:        4.4.2
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        MinGW Windows cross-compiler (GCC) for C
 
 License:        GPLv3+ and GPLv3+ with exceptions and GPLv2+ with exceptions
@@ -47,6 +47,7 @@ BuildRequires:  mingw32-filesystem >= 49
 BuildRequires:  mingw32-binutils >= 2.19.51.0.14
 BuildRequires:  mingw32-runtime
 BuildRequires:  mingw32-w32api
+BuildRequires:  mingw32-pthreads
 BuildRequires:  gmp-devel
 BuildRequires:  mpfr-devel
 BuildRequires:  libgomp
@@ -59,10 +60,14 @@ Requires:       mingw32-binutils >= 2.19
 Requires:       mingw32-runtime
 Requires:       mingw32-w32api
 Requires:       mingw32-cpp
+# libgomp dll is linked with pthreads, but since we don't run the
+# automatic dependency scripts, it doesn't get picked up automatically.
+Requires:       mingw32-pthreads
 
 # We don't run the automatic dependency scripts which would
 # normally detect and provide the following DLL:
 Provides:       mingw32(libgcc_s_sjlj-1.dll)
+Provides:       mingw32(libgomp-1.dll)
 
 
 %description
@@ -163,6 +168,7 @@ CC="%{__cc} ${RPM_OPT_FLAGS}" \
   --with-gnu-as --with-gnu-ld --verbose \
   --without-newlib \
   --disable-multilib \
+  --enable-libgomp \
   --with-system-zlib \
   --disable-nls --without-included-gettext \
   --disable-win32-registry \
@@ -196,6 +202,9 @@ ln -sf ..%{_prefix}/bin/i686-pc-mingw32-
 mkdir -p $RPM_BUILD_ROOT%{_mingw32_bindir}
 mv $RPM_BUILD_ROOT%{_bindir}/libgcc_s_sjlj-1.dll \
   $RPM_BUILD_ROOT%{_mingw32_bindir}
+# Same goes for this DLL under _libdir.
+mv $RPM_BUILD_ROOT%{_libdir}/gcc/i686-pc-mingw32/bin/libgomp-1.dll \
+  $RPM_BUILD_ROOT%{_mingw32_bindir}
 
 # Don't want the *.la files.
 find $RPM_BUILD_ROOT -name '*.la' -delete
@@ -223,6 +232,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/gcc/i686-pc-mingw32/%{version}/libgcc_eh.a
 %{_libdir}/gcc/i686-pc-mingw32/%{version}/libgcc_s.a
 %{_libdir}/gcc/i686-pc-mingw32/%{version}/libgcov.a
+%{_libdir}/gcc/i686-pc-mingw32/%{version}/libgomp.a
+%{_libdir}/gcc/i686-pc-mingw32/%{version}/libgomp.dll.a
+%{_libdir}/gcc/i686-pc-mingw32/%{version}/libgomp.spec
 %{_libdir}/gcc/i686-pc-mingw32/%{version}/libssp.a
 %{_libdir}/gcc/i686-pc-mingw32/%{version}/libssp_nonshared.a
 %{_libdir}/gcc/i686-pc-mingw32/%{version}/libssp.dll.a
@@ -240,6 +252,7 @@ rm -rf $RPM_BUILD_ROOT
 %dir %{_libexecdir}/gcc/i686-pc-mingw32/%{version}/install-tools
 %{_libexecdir}/gcc/i686-pc-mingw32/%{version}/install-tools/*
 %{_mingw32_bindir}/libgcc_s_sjlj-1.dll
+%{_mingw32_bindir}/libgomp-1.dll
 %{_mandir}/man1/i686-pc-mingw32-gcc.1*
 %{_mandir}/man1/i686-pc-mingw32-gcov.1*
 
@@ -284,10 +297,18 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man1/i686-pc-mingw32-gfortran.1*
 %{_libdir}/gcc/i686-pc-mingw32/%{version}/libgfortran.a
 %{_libdir}/gcc/i686-pc-mingw32/%{version}/libgfortranbegin.a
+%dir %{_libdir}/gcc/i686-pc-mingw32/%{version}/finclude
+%{_libdir}/gcc/i686-pc-mingw32/%{version}/finclude/omp_lib.f90
+%{_libdir}/gcc/i686-pc-mingw32/%{version}/finclude/omp_lib.h
+%{_libdir}/gcc/i686-pc-mingw32/%{version}/finclude/omp_lib.mod
+%{_libdir}/gcc/i686-pc-mingw32/%{version}/finclude/omp_lib_kinds.mod
 %{_libexecdir}/gcc/i686-pc-mingw32/%{version}/f951
 
 
 %changelog
+* Thu Dec 17 2009 Chris Bagwell <chris at cnpbagwell.com> - 4.4.2-2
+- Enable libgomp support.
+
 * Sun Nov 22 2009 Kalev Lember <kalev at smartlink.ee> - 4.4.2-1
 - Update to gcc 4.4.2 20091114 svn 154179, which includes
   VTA backport from 4.5 branch.