Ticket #3121: Setup.dpatch

Tue Mar 24 15:34:04 CET 2009  Christian Kellermann <Christian.Kellermann@nefkom.net>
  * convert extra dirs flags to readline flags for configure explicitly

New patches:

[convert extra dirs flags to readline flags for configure explicitly
Christian Kellermann <Christian.Kellermann@nefkom.net>**20090324143404
 Ignore-this: 8bc5abe2866b3e74ea2aeca92be7296a
] {
hunk ./Setup.hs 3
 module Main (main) where
 
+import Distribution.PackageDescription
 import Distribution.Simple
hunk ./Setup.hs 5
+import Distribution.Simple.Configure
+import Distribution.Simple.Command
+import Distribution.Simple.LocalBuildInfo
+import Distribution.Simple.Setup
+import Distribution.Simple.Utils
+import System.Directory
+import System.FilePath
+
+readLineConf :: (Either GenericPackageDescription PackageDescription, HookedBuildInfo) -> ConfigFlags -> IO LocalBuildInfo
+readLineConf args@(desc, buildinfo) flags
+    = do let verbosity = fromFlag (configVerbosity flags)
+            readLineLib = "--with-readline-libraries=" ++ joinPath (configExtraLibDirs flags)
+            readLineInc = "--with-readline-includes=" ++ joinPath (configExtraIncludeDirs flags)
+             confargs = (configureArgs  True flags) ++ [readLineLib] ++ [readLineInc]
+         confExists <- doesFileExist "configure"
+         if confExists
+            then rawSystemExit verbosity "sh" $
+                   "configure"
+                 : confargs
+            else die "configure script not found."
+         configure args flags
+
 
 main :: IO ()
hunk ./Setup.hs 29
-main = defaultMainWithHooks defaultUserHooks
+main = defaultMainWithHooks $ simpleUserHooks { confHook = readLineConf }
hunk ./readline.cabal 17
 extra-tmp-files:
                config.log config.status autom4te.cache
                readline.buildinfo include/HsReadlineConfig.h
-build-type: Configure
+build-type: Custom
 cabal-version: >=1.2
 
 flag split-base
}

Context:

[TAG GHC 6.8.3 release
Ian Lynagh <igloo@earth.li>**20080619124351] 
[Fix haddock docs for readHistory and writeHistory; spotted by Krasimir Angelov
Ian Lynagh <igloo@earth.li>**20080612142547] 
[Fix building with old haddock versions: escape '/'s
Ian Lynagh <igloo@earth.li>**20080304230655] 
[#2053: Make readHistory/writeHistory return a Bool instead of throwing an exception on failure.
judah.jacobson@gmail.com**20080226233929] 
[#2053: add additional history functions
alexander.dunlap@gmail.com**20080122050536
 The following functions were added: readHistory, writeHistory, appendHistory, historyTruncateFile, clearHistory, stifleHistory, unstifleHistory, historyIsStifled, historyMaxEntries
] 
[markup for URL
Ross Paterson <ross@soi.city.ac.uk>**20071107005425] 
[remove obsolete config.mk.in
Ross Paterson <ross@soi.city.ac.uk>**20071107005850
 
 This was used when building in the GHC tree using the old fptools build
 system, to pass parameters from configure to the Makefile.  With the new
 Cabal-based build system, they go via readline.buildinfo.
] 
[FIX: fix name of include file in sdist
Ross Paterson <ross@soi.city.ac.uk>**20071103163724] 
[Fix test for whether readline is really editline to work for MacOS 10.5
Manuel M T Chakravarty <chak@cse.unsw.edu.au>**20071031105453] 
[Use configurations to allow building with older ghc & base lib
Duncan Coutts <duncan@haskell.org>**20071018111417
 Also specify build-type and cabal-version
] 
[bump the version number
Ian Lynagh <igloo@earth.li>**20071014105053] 
[Add interface for rl_completion_word_break_hook (version 5.0 or higher).
judah.jacobson@gmail.com**20070211231618] 
[Add get/set functions for the rl_attempted_completion_over variable.
judah.jacobson@gmail.com**20070211230806] 
[Add HsReadlineConfig.h to install-includes
Ian Lynagh <igloo@earth.li>**20070925214115
 Patch from Audrey Tang
] 
[clean config.mk
Simon Marlow <simonmar@microsoft.com>**20070914140737] 
[Add more entries to boring file
Ian Lynagh <igloo@earth.li>**20070913210720] 
[Add a boring file
Ian Lynagh <igloo@earth.li>**20070913204656] 
[TAG ghc-6.8 branched 2007-09-03
Ian Lynagh <igloo@earth.li>**20070903155838] 
[Link against GNUreadline.framework, if it's available.
judah.jacobson@gmail.com**20070906052628
 This can be overridden by setting --with-readline-includes or 
 --with-readline-libraries.
] 
[Remove redundant include/Makefile
Ian Lynagh <igloo@earth.li>**20070828205711] 
[Call the license LICENSE rather than COPYING for consistency
Ian Lynagh <igloo@earth.li>**20070828130747] 
[added a bit of documentation to the readline library
ijones@syntaxpolice.org**20070819083106] 
[--configure-option and --ghc-option are now provided by Cabal
Ross Paterson <ross@soi.city.ac.uk>**20070604115727] 
[Remove Makefile and package.conf.in (used in the old build system)
Ian Lynagh <igloo@earth.li>**20070524142629] 
[Remove unnecessary "import Prelude hiding (catch)"
Ian Lynagh <igloo@earth.li>**20070523222119] 
[We now depend on process
Ian Lynagh <igloo@earth.li>**20070523181523] 
[add install-includes: field
Simon Marlow <simonmar@microsoft.com>**20070517095014] 
[Make the Cabal build system honour configure flags
Roman Leshchinskiy <rl@cse.unsw.edu.au>**20070504042130
 
 The Cabal build system was ignoring --with-readline-includes and
 --with-readline-libraries.
] 
[Make configure fail if the package is not buildable
Ian Lynagh <igloo@earth.li>**20070430190918] 
[Follow Cabal changes in Setup.hs
Ian Lynagh <igloo@earth.li>**20070418114443] 
[readline no longer needs to hide build failure
Ian Lynagh <igloo@earth.li>**20070415215805
 The GHC build system now copes with it itself.
] 
[Fix configure with no --with-cc
Ian Lynagh <igloo@earth.li>**20070415194819] 
[Fix -Wall warnings
Ian Lynagh <igloo@earth.li>**20070411005013] 
[Add missing case in removePrefix
Ian Lynagh <igloo@earth.li>**20070411002555] 
[Pass configure opts down to ./configure, and add a nasty hack not to fail
Ian Lynagh <igloo@earth.li>**20070406182410
 If readline doesn't build then we still want to build the rest of GHC.
 For now readline simply ignores any failure when asked to build, but we
 really need to do something better here!
] 
[parse (but don't pass on) options for ./configure
Ian Lynagh <igloo@earth.li>**20070406153705] 
[Make syntax in .cabal file haddock-friendly
Ian Lynagh <igloo@earth.li>**20070308163504] 
[make Setup suitable for building the libraries with GHC
Ian Lynagh <igloo@earth.li>**20061112214707] 
[Match the types in the C source, not the documentation
Ian Lynagh <igloo@earth.li>**20070404122733] 
[Fix C/Haskell type mismatch
Ian Lynagh <igloo@earth.li>**20070404003613] 
[Give ld -Llibdir, not -Ilibdir
Ian Lynagh <igloo@earth.li>**20070305143239] 
[copy/paste-o
Ian Lynagh <igloo@earth.li>**20070305141749] 
[README about building from darcs
Ross Paterson <ross@soi.city.ac.uk>**20070218110201] 
[TAG 6.6 release
Ian Lynagh <igloo@earth.li>**20061011124740] 
[add boilerplate Setup.hs
Ross Paterson <ross@soi.city.ac.uk>**20060928231526] 
[Typo (this is the readline, not unix, package)
Ian Lynagh <igloo@earth.li>**20060823144042] 
[remove unnecessary #include "ghcconfig.h"
Ross Paterson <ross@soi.city.ac.uk>**20060809132127] 
[Make the configure test robust against libedit
Simon Marlow <simonmar@microsoft.com>**20060706120654
 See #766
 Thanks to Greg Wright for the fix.
] 
[make a start on Cabalizing readline
Ross Paterson <ross@soi.city.ac.uk>**20060609161024] 
[Move readline configuration into the readline package
Simon Marlow <simonmar@microsoft.com>**20060609135511
 
 Configuration of the readline package is now done with a
 package-private configure script, which takes it a step closer to
 being a standalone Cabal package.
 
 At the same time I added --with-readline-includes and
 --with-readline-libraries options to cater for systems where these
 libraries live in non-std places.
 
] 
[TAG Initial conversion from CVS complete
John Goerzen <jgoerzen@complete.org>**20060112154138] 
Patch bundle hash:
f1938d8a02a4c1469dabb3a46fbf4b87f607c09d