+++ /dev/null
-diff -rup mingw-gcc-4.3.2.orig/gcc-4.3.2/gcc/toplev.c mingw-gcc-4.3.2.new/gcc-4.3.2/gcc/toplev.c
---- mingw-gcc-4.3.2.orig/gcc-4.3.2/gcc/toplev.c 2008-04-24 13:59:01.000000000 -0400
-+++ mingw-gcc-4.3.2.new/gcc-4.3.2/gcc/toplev.c 2008-09-02 07:31:12.000000000 -0400
-@@ -536,7 +536,7 @@ read_integral_parameter (const char *p,
- for floor_log2 and exact_log2; see toplev.h. That construct, however,
- conflicts with the ISO C++ One Definition Rule. */
-
--#if GCC_VERSION < 3004 || !defined (__cplusplus)
-+#if GCC_VERSION < 3004
-
- /* Given X, an unsigned number, return the largest int Y such that 2**Y <= X.
- If X is 0, return -1. */
-diff -rup mingw-gcc-4.3.2.orig/gcc-4.3.2/gcc/toplev.h mingw-gcc-4.3.2.new/gcc-4.3.2/gcc/toplev.h
---- mingw-gcc-4.3.2.orig/gcc-4.3.2/gcc/toplev.h 2007-09-23 15:18:27.000000000 -0400
-+++ mingw-gcc-4.3.2.new/gcc-4.3.2/gcc/toplev.h 2008-09-03 07:08:46.000000000 -0400
-@@ -154,12 +154,6 @@ extern void decode_d_option (const char
- /* Return true iff flags are set as if -ffast-math. */
- extern bool fast_math_flags_set_p (void);
-
--/* Return log2, or -1 if not exact. */
--extern int exact_log2 (unsigned HOST_WIDE_INT);
--
--/* Return floor of log2, with -1 for zero. */
--extern int floor_log2 (unsigned HOST_WIDE_INT);
--
- /* Inline versions of the above for speed. */
- #if GCC_VERSION >= 3004
- # if HOST_BITS_PER_WIDE_INT == HOST_BITS_PER_LONG
-@@ -173,17 +167,23 @@ extern int floor_log2 (
- # define CTZ_HWI __builtin_ctz
- # endif
-
--extern inline int
-+static inline int
- floor_log2 (unsigned HOST_WIDE_INT x)
- {
- return x ? HOST_BITS_PER_WIDE_INT - 1 - (int) CLZ_HWI (x) : -1;
- }
-
--extern inline int
-+static inline int
- exact_log2 (unsigned HOST_WIDE_INT x)
- {
- return x == (x & -x) && x ? (int) CTZ_HWI (x) : -1;
- }
-+#else
-+/* Return log2, or -1 if not exact. */
-+extern int exact_log2 (unsigned HOST_WIDE_INT);
-+
-+/* Return floor of log2, with -1 for zero. */
-+extern int floor_log2 (unsigned HOST_WIDE_INT);
- #endif /* GCC_VERSION >= 3004 */
-
- /* Functions used to get and set GCC's notion of in what directory
+++ /dev/null
-%define __os_install_post /usr/lib/rpm/brp-compress %{nil}
-
-Name: mingw32-gcc
-Version: 4.3.2
-Release: 12%{?dist}
-Summary: MinGW Windows cross-compiler (GCC) for C
-
-License: GPLv2+
-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
-Patch1: %{name}-build.patch
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-BuildRequires: texinfo
-BuildRequires: mingw32-filesystem >= 39-3
-BuildRequires: mingw32-binutils
-BuildRequires: mingw32-runtime
-BuildRequires: mingw32-w32api
-BuildRequires: gmp-devel
-%if 0%{?fedora} >= 9
-BuildRequires: mpfr-devel
-%endif
-BuildRequires: libgomp
-
-# NB: Explicit mingw32-filesystem dependency is REQUIRED here.
-Requires: mingw32-filesystem >= 39-3
-Requires: mingw32-binutils
-Requires: mingw32-runtime
-Requires: mingw32-w32api
-Requires: mingw32-cpp
-
-
-%description
-MinGW Windows cross-compiler (GCC) for C
-
-
-%package -n mingw32-cpp
-Summary: MinGW Windows cross-C Preprocessor.
-Group: Development/Languages
-
-%description -n mingw32-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
-%setup -q -c
-%setup -q -D -T -a1
-%patch1 -p1
-
-
-%build
-cd gcc-%{version}
-
-mkdir -p build
-cd build
-
-languages="c,c++"
-
-CC="%{__cc} ${RPM_OPT_FLAGS}" \
-../configure \
- --prefix=%{_prefix} \
- --bindir=%{_bindir} \
- --includedir=%{_includedir} \
- --libdir=%{_libdir} \
- --mandir=%{_mandir} \
- --infodir=%{_infodir} \
- --datadir=%{_datadir} \
- --build=%_build --host=%_host \
- --target=%{_mingw32_target} \
- --with-gnu-as --with-gnu-ld --verbose \
- --without-newlib \
- --disable-multilib \
- --with-system-zlib \
- --disable-nls --without-included-gettext \
- --disable-win32-registry \
- --enable-version-specific-runtime-libs \
- --with-sysroot=%{_mingw32_sysroot} \
- --enable-languages="$languages" $optargs
-
-make all
-
-
-%install
-rm -rf $RPM_BUILD_ROOT
-
-cd gcc-%{version}
-cd build
-make DESTDIR=$RPM_BUILD_ROOT install
-
-# These files conflict with existing installed files.
-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-mingw32-cpp \
- $RPM_BUILD_ROOT/lib/i686-pc-mingw32-cpp
-
-%clean
-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
-%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 mingw32-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
-* Mon Nov 24 2008 Richard W.M. Jones <rjones@redhat.com> - 4.3.2-12
-- Rebuild against latest filesystem package.
-
-* Fri Nov 21 2008 Richard W.M. Jones <rjones@redhat.com> - 4.3.2-11
-- Remove obsoletes for a long dead package.
-
-* Wed Nov 19 2008 Richard W.M. Jones <rjones@redhat.com> - 4.3.2-10
-- Rebuild against mingw32-filesystem 37
-
-* Wed Nov 19 2008 Richard W.M. Jones <rjones@redhat.com> - 4.3.2-9
-- Rebuild against mingw32-filesystem 36
-
-* Thu Oct 30 2008 Richard W.M. Jones <rjones@redhat.com> - 4.3.2-8
-- Don't BR mpfr-devel for RHEL/EPEL-5 (Levente Farkas).
-
-* Thu Sep 4 2008 Richard W.M. Jones <rjones@redhat.com> - 4.3.2-7
-- Rename mingw -> mingw32.
-
-* Thu Sep 4 2008 Richard W.M. Jones <rjones@redhat.com> - 4.3.2-6
-- Use RPM macros from mingw-filesystem.
-
-* Mon Jul 7 2008 Richard W.M. Jones <rjones@redhat.com> - 4.3.2-3
-- Initial RPM release, largely based on earlier work from several sources.
+++ /dev/null
-# NOTE: NOT a Fedora package. This contains binaries which are needed
-# just to bootstrap the whole system if you build everything from scratch.
-
-%define __os_install_post /usr/lib/rpm/brp-compress %{nil}
-
-%define runtime_version 3.14
-
-Name: mingw32-runtime-bootstrap
-Version: 1
-Release: 4%{?dist}
-Summary: MinGW Windows bootstrap (binary package)
-
-Group: Development/Libraries
-License: Public Domain
-URL: http://www.mingw.org/
-
-Source0: http://dl.sourceforge.net/sourceforge/mingw/mingw-runtime-%{runtime_version}.tar.gz
-
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-BuildArch: noarch
-
-Provides: mingw32-runtime = %{runtime_version}
-Provides: mingw-runtime = %{runtime_version}
-
-
-%description
-MinGW bootstrap (binary package).
-
-
-%prep
-%setup -q -c
-
-%build
-rm -rf i686-pc-mingw32
-
-# Setup sys-root.
-mkdir -p i686-pc-mingw32/sys-root/mingw
-cp -a include lib i686-pc-mingw32/sys-root/mingw
-
-
-%install
-rm -rf $RPM_BUILD_ROOT
-
-mkdir -p $RPM_BUILD_ROOT%{_prefix}
-cp -a i686-pc-mingw32 $RPM_BUILD_ROOT%{_prefix}
-
-
-%clean
-rm -rf $RPM_BUILD_ROOT
-
-
-%files
-%defattr(-,root,root)
-%dir %{_prefix}/i686-pc-mingw32
-%{_prefix}/i686-pc-mingw32/sys-root
-
-
-%changelog
-* Wed Sep 24 2008 Richard W.M. Jones <rjones@redhat.com> - 1-4
-- Rename mingw -> mingw32.
-
-* Mon Jul 7 2008 Richard W.M. Jones <rjones@redhat.com> - 1-3
-- Initial RPM release.
+++ /dev/null
-%define __strip %{_mingw32_strip}
-%define __objdump %{_mingw32_objdump}
-%define _use_internal_dependency_generator 0
-%define __find_requires %{_mingw32_findrequires}
-%define __find_provides %{_mingw32_findprovides}
-
-Name: mingw32-runtime
-Version: 3.15.1
-Release: 8%{?dist}
-Summary: MinGW Windows cross-compiler runtime
-
-License: Public Domain
-Group: Development/Libraries
-URL: http://www.mingw.org/
-Source0: http://dl.sourceforge.net/sourceforge/mingw/mingwrt-%{version}-mingw32-src.tar.gz
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-BuildArch: noarch
-
-BuildRequires: mingw32-filesystem >= 39-3
-BuildRequires: mingw32-binutils
-BuildRequires: mingw32-gcc
-
-Requires: mingw32-binutils
-Requires: mingw32-gcc
-
-# Once this is installed, mingw32-bootstrap (binary bootstrapper) is no
-# longer needed.
-Obsoletes: mingw32-runtime-bootstrap
-
-
-%description
-MinGW Windows cross-compiler runtime, base libraries.
-
-
-%prep
-%setup -q -n mingwrt-%{version}-mingw32
-
-
-%build
-MINGW32_CFLAGS="%{_mingw32_cflags} -I%{_mingw32_includedir}"
-%{_mingw32_configure}
-%{_mingw32_make}
-
-
-%install
-rm -rf $RPM_BUILD_ROOT
-
-%{_mingw32_makeinstall}
-
-# make install places these in nonstandard locations, so move them.
-mkdir -p $RPM_BUILD_ROOT%{_mingw32_docdir}
-mv $RPM_BUILD_ROOT%{_mingw32_prefix}/doc/* $RPM_BUILD_ROOT%{_mingw32_docdir}/
-
-
-%clean
-rm -rf $RPM_BUILD_ROOT
-
-
-%files
-%defattr(-,root,root)
-%{_mingw32_bindir}/*
-%{_mingw32_docdir}/*
-%{_mingw32_includedir}/*
-%{_mingw32_libdir}/*
-%{_mingw32_mandir}/man3/*
-
-
-%changelog
-* Mon Nov 24 2008 Richard W.M. Jones <rjones@redhat.com> - 3.15.1-8
-- Rebuild against latest filesystem package.
-- MINGW_CFLAGS -> MINGW32_CFLAGS.
-- Rewrite the summary for accuracy and brevity.
-
-* Fri Nov 21 2008 Richard W.M. Jones <rjones@redhat.com> - 3.15.1-6
-- Remove obsoletes for a long dead package.
-- Reenable (and fix) _mingw32_configure (Levente Farkas).
-
-* Thu Nov 20 2008 Richard W.M. Jones <rjones@redhat.com> - 3.15.1-5
-- Don't use _mingw32_configure macro - doesn't work here.
-
-* Wed Nov 19 2008 Richard W.M. Jones <rjones@redhat.com> - 3.15.1-4
-- Rebuild against mingw32-filesystem 37
-
-* Wed Nov 19 2008 Richard W.M. Jones <rjones@redhat.com> - 3.15.1-3
-- Remove the useconds patch, which is no longer needed (Levente Farkas).
-- Use _mingw32_configure macro.
-
-* Wed Nov 19 2008 Richard W.M. Jones <rjones@redhat.com> - 3.15.1-2
-- Rebuild against mingw32-filesystem 36
-
-* Thu Oct 16 2008 Richard W.M. Jones <rjones@redhat.com> - 3.15.1-1
-- New upstream version 3.15.1.
-
-* Wed Sep 24 2008 Richard W.M. Jones <rjones@redhat.com> - 3.14-6
-- Rename mingw -> mingw32.
-
-* Thu Sep 4 2008 Richard W.M. Jones <rjones@redhat.com> - 3.14-4
-- Use RPM macros from mingw-filesystem.
-
-* Mon Jul 7 2008 Richard W.M. Jones <rjones@redhat.com> - 3.14-2
-- Initial RPM release, largely based on earlier work from several sources.
+++ /dev/null
-# NOTE: NOT a Fedora package. This contains binaries which are needed
-# just to bootstrap the whole system if you build everything from scratch.
-
-%define __os_install_post /usr/lib/rpm/brp-compress %{nil}
-
-%define w32api_version 3.11
-
-Name: mingw32-w32api-bootstrap
-Version: 1
-Release: 4%{?dist}
-Summary: MinGW Windows bootstrap (binary package)
-
-Group: Development/Libraries
-License: Public Domain
-URL: http://www.mingw.org/
-
-Source0: http://dl.sourceforge.net/sourceforge/mingw/w32api-%{w32api_version}.tar.gz
-
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-BuildArch: noarch
-
-Provides: mingw32-w32api = %{w32api_version}
-Provides: mingw-w32api = %{w32api_version}
-
-
-%description
-MinGW bootstrap (binary package).
-
-
-%prep
-%setup -q -c
-
-%build
-rm -rf i686-pc-mingw32
-
-# Setup sys-root.
-mkdir -p i686-pc-mingw32/sys-root/mingw
-cp -a include lib i686-pc-mingw32/sys-root/mingw
-
-
-%install
-rm -rf $RPM_BUILD_ROOT
-
-mkdir -p $RPM_BUILD_ROOT%{_prefix}
-cp -a i686-pc-mingw32 $RPM_BUILD_ROOT%{_prefix}
-
-
-%clean
-rm -rf $RPM_BUILD_ROOT
-
-
-%files
-%defattr(-,root,root)
-%dir %{_prefix}/i686-pc-mingw32
-%{_prefix}/i686-pc-mingw32/sys-root
-
-
-%changelog
-* Wed Sep 24 2008 Richard W.M. Jones <rjones@redhat.com> - 1-4
-- Rename mingw -> mingw32.
-
-* Mon Jul 7 2008 Richard W.M. Jones <rjones@redhat.com> - 1-3
-- Initial RPM release.
+++ /dev/null
-%define __strip %{_mingw32_strip}
-%define __objdump %{_mingw32_objdump}
-%define _use_internal_dependency_generator 0
-%define __find_requires %{_mingw32_findrequires}
-%define __find_provides %{_mingw32_findprovides}
-
-Name: mingw32-w32api
-Version: 3.12
-Release: 6%{?dist}
-Summary: Win32 header files and stubs
-
-License: Public Domain
-Group: Development/Libraries
-URL: http://www.mingw.org/
-Source0: http://dl.sourceforge.net/sourceforge/mingw/w32api-%{version}-mingw32-src.tar.gz
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-BuildArch: noarch
-
-BuildRequires: mingw32-filesystem >= 39-3
-BuildRequires: mingw32-binutils
-BuildRequires: mingw32-gcc
-BuildRequires: mingw32-runtime
-
-Requires: mingw32-binutils
-Requires: mingw32-gcc
-Requires: mingw32-runtime
-
-# Once this is installed, mingw32-bootstrap (binary bootstrapper) is no
-# longer needed.
-Obsoletes: mingw32-w32api-bootstrap
-
-
-%description
-MinGW Windows cross-compiler Win32 header files.
-
-
-%prep
-%setup -q -n w32api-%{version}-mingw32
-
-%build
-%{_mingw32_configure}
-make
-
-
-%install
-rm -rf $RPM_BUILD_ROOT
-
-%{_mingw32_makeinstall}
-
-
-%clean
-rm -rf $RPM_BUILD_ROOT
-
-
-%files
-%defattr(-,root,root)
-%{_mingw32_includedir}/*
-%{_mingw32_libdir}/*.a
-
-
-%changelog
-* Mon Nov 24 2008 Richard W.M. Jones <rjones@redhat.com> - 3.12-6
-- Rebuild against latest filesystem package.
-- Rewrite the summary for accuracy and brevity.
-
-* Fri Nov 21 2008 Richard W.M. Jones <rjones@redhat.com> - 3.12-4
-- Remove obsoletes for a long dead package.
-- Enable _mingw32_configure (Levente Farkas).
-
-* Wed Nov 19 2008 Richard W.M. Jones <rjones@redhat.com> - 3.12-3
-- Rebuild against mingw32-filesystem 37
-
-* Wed Nov 19 2008 Richard W.M. Jones <rjones@redhat.com> - 3.12-2
-- Rebuild against mingw32-filesystem 36
-
-* Thu Oct 16 2008 Richard W.M. Jones <rjones@redhat.com> - 3.12-1
-- New upstream version 3.12.
-
-* Wed Sep 24 2008 Richard W.M. Jones <rjones@redhat.com> - 3.11-7
-- Rename mingw -> mingw32.
-
-* Wed Sep 10 2008 Richard W.M. Jones <rjones@redhat.com> - 3.11-6
-- Moved ole provides to mingw-filesystem package.
-
-* Thu Sep 4 2008 Richard W.M. Jones <rjones@redhat.com> - 3.11-3
-- Use the RPM macros from mingw-filesystem.
-
-* Mon Jul 7 2008 Richard W.M. Jones <rjones@redhat.com> - 3.11-2
-- Initial RPM release, largely based on earlier work from several sources.
git.annexia.org / fedora-mingw.git / commitdiff