4 files changed, 124 insertions, 127 deletions
diff --git a/gmp/Makefile b/gmp/Makefile
deleted file mode 100644
index 78cb5702b5..0000000000
--- a/gmp/Makefile
+++ /dev/null
@@ -1,127 +0,0 @@
-
-TOP=..
-
-include $(TOP)/mk/boilerplate.mk
-
-# -----------------------------------------------------------------------------
-# Compile GMP only if we don't have it already
-#
-# We use GMP's own configuration stuff, because it's all rather hairy
-# and not worth re-implementing in our Makefile framework.
-
-ifneq "$(HaveLibGmp)" "YES"
-ifneq "$(HaveFrameworkGMP)" "YES"
-
-PLATFORM := $(shell echo $(HOSTPLATFORM) | sed 's/i[567]86/i486/g')
-
-# 2007-09-26
-#     set -o igncr 
-# is not a valid command on non-Cygwin-systems.
-# Let it fail silently instead of aborting the build.
-#
-# 2007-07-05
-# We do
-#     set -o igncr; export SHELLOPTS
-# here as otherwise checking the size of limbs
-# makes the build fall over on Cygwin. See the thread
-# http://www.cygwin.com/ml/cygwin/2006-12/msg00011.html
-# for more details.
-
-# 2007-07-05
-# Passing
-#     as_ln_s='cp -p'
-# isn't sufficient to stop cygwin using symlinks the mingw gcc can't
-# follow, as it isn't used consistently. Instead we put an ln.bat in
-# path that always fails.
-
-# We use a tarball like gmp-4.2.1-nodoc.tar.gz, which is
-# gmp-4.2.1.tar.gz repacked without the doc/ directory contents.
-# That's because the doc/ directory contents are under the GFDL,
-# which causes problems for Debian.
-
-GMP_TARBALL := $(firstword $(wildcard gmp*.tar.gz))
-GMP_DIR := $(subst -nodoc.tar.gz,,$(GMP_TARBALL))
-
-ifeq "$(findstring dyn, $(GhcRTSWays))" "dyn"
-BUILD_SHARED=yes
-else
-BUILD_SHARED=no
-endif
-
-BINDIST_STAMPS = stamp.gmp.static
-INSTALL_HEADERS += gmp.h
-INSTALL_LIBS += libgmp.a
-
-ifeq "$(BUILD_SHARED)" "yes"
-BINDIST_STAMPS += stamp.gmp.shared
-INSTALL_LIBS += libgmp.dll.a
-INSTALL_PROGS += libgmp-3.dll
-endif
-
-install all :: $(INSTALL_HEADERS) $(INSTALL_LIBS) $(INSTALL_PROGS)
-
-stamp.gmp.static:
-	$(RM) -rf $(GMP_DIR) gmpbuild
-	$(TAR) -zxf $(GMP_TARBALL)
-	mv $(GMP_DIR) gmpbuild
-	chmod +x ln
-	(set -o igncr 2>/dev/null) && set -o igncr; export SHELLOPTS; \
-	    PATH=`pwd`:$$PATH; \
-	    export PATH; \
-	    cd gmpbuild && \
-	    CC=$(WhatGccIsCalled) $(SHELL) configure \
-	          --enable-shared=no --host=$(PLATFORM) --build=$(PLATFORM)
-	touch $@
-
-stamp.gmp.shared:
-	$(RM) -rf $(GMP_DIR) gmpbuild-shared
-	$(TAR) -zxf $(GMP_TARBALL)
-	mv $(GMP_DIR) gmpbuild-shared
-	chmod +x ln
-	(set -o igncr 2>/dev/null) && set -o igncr; export SHELLOPTS; \
-	    PATH=`pwd`:$$PATH; \
-	    export PATH; \
-	    cd gmpbuild-shared && \
-	    CC=$(WhatGccIsCalled) $(SHELL) configure \
-	          --enable-shared=yes --disable-static --host=$(PLATFORM) --build=$(PLATFORM)
-	touch $@
-
-gmp.h: stamp.gmp.static
-	$(CP) gmpbuild/gmp.h .
-
-libgmp.a: stamp.gmp.static
-	$(MAKE) -C gmpbuild MAKEFLAGS=
-	$(CP) gmpbuild/.libs/libgmp.a .
-	$(RANLIB) libgmp.a
-
-libgmp-3.dll: stamp.gmp.shared
-	$(MAKE) -C gmpbuild-shared MAKEFLAGS=
-	$(CP) gmpbuild-shared/.libs/libgmp-3.dll .
-
-libgmp.dll.a: libgmp-3.dll
-	$(CP) gmpbuild-shared/.libs/libgmp.dll.a .
-endif
-endif
-
-# GMP takes a long time to build, but changes rarely.  Hence we don't
-# bother cleaning it before validating, because that adds a
-# significant overhead to validation.
-ifeq "$(Validating)" "NO"
-clean distclean maintainer-clean ::
-	$(RM) -f stamp.gmp.static stamp.gmp.shared
-	$(RM) -rf gmpbuild
-	$(RM) -rf gmpbuild-shared
-endif
-
-#-----------------------------------------------------------------------------
-#
-# binary-dist
-
-include $(TOP)/mk/target.mk
-
-BINDIST_EXTRAS += $(BINDIST_STAMPS)
-BINDIST_EXTRAS += $(INSTALL_PROGS)
-BINDIST_EXTRAS += $(INSTALL_LIBS)
-BINDIST_EXTRAS += $(INSTALL_HEADERS)
-include $(TOP)/mk/bindist.mk
-
diff --git a/gmp/ghc.mk b/gmp/ghc.mk
new file mode 100644
index 0000000000..1a71e17878
--- /dev/null
+++ b/gmp/ghc.mk
@@ -0,0 +1,124 @@
+
+# Compile GMP only if we don't have it already
+#
+# We use GMP's own configuration stuff, because it's all rather hairy
+# and not worth re-implementing in our Makefile framework.
+
+ifeq "$(findstring dyn, $(GhcRTSWays))" "dyn"
+BUILD_SHARED=yes
+else
+BUILD_SHARED=no
+endif
+
+# In a bindist, we don't want to know whether /this/ machine has gmp,
+# but whether the machine the bindist was built on had gmp.
+ifeq "$(BINDIST)" "YES"
+ifeq "$(wildcard gmp/libgmp.a)" ""
+HaveLibGmp = YES
+HaveFrameworkGMP = YES
+else
+HaveLibGmp = NO
+HaveFrameworkGMP = NO
+endif
+endif
+
+ifneq "$(HaveLibGmp)" "YES"
+ifneq "$(HaveFrameworkGMP)" "YES"
+
+INSTALL_LIBS += gmp/libgmp.a
+
+$(eval $(call all-target,gmp_dynamic,gmp/libgmp.a))
+
+ifeq "$(BUILD_SHARED)" "yes"
+$(eval $(call all-target,gmp_dynamic,gmp/libgmp.dll.a gmp/libgmp-3.dll))
+endif
+
+endif
+endif
+
+PLATFORM := $(shell echo $(HOSTPLATFORM) | sed 's/i[567]86/i486/g')
+
+# 2007-09-26
+#     set -o igncr 
+# is not a valid command on non-Cygwin-systems.
+# Let it fail silently instead of aborting the build.
+#
+# 2007-07-05
+# We do
+#     set -o igncr; export SHELLOPTS
+# here as otherwise checking the size of limbs
+# makes the build fall over on Cygwin. See the thread
+# http://www.cygwin.com/ml/cygwin/2006-12/msg00011.html
+# for more details.
+
+# 2007-07-05
+# Passing
+#     as_ln_s='cp -p'
+# isn't sufficient to stop cygwin using symlinks the mingw gcc can't
+# follow, as it isn't used consistently. Instead we put an ln.bat in
+# path that always fails.
+
+# We use a tarball like gmp-4.2.4-nodoc.tar.bz2, which is
+# gmp-4.2.4.tar.bz2 repacked without the doc/ directory contents.
+# That's because the doc/ directory contents are under the GFDL,
+# which causes problems for Debian.
+
+GMP_TARBALL := $(wildcard gmp/tarball/gmp*.tar.bz2)
+GMP_DIR := $(patsubst gmp/tarball/%-nodoc.tar.bz2,%,$(GMP_TARBALL))
+
+# XXX INSTALL_HEADERS += gmp.h
+
+gmp/libgmp.a:
+	$(RM) -rf $(GMP_DIR) gmp/gmpbuild
+	cd gmp && $(TAR) -jxf ../$(GMP_TARBALL)
+	mv gmp/$(GMP_DIR) gmp/gmpbuild
+	chmod +x gmp/ln
+	cd gmp; (set -o igncr 2>/dev/null) && set -o igncr; export SHELLOPTS; \
+	    PATH=`pwd`:$$PATH; \
+	    export PATH; \
+	    cd gmpbuild && \
+	    CC=$(WhatGccIsCalled) $(SHELL) configure \
+	          --enable-shared=no --host=$(PLATFORM) --build=$(PLATFORM)
+	$(MAKE) -C gmp/gmpbuild MAKEFLAGS=
+	$(CP) gmp/gmpbuild/.libs/libgmp.a gmp/
+	$(RANLIB) gmp/libgmp.a
+
+$(eval $(call clean-target,gmp,,\
+  gmp/libgmp.a gmp/gmpbuild gmp/$(GMP_DIR)))
+
+# XXX TODO:
+#stamp.gmp.shared:
+#	$(RM) -rf $(GMP_DIR) gmpbuild-shared
+#	$(TAR) -zxf $(GMP_TARBALL)
+#	mv $(GMP_DIR) gmpbuild-shared
+#	chmod +x ln
+#	(set -o igncr 2>/dev/null) && set -o igncr; export SHELLOPTS; \
+#	    PATH=`pwd`:$$PATH; \
+#	    export PATH; \
+#	    cd gmpbuild-shared && \
+#	    CC=$(WhatGccIsCalled) $(SHELL) configure \
+#	          --enable-shared=yes --disable-static --host=$(PLATFORM) --build=$(PLATFORM)
+#	touch $@
+#
+#gmp.h: stamp.gmp.static
+#	$(CP) gmpbuild/gmp.h .
+#
+#libgmp.a: stamp.gmp.static
+#
+#libgmp-3.dll: stamp.gmp.shared
+#	$(MAKE) -C gmpbuild-shared MAKEFLAGS=
+#	$(CP) gmpbuild-shared/.libs/libgmp-3.dll .
+#
+#libgmp.dll.a: libgmp-3.dll
+#	$(CP) gmpbuild-shared/.libs/libgmp.dll.a .
+
+## GMP takes a long time to build, but changes rarely.  Hence we don't
+## bother cleaning it before validating, because that adds a
+## significant overhead to validation.
+#ifeq "$(Validating)" "NO"
+#clean distclean maintainer-clean ::
+#	$(RM) -f stamp.gmp.static stamp.gmp.shared
+#	$(RM) -rf gmpbuild
+#	$(RM) -rf gmpbuild-shared
+#endif
+
diff --git a/gmp/gmp-4.2.1-nodoc.tar.gz b/gmp/gmp-4.2.1-nodoc.tar.gz
deleted file mode 100644
index 71aa688458..0000000000
--- a/gmp/gmp-4.2.1-nodoc.tar.gz
+++ /dev/null
diff --git a/gmp/tarball/gmp-4.2.4-nodoc.tar.bz2 b/gmp/tarball/gmp-4.2.4-nodoc.tar.bz2
new file mode 100644
index 0000000000..acd74824b9
--- /dev/null
+++ b/gmp/tarball/gmp-4.2.4-nodoc.tar.bz2