[Pkg-haskell-commits] darcs: haskell-devscripts: Pass --ghc-option=-DDEBIAN_NO_GHCI to configure if ghc does not support ghci, to allow packages to selectively disable features (e.g. TH, annotations) then.

[Joachim Breitner]

Sun Sep  4 17:30:46 UTC 2011  Joachim Breitner <mail at joachim-breitner.de>
  * Pass --ghc-option=-DDEBIAN_NO_GHCI to configure if ghc does not support ghci, to allow packages to selectively disable features (e.g. TH, annotations) then.
  Ignore-this: b3479d43f8363087fd0cf56d929a8673

    M ./debian/changelog +3
    M ./hlibrary.mk -1 +3

Sun Sep  4 17:30:46 UTC 2011  Joachim Breitner <mail at joachim-breitner.de>
  * Pass --ghc-option=-DDEBIAN_NO_GHCI to configure if ghc does not support ghci, to allow packages to selectively disable features (e.g. TH, annotations) then.
  Ignore-this: b3479d43f8363087fd0cf56d929a8673
diff -rN -u old-haskell-devscripts//debian/changelog new-haskell-devscripts//debian/changelog
--- old-haskell-devscripts//debian/changelog	2011-09-04 17:33:05.362391797 +0000
+++ new-haskell-devscripts//debian/changelog	2011-09-04 17:33:05.378334858 +0000
@@ -12,6 +12,9 @@
   * Depend on dh-buildinfo. This stores a file in /usr/share/*/doc listing the
     version of all the build dependencies, and might be handy some time if we
     need to recompile stuff.
+  * Pass --ghc-option=-DDEBIAN_NO_GHCI to configure if ghc does not support
+    ghci, to allow packages to selectively disable features (e.g. TH,
+    annotations) then.
 
  -- Giovanni Mascellani <gio at debian.org>  Thu, 28 Jul 2011 18:19:36 +0200
 
diff -rN -u old-haskell-devscripts//hlibrary.mk new-haskell-devscripts//hlibrary.mk
--- old-haskell-devscripts//hlibrary.mk	2011-09-04 17:33:05.340808597 +0000
+++ new-haskell-devscripts//hlibrary.mk	2011-09-04 17:33:05.378334858 +0000
@@ -32,6 +32,8 @@
 
 ENABLE_PROFILING = $(shell egrep -qe '^Package: libghc-.*-prof$$' debian/control && echo --enable-library-profiling; exit 0)
 
+NO_GHCI_FLAG = $(shell test -e /usr/bin/ghci || echo --ghc-option=-DDEBIAN_NO_GHCI; exit 0)
+
 DEB_COMPRESS_EXCLUDE += .haddock .hs
 
 # TODO:
@@ -86,7 +88,7 @@
 		--prefix=/usr --libdir=/usr/lib/haskell-packages/ghc/lib \
 		--builddir=dist-ghc \
 		--haddockdir=$(DEB_HADDOCK_DIR) \
-		--htmldir=$(DEB_HADDOCK_HTML_DIR) $(ENABLE_PROFILING) \
+		--htmldir=$(DEB_HADDOCK_HTML_DIR) $(ENABLE_PROFILING) $(NO_GHCI_FLAG) \
 		$(DEB_SETUP_GHC6_CONFIGURE_ARGS) $(DEB_SETUP_GHC_CONFIGURE_ARGS) $(OPTIMIZATION)
 
 build-ghc-stamp: dist-ghc