# HG changeset patch
# User Volker Grabsch <vog@notjusthosting.com>
# Date 1276604559 -7200
# Node ID 6c32d4d9dbbd561dfd084518e2eccf9632a01fab
# Parent  377f3abd52f8661da219b1c5a4cb0f22eaed860c# Parent  a4ef45a41359ae0e4566a254fcd3927140228b99
merge

diff -r 377f3abd52f8 -r 6c32d4d9dbbd doc/index.html
--- a/doc/index.html	Tue Jun 15 14:21:32 2010 +0200
+++ b/doc/index.html	Tue Jun 15 14:22:39 2010 +0200
@@ -410,27 +410,20 @@
 
     <dl>
 
-    <dt>2010-xx-xx &ndash; Release <span id="latest-version">2.14</span></dt>
+    <dt>2010-xx-xx &ndash; Release <span id="latest-version">2.15</span></dt>
     <dd>
         <p>
-        <a href="http://download.savannah.nongnu.org/releases/mingw-cross-env/mingw-cross-env-2.14.tar.gz">Download</a> |
-        <a href="http://hg.savannah.nongnu.org/hgweb/mingw-cross-env/log/2.14">Changelog</a>
+        <a href="http://download.savannah.nongnu.org/releases/mingw-cross-env/mingw-cross-env-2.15.tar.gz">Download</a> |
+        <a href="http://hg.savannah.nongnu.org/hgweb/mingw-cross-env/log/2.15">Changelog</a>
         </p>
 
         <p>
-        This release fixes download errors caused by the MinGW project
-        (a sudden change of their URL scheme without proper redirects).
-        <a href="http://www.w3.org/Provider/Style/URI">That sort of thing should never happen!</a>
+        This release ...
         </p>
 
         <p>
         Almost all packages are updated to their latest version.
         </p>
-
-        <p>
-        New packages are supported:
-        libarchive, libgee and xvidcore.
-        </p>
     </dd>
 
     <dt>Old Releases</dt>
@@ -882,6 +875,29 @@
 
     <dl>
 
+    <dt>2010-06-08 &ndash; Release 2.14</dt>
+    <dd>
+        <p>
+        <a href="http://download.savannah.nongnu.org/releases/mingw-cross-env/mingw-cross-env-2.14.tar.gz">Download</a> |
+        <a href="http://hg.savannah.nongnu.org/hgweb/mingw-cross-env/log/2.14">Changelog</a>
+        </p>
+
+        <p>
+        This release fixes download errors caused by the MinGW project
+        (a sudden change of their URL scheme without proper redirects).
+        <a href="http://www.w3.org/Provider/Style/URI">That sort of thing should never happen!</a>
+        </p>
+
+        <p>
+        Almost all packages are updated to their latest version.
+        </p>
+
+        <p>
+        New packages are supported:
+        libarchive, libgee and xvidcore.
+        </p>
+    </dd>
+
     <dt>2010-05-31 &ndash; Release 2.13</dt>
     <dd>
         <p>
diff -r 377f3abd52f8 -r 6c32d4d9dbbd src/gcc-mpfr.mk
--- a/src/gcc-mpfr.mk	Tue Jun 15 14:21:32 2010 +0200
+++ b/src/gcc-mpfr.mk	Tue Jun 15 14:22:39 2010 +0200
@@ -4,8 +4,8 @@
 # MPFR for GCC
 PKG             := gcc-mpfr
 $(PKG)_IGNORE   :=
-$(PKG)_VERSION  := 2.4.2
-$(PKG)_CHECKSUM := 7ca93006e38ae6e53a995af836173cf10ee7c18c
+$(PKG)_VERSION  := 3.0.0
+$(PKG)_CHECKSUM := 8ae8bc72ac26a0f17ad9f57c520264c056c64770
 $(PKG)_SUBDIR   := mpfr-$($(PKG)_VERSION)
 $(PKG)_FILE     := mpfr-$($(PKG)_VERSION).tar.bz2
 $(PKG)_WEBSITE  := http://www.mpfr.org/
diff -r 377f3abd52f8 -r 6c32d4d9dbbd src/gcc.mk
--- a/src/gcc.mk	Tue Jun 15 14:21:32 2010 +0200
+++ b/src/gcc.mk	Tue Jun 15 14:22:39 2010 +0200
@@ -31,6 +31,10 @@
 
     # build GCC and support libraries
     mkdir '$(1)/build'
+    # mpfr 3.0.0 configure expects these gmp headers here
+    mkdir '$(1)/build/gmp'
+    ln -s '$(1)/gmp/gmp-impl.h' '$(1)/build/gmp/'
+    ln -s '$(1)/gmp/longlong.h' '$(1)/build/gmp/'
     cd    '$(1)/build' && '$(1)/configure' \
         --target='$(TARGET)' \
         --prefix='$(PREFIX)' \