X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=gcc%2Fmingw-gcc.spec;h=21c2a9dd831104070617c3e5b09f6756ce0a799d;hb=98ffdda59a136fb65c81ebb9fc0b5f045db5acf4;hp=b7e048951a75437b6bbc3f225f39a970139d9c2e;hpb=96dab18d70e7f3c87624b0e7618eb97e3a4b4ae9;p=fedora-mingw.git diff --git a/gcc/mingw-gcc.spec b/gcc/mingw-gcc.spec index b7e0489..21c2a9d 100644 --- a/gcc/mingw-gcc.spec +++ b/gcc/mingw-gcc.spec @@ -1,8 +1,6 @@ -%define __os_install_post /usr/lib/rpm/brp-compress %{nil} - Name: mingw-gcc Version: 4.3.2 -Release: 3%{?dist} +Release: 5%{?dist} Summary: MinGW Windows cross-compiler (GCC) for C License: GPLv2+ @@ -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,6 +20,7 @@ BuildRequires: gmp-devel BuildRequires: mpfr-devel BuildRequires: libgomp +Requires: mingw-filesystem >= 2 Requires: mingw-binutils Requires: mingw-runtime Requires: mingw-w32api @@ -30,6 +30,7 @@ Requires: mingw-cpp %description MinGW Windows cross-compiler (GCC) for C + %package -n mingw-cpp Summary: MinGW Windows cross-C Preprocessor. Group: Development/Languages @@ -37,6 +38,7 @@ Group: Development/Languages %description -n mingw-cpp MinGW Windows cross-C Preprocessor + %package c++ Summary: MinGW Windows cross-compiler for C++ Group: Development/Languages @@ -45,7 +47,6 @@ Group: Development/Languages MinGW Windows cross-compiler for C++ - %prep %setup -q -c %setup -q -D -T -a1 @@ -58,8 +59,6 @@ mkdir -p build cd build languages="c,c++" -#languages="c" -# XXX C++ disabled for now because of a strange GCC bug. CC="%{__cc} ${RPM_OPT_FLAGS}" \ ../configure \ @@ -71,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 \ @@ -79,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 @@ -98,7 +97,8 @@ 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 +ln -sf ..%{_prefix}/bin/i686-pc-mingw-cpp \ + $RPM_BUILD_ROOT/lib/i686-pc-mingw32-cpp %clean rm -rf $RPM_BUILD_ROOT @@ -136,6 +136,7 @@ rm -rf $RPM_BUILD_ROOT %{_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 @@ -145,6 +146,7 @@ rm -rf $RPM_BUILD_ROOT %dir %{_libdir}/gcc/i686-pc-mingw32/%{version} %{_libexecdir}/gcc/i686-pc-mingw32/%{version}/cc1 + %files c++ %defattr(-,root,root) %{_bindir}/i686-pc-mingw32-g++ @@ -158,6 +160,13 @@ rm -rf $RPM_BUILD_ROOT %{_libexecdir}/gcc/i686-pc-mingw32/%{version}/cc1plus %{_libexecdir}/gcc/i686-pc-mingw32/%{version}/collect2 + %changelog +* Thu Sep 10 2008 Richard W.M. Jones - 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 - 4.3.1-4 +- Use RPM macros from mingw-filesystem. + * Mon Jul 7 2008 Richard W.M. Jones - 4.3.1-3 - Initial RPM release, largely based on earlier work from several sources.