Ticket #668: lhc.dpatch

1 patch for repository http://darcs.haskell.org/cabal-branches/cabal-1.8:

Thu Apr 29 14:29:15 CDT 2010  dmp@rice.edu
  * Update the simple distribution for LHC
  
  This patch updates the simple LHC distribution. There are two changes.
  
  1) Change the hackRtsPackage to not fail with an error.
  The hackRtsPackage function was previously throwing an error when
  it found zero or more than one rts packages. The rts package is not
  needed in lhc, so the error is now ignored. This change now matches the
  behavior in the GHC distribution (Distribution/Simple/GHC.hs)
  
  2) Change the value passed to the odir for compiling C files.
  The current code was doing a version check to catch a bug with GHC <
  6.4. Since lhc is only version 0.9, it was also failing on the version
  check and passing an incorrect value to odir. Changed to use the
  correct value as with GHC > 6.4.
  

New patches:

[Update the simple distribution for LHC
dmp@rice.edu**20100429192915
 Ignore-this: a2938423e54cb929710507c266cecce3
 
 This patch updates the simple LHC distribution. There are two changes.
 
 1) Change the hackRtsPackage to not fail with an error.
 The hackRtsPackage function was previously throwing an error when
 it found zero or more than one rts packages. The rts package is not
 needed in lhc, so the error is now ignored. This change now matches the
 behavior in the GHC distribution (Distribution/Simple/GHC.hs)
 
 2) Change the value passed to the odir for compiling C files.
 The current code was doing a version check to catch a bug with GHC <
 6.4. Since lhc is only version 0.9, it was also failing on the version
 check and passing an incorrect value to odir. Changed to use the
 correct value as with GHC > 6.4.
 
] {
hunk ./Distribution/Simple/LHC.hs 254
       case PackageIndex.lookupPackageName index (PackageName "rts") of
         [(_,[rts])]
            -> PackageIndex.insert (removeMingwIncludeDir rts) index
-        _  -> error "No (or multiple) rts package is registered!!"
+        _  -> index -- rts package not required for lhc
 
 checkPackageDbStack :: PackageDBStack -> IO ()
 checkPackageDbStack (GlobalPackageDB:rest)
hunk ./Distribution/Simple/LHC.hs 665
 constructCcCmdLine :: LocalBuildInfo -> BuildInfo -> ComponentLocalBuildInfo
                    -> FilePath -> FilePath -> Verbosity -> (FilePath,[String])
 constructCcCmdLine lbi bi clbi pref filename verbosity
-  =  let odir | compilerVersion (compiler lbi) >= Version [6,4,1] []  = pref
-              | otherwise = pref </> takeDirectory filename
-                        -- ghc 6.4.1 fixed a bug in -odir handling
-                        -- for C compilations.
+  -- lhc only works with GHC > 6.10, which it handles -odir for C properly
+  =  let odir = pref 
      in
         (odir,
          ghcCcOptions lbi bi clbi odir
}

Context:

[TAG 1.8.0.4
Duncan Coutts <duncan@haskell.org>**20100331121116
 Ignore-this: 7786aeb8500ba582e790bb83b9a4a49b
] 
[Update changelog for 1.8.0.4
Duncan Coutts <duncan@haskell.org>**20100331120004
 Ignore-this: 93bc71d1364a83ac2f7d419a812695a1
] 
[Bump version to 1.8.0.4
Duncan Coutts <duncan@haskell.org>**20100331115230
 Ignore-this: 24b1ed8671970519f09333aa372c690a
] 
[Fix a duplicate import
Ian Lynagh <igloo@earth.li>**20100325204420] 
[MERGE: Fix local inplace registration for ghc-6.12
Duncan Coutts <duncan@haskell.org>**20100321110000
 Ignore-this: 3f4ba5d7ae9658d119ca1319a7c2f787
 Version of this patch for 1.8 branch that does not change external API.
] 
[On windows, pick up ar.exe from the ghc install before looking on the $PATH
Duncan Coutts <duncan@haskell.org>**20100320143643
 Ignore-this: a3931cad3a8fd821a9b1ddd893db8c32
 Some ar.exe versions floating around seem to have weird non-posix behaviour.
] 
[Bump to 1.8.0.3
Duncan Coutts <duncan@haskell.org>**20100320140930
 Ignore-this: a6cc348410833a8b9cff92bdb0c82242
 Intermediate version, the next release will be 1.8.0.4
] 
[MERGED: Registering packages needs all the package dbs listed
Duncan Coutts <duncan@haskell.org>**20100320135748
 Ignore-this: 3ab3a5fcefa6c30a806790c370d25630
 Special version for the 1.8 branch that does not change the external API
 Duplicates some internal code instead.
] 
[Cannot apply the registering packages fix in the 1.8 branch, it changes the API
Duncan Coutts <duncan@haskell.org>**20100320095622
 Ignore-this: e9f127f2526a6beedcc4fb133040d144
 
 rolling back:
 
 Fri Dec 11 13:32:33 GMT 2009  Duncan Coutts <duncan@haskell.org>
   * Registering packages needs all the package dbs listed
   Important for the case of registering inplace when we're using a
   specific package db, e.g. when doing isolated builds.
 
     M ./Distribution/Simple/Build.hs -1 +2
     M ./Distribution/Simple/Compiler.hs -1 +1
     M ./Distribution/Simple/GHC.hs -9 +9
     M ./Distribution/Simple/Program/HcPkg.hs -9 +23
     M ./Distribution/Simple/Register.hs -21 +21
] 
[Document the "manual" attribute of flags
Ian Lynagh <igloo@earth.li>**20100317203744] 
[Tweak doc Makefile
Ian Lynagh <igloo@earth.li>**20100317202418] 
[Registering packages needs all the package dbs listed
Duncan Coutts <duncan@haskell.org>**20091211133233
 Ignore-this: 249cc7ae1452bfa8e970f0ba24d4ff5f
 Important for the case of registering inplace when we're using a
 specific package db, e.g. when doing isolated builds.
] 
[Tweak layout to work with alternative layout rule
Ian Lynagh <igloo@earth.li>**20091129163614] 
[MERGED: Get the correct value of $topdir on Windows with GHC 6.12.1
Ian Lynagh <igloo@earth.li>**20100204132938
 Ian Lynagh <igloo@earth.li>**20091230204613
 
 This doesn't full merge the patch, as partly it changed an interface in
 order to refactor.
] 
[Fix mismatch between arch and os variables in D.S.InstallDirs interpolation
Andrea Vezzosi <sanzhiyan@gmail.com>**20100119031642
 Ignore-this: 3a66bd9771f294fc1f52be8824ca051b
] 
[Revert the change to filter out deps of non-buildable components
Duncan Coutts <duncan@haskell.org>**20091229222533
 Ignore-this: 7f6f18997e28b843422d2c55a8bce302
 It does not work as intended and gives inconsistent results between
 cabal install and cabal configure. The problem with the approach was
 that we were filtering out the dependencies of non-buildable components
 at the end. But that does not help much since if one of the deps of
 the non-buildable component were not available then we would have
 failed earlier with a constraint failure. A proper solution would have
 to tackle it from the beginning, not just as a filter at the end.
 The meaning of build-depends and buildable: False needs more thought.
] 
[Change preprocessModule to preprocessFile
Duncan Coutts <duncan@haskell.org>**20091228190125
 So we can stop pretending that "main-is: foo.hs" is a module name.
 Also allows us to deprecate ModuleName.simple which bypasses the
 ModuleName type invariant.
] 
[Fix generating Paths_pkgname module with hugs
Duncan Coutts <duncan@haskell.org>**20091228202618
 In the case that the progsdir is not relative to the $prefix
] 
[Fix priority of the two global hugs package dbs
Duncan Coutts <duncan@haskell.org>**20091228024849] 
[Silence warning about unused paramater
Duncan Coutts <duncan@haskell.org>**20091229211649] 
[Add parenthesis to macros in cabal_macros.h
Antoine Latter <aslatter@gmail.com>**20091229023358
 Ignore-this: 5c5e7244d10bcd82da2cbf4432b30a6d
 Now this like "#if !MIN_VERSION_base(4,2,0)" will work
] 
[Implement support for hugs and nhc98 package databases
Duncan Coutts <duncan@haskell.org>**20091223233557
 Ignore-this: aa12e2a278e89544ead82d7c8d3b325a
 That is, work out which packages are installed for hugs and nhc98.
 In both cases there is special support for the core packages.
 In future both should use the standard method when they supply
 proper installed package info files for the bundled libraries.
] 
[Find the version of hugs
Duncan Coutts <duncan@haskell.org>**20091222175415
 This is really hard and rather nasty.
] 
[Make the datadir follow the $prefix on Windows
Duncan Coutts <duncan@haskell.org>**20091228165056
 Ignore-this: ce33a328dbf2d1e419cf6e5047bff091
 This is slightly experimental, we'll see how it goes. See ticket #466.
] 
[Fixes for compiling Cabal with hugs
Duncan Coutts <duncan@haskell.org>**20091223103916
 Ignore-this: f49c719d33e3909996f391e80911c51c
] 
[Make lack of language extensions an error not a warning
Duncan Coutts <duncan@haskell.org>**20091216204505
 Also improve the error message somewhat
] 
[Make it so cabal passes the dylib-install-name when building dynamic libraries on Mac OS/X.
Ian Lynagh <igloo@earth.li>**20091204144142
 This is a rerecord of
     Stephen Blackheath <oversensitive.pastors.stephen@blacksapphire.com>**20091001053101
 to avoid conflicts.
] 
[Switch a few distribution checks to build warnings
Duncan Coutts <duncan@haskell.org>**20091202143549
 Ignore-this: bbadf449113d009b51837bc1dd3488af
 In particular the one about -prof since this leads to borked packages.
] 
[Specify DOCTYPE when generating userguide html
Duncan Coutts <duncan@haskell.org>**20091216035321
 Ignore-this: 9d3b09e3c593a8d5f39b691ef2ceb377
 Useless docbook tools.
] 
[Note release number and date in changelog
Duncan Coutts <duncan@haskell.org>**20091216031317
 Ignore-this: b645542a479005d42ae7894602be83ca
] 
[TAG Cabal 1.8.0.2 release
Ian Lynagh <igloo@earth.li>**20091215124711] 
Patch bundle hash:
08f3879a59709058b858f48220c88cc5a7deaf5f