X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=gcc%2Fmingw-gcc.spec;h=21c2a9dd831104070617c3e5b09f6756ce0a799d;hb=98ffdda59a136fb65c81ebb9fc0b5f045db5acf4;hp=57a16eacf56e885c03f87127e18d45158be5ee89;hpb=af7674126de2e245878bddb46900d5578e17f9d1;p=fedora-mingw.git

diff --git a/gcc/mingw-gcc.spec b/gcc/mingw-gcc.spec
index 57a16ea..21c2a9d 100644
--- a/gcc/mingw-gcc.spec
+++ b/gcc/mingw-gcc.spec
@@ -1,12 +1,10 @@
-%define __os_install_post /usr/lib/rpm/brp-compress %{nil}
-
 Name:           mingw-gcc
 Version:        4.3.2
-Release:        3%{?dist}
-Summary:        MinGW Windows cross-compiler (GCC) for C and C++
+Release:        5%{?dist}
+Summary:        MinGW Windows cross-compiler (GCC) for C
 
 License:        GPLv2+
-Group:          Development/Libraries
+Group:          Development/Languages
 URL:            http://www.mingw.org/
 Source0:        ftp://ftp.gnu.org/gnu/gcc/gcc-%{version}/gcc-core-%{version}.tar.bz2
 Source1:        ftp://ftp.gnu.org/gnu/gcc/gcc-%{version}/gcc-g++-%{version}.tar.bz2
@@ -14,6 +12,7 @@ Patch1:         %{name}-build.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  texinfo
+BuildRequires:  mingw-filesystem >= 2
 BuildRequires:  mingw-binutils
 BuildRequires:  mingw-runtime
 BuildRequires:  mingw-w32api
@@ -21,13 +20,31 @@ BuildRequires:  gmp-devel
 BuildRequires:  mpfr-devel
 BuildRequires:  libgomp
 
+Requires:       mingw-filesystem >= 2
 Requires:       mingw-binutils
 Requires:       mingw-runtime
 Requires:       mingw-w32api
+Requires:       mingw-cpp
 
 
 %description
-MinGW Windows cross-compiler (GCC) for C and C++.
+MinGW Windows cross-compiler (GCC) for C
+
+
+%package -n mingw-cpp
+Summary: MinGW Windows cross-C Preprocessor.
+Group: Development/Languages
+
+%description -n mingw-cpp
+MinGW Windows cross-C Preprocessor
+
+
+%package c++
+Summary: MinGW Windows cross-compiler for C++
+Group: Development/Languages
+
+%description c++
+MinGW Windows cross-compiler for C++
 
 
 %prep
@@ -41,9 +58,7 @@ cd gcc-%{version}
 mkdir -p build
 cd build
 
-#languages="c,c++"
-languages="c"
-# XXX C++ disabled for now because of a strange GCC bug.
+languages="c,c++"
 
 CC="%{__cc} ${RPM_OPT_FLAGS}" \
 ../configure \
@@ -55,7 +70,7 @@ CC="%{__cc} ${RPM_OPT_FLAGS}" \
   --infodir=%{_infodir} \
   --datadir=%{_datadir} \
   --build=%_build --host=%_host \
-  --target=i686-pc-mingw32 \
+  --target=%{_mingw_target} \
   --with-gnu-as --with-gnu-ld --verbose \
   --without-newlib \
   --disable-multilib \
@@ -63,7 +78,7 @@ CC="%{__cc} ${RPM_OPT_FLAGS}" \
   --disable-nls --without-included-gettext \
   --disable-win32-registry \
   --enable-version-specific-runtime-libs \
-  --with-sysroot=%{_prefix}/i686-pc-mingw32/sys-root \
+  --with-sysroot=%{_mingw_sysroot} \
   --enable-languages="$languages" $optargs
 
 make all
@@ -81,6 +96,9 @@ rm -rf $RPM_BUILD_ROOT%{_infodir}
 rm -f $RPM_BUILD_ROOT%{_libdir}/libiberty*
 rm -f $RPM_BUILD_ROOT%{_mandir}/man7/*
 
+mkdir -p $RPM_BUILD_ROOT/lib
+ln -sf ..%{_prefix}/bin/i686-pc-mingw-cpp \
+  $RPM_BUILD_ROOT/lib/i686-pc-mingw32-cpp
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -88,13 +106,67 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root)
+%{_bindir}/i686-pc-mingw32-gcc
+%{_bindir}/i686-pc-mingw32-gcc-%{version}
+%{_bindir}/i686-pc-mingw32-gccbug
+%{_bindir}/i686-pc-mingw32-gcov
 %{_prefix}/i686-pc-mingw32/lib/libiberty.a
-%{_libdir}/gcc/i686-pc-mingw32
-%{_libexecdir}/gcc/i686-pc-mingw32
-%{_bindir}/i686-pc-mingw32-*
-%{_mandir}/man1/i686-pc-mingw32-*
+%dir %{_libdir}/gcc/i686-pc-mingw32
+%dir %{_libdir}/gcc/i686-pc-mingw32/%{version}
+%{_libdir}/gcc/i686-pc-mingw32/%{version}/crtbegin.o
+%{_libdir}/gcc/i686-pc-mingw32/%{version}/crtend.o
+%{_libdir}/gcc/i686-pc-mingw32/%{version}/crtfastmath.o
+%{_libdir}/gcc/i686-pc-mingw32/%{version}/libgcc.a
+%{_libdir}/gcc/i686-pc-mingw32/%{version}/libgcov.a
+%{_libdir}/gcc/i686-pc-mingw32/%{version}/libssp.a
+%{_libdir}/gcc/i686-pc-mingw32/%{version}/libssp.la
+%{_libdir}/gcc/i686-pc-mingw32/%{version}/libssp_nonshared.a
+%{_libdir}/gcc/i686-pc-mingw32/%{version}/libssp_nonshared.la
+%dir %{_libdir}/gcc/i686-pc-mingw32/%{version}/include
+%dir %{_libdir}/gcc/i686-pc-mingw32/%{version}/include-fixed
+%dir %{_libdir}/gcc/i686-pc-mingw32/%{version}/include/ssp
+%{_libdir}/gcc/i686-pc-mingw32/%{version}/include-fixed/README
+%{_libdir}/gcc/i686-pc-mingw32/%{version}/include-fixed/*.h
+%{_libdir}/gcc/i686-pc-mingw32/%{version}/include/*.h
+%{_libdir}/gcc/i686-pc-mingw32/%{version}/include/ssp/*.h
+%dir %{_libdir}/gcc/i686-pc-mingw32/%{version}/install-tools
+%{_libdir}/gcc/i686-pc-mingw32/%{version}/install-tools/*
+%dir %{_libexecdir}/gcc/i686-pc-mingw32/%{version}/install-tools
+%{_libexecdir}/gcc/i686-pc-mingw32/%{version}/install-tools/*
+%{_mandir}/man1/i686-pc-mingw32-gcc.1*
+%{_mandir}/man1/i686-pc-mingw32-gcov.1*
+
+
+%files -n mingw-cpp
+%defattr(-,root,root)
+/lib/i686-pc-mingw32-cpp
+%{_bindir}/i686-pc-mingw32-cpp
+%{_mandir}/man1/i686-pc-mingw32-cpp.1*
+%dir %{_libdir}/gcc/i686-pc-mingw32
+%dir %{_libdir}/gcc/i686-pc-mingw32/%{version}
+%{_libexecdir}/gcc/i686-pc-mingw32/%{version}/cc1
+
+
+%files c++
+%defattr(-,root,root)
+%{_bindir}/i686-pc-mingw32-g++
+%{_bindir}/i686-pc-mingw32-c++
+%{_mandir}/man1/i686-pc-mingw32-g++.1*
+%{_libdir}/gcc/i686-pc-mingw32/%{version}/include/c++/
+%{_libdir}/gcc/i686-pc-mingw32/%{version}/libstdc++.a
+%{_libdir}/gcc/i686-pc-mingw32/%{version}/libstdc++.la
+%{_libdir}/gcc/i686-pc-mingw32/%{version}/libsupc++.a
+%{_libdir}/gcc/i686-pc-mingw32/%{version}/libsupc++.la
+%{_libexecdir}/gcc/i686-pc-mingw32/%{version}/cc1plus
+%{_libexecdir}/gcc/i686-pc-mingw32/%{version}/collect2
 
 
 %changelog
+* Thu Sep 10 2008 Richard W.M. Jones <rjones@redhat.com> - 4.3.1-5
+- Remove __os_install_post, I think it's just left over from earlier.
+
+* Thu Sep  4 2008 Richard W.M. Jones <rjones@redhat.com> - 4.3.1-4
+- Use RPM macros from mingw-filesystem.
+
 * Mon Jul  7 2008 Richard W.M. Jones <rjones@redhat.com> - 4.3.1-3
 - Initial RPM release, largely based on earlier work from several sources.