Fix SPARC build, missing #include

[ghc-hetmet.git] / gmp / Makefile

diff --git a/gmp/Makefile b/gmp/Makefile
index f09c523..78cb570 100644 (file)
--- a/gmp/Makefile
+++ b/gmp/Makefile
@@ -14,6 +14,11 @@ 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
@@ -29,9 +34,13 @@ PLATFORM := $(shell echo $(HOSTPLATFORM) | sed 's/i[567]86/i486/g')
 # 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 .tar.gz,,$(GMP_TARBALL))
-BMP_BUILD_DIR := build
+GMP_DIR := $(subst -nodoc.tar.gz,,$(GMP_TARBALL))
 
 ifeq "$(findstring dyn, $(GhcRTSWays))" "dyn"
 BUILD_SHARED=yes
@@ -39,26 +48,26 @@ else
 BUILD_SHARED=no
 endif
 
-boot :: stamp.gmp.static
-all :: libgmp.a
-install :: libgmp.a
+BINDIST_STAMPS = stamp.gmp.static
+INSTALL_HEADERS += gmp.h
 INSTALL_LIBS += libgmp.a
 
 ifeq "$(BUILD_SHARED)" "yes"
-boot :: stamp.gmp.shared
-all :: libgmp-3.dll libgmp.dll.a
-install :: libgmp-3.dll libgmp.dll.a
+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; export SHELLOPTS; \
-           export PATH=`pwd`:$$PATH; \
+       (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)
@@ -69,13 +78,17 @@ stamp.gmp.shared:
        $(TAR) -zxf $(GMP_TARBALL)
        mv $(GMP_DIR) gmpbuild-shared
        chmod +x ln
-       set -o igncr; export SHELLOPTS; \
-           export PATH=`pwd`:$$PATH; \
+       (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 .
@@ -90,10 +103,15 @@ libgmp.dll.a: libgmp-3.dll
 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
 
 #-----------------------------------------------------------------------------
 #
@@ -101,20 +119,9 @@ clean distclean maintainer-clean ::
 
 include $(TOP)/mk/target.mk
 
-binary-dist:
-       @:
-ifneq "$(HaveLibGmp)" "YES"
-ifneq "$(HaveFrameworkGMP)" "YES"
-       $(INSTALL_DIR)                         $(BIN_DIST_DIR)/gmp
-       touch $(BIN_DIST_DIR)/gmp/$(GMP_TARBALL)
-       $(INSTALL_DATA)    Makefile            $(BIN_DIST_DIR)/gmp/
-ifneq "$(INSTALL_PROGS)" ""
-       $(INSTALL_DATA)    $(INSTALL_PROGS)    $(BIN_DIST_DIR)/gmp/
-endif
-ifneq "$(INSTALL_LIBS)" ""
-       $(INSTALL_DATA)    $(INSTALL_LIBS)     $(BIN_DIST_DIR)/gmp/
-endif
-
-endif
-endif
+BINDIST_EXTRAS += $(BINDIST_STAMPS)
+BINDIST_EXTRAS += $(INSTALL_PROGS)
+BINDIST_EXTRAS += $(INSTALL_LIBS)
+BINDIST_EXTRAS += $(INSTALL_HEADERS)
+include $(TOP)/mk/bindist.mk