Merge pull request #6063 from commercialhaskell/sublibdeps

Add sub-library dependencies to Package type

Author: mpilgrem

src/Stack/Package.hs

@@ -25,6 +25,7 @@ import qualified Data.Map.Strict as M
 import qualified Data.Set as S
 import qualified Data.Text as T
 import           Distribution.CabalSpecVersion ( cabalSpecToVersionDigits )
+import qualified Distribution.Compat.NonEmptySet as NES
 import           Distribution.Compiler
                    ( CompilerFlavor (..), PerCompilerFlavor (..) )
 import           Distribution.Package ( mkPackageName )
@@ -126,6 +127,7 @@ packageFromPackageDescription packageConfig pkgFlags (PackageDescriptionPair pkg
   , packageDefaultFlags = M.fromList
     [(flagName flag, flagDefault flag) | flag <- pkgFlags]
   , packageAllDeps = M.keysSet deps
+  , packageSubLibDeps = subLibDeps
   , packageLibraries =
       let mlib = do
             lib <- library pkg
@@ -244,10 +246,19 @@ packageFromPackageDescription packageConfig pkgFlags (PackageDescriptionPair pkg
     , asLibrary <$> fromMaybe M.empty msetupDeps
     , knownTools
     ])
+
   msetupDeps = fmap
     (M.fromList . map (depPkgName &&& depVerRange) . setupDepends)
     (setupBuildInfo pkg)
 
+  subLibDeps = M.fromList $ concatMap
+    (\(Dependency n vr libs) -> mapMaybe (getSubLibName n vr) (NES.toList libs))
+    (concatMap targetBuildDepends (allBuildInfo' pkg))
+
+  getSubLibName pn vr lib@(LSubLibName _) =
+    Just (MungedPackageName pn lib, asLibrary vr)
+  getSubLibName _ _ _ = Nothing
+
   asLibrary range = DepValue
     { dvVersionRange = range
     , dvType = AsLibrary

src/Stack/Types/Build.hs

@@ -58,10 +58,14 @@ import           Database.Persist.Sql
                    ( PersistField (..), PersistFieldSql (..)
                    , PersistValue (PersistText), SqlType (SqlString)
                    )
-import           Distribution.PackageDescription
-                   ( TestSuiteInterface, mkPackageName )
 import           Distribution.System ( Arch )
 import qualified Distribution.Text as C
+import           Distribution.Types.MungedPackageName
+                   ( decodeCompatPackageName )
+import           Distribution.Types.PackageName ( mkPackageName, unPackageName )
+import           Distribution.Types.TestSuiteInterface ( TestSuiteInterface )
+import           Distribution.Types.UnqualComponentName
+                   ( unUnqualComponentName )
 import qualified Distribution.Version as C
 import           Path ( parseRelDir, (</>), parent )
 import           Path.Extra ( toFilePathNoTrailingSep )
@@ -1207,14 +1211,20 @@ configureOptsNoDir econfig bco deps isLocal package = concat
   -- --exact-configuration.
   flags = packageFlags package `Map.union` packageDefaultFlags package
 
-  depOptions = map (uncurry toDepOption) $ Map.toList deps
+  depOptions = map toDepOption $ Map.toList deps
 
-  toDepOption (PackageIdentifier name _) gid = concat
+  toDepOption (PackageIdentifier name _, gid) = concat
     [ "--dependency="
-    , packageNameString name
+    , depOptionKey
     , "="
     , ghcPkgIdString gid
     ]
+   where
+    MungedPackageName subPkgName lib = decodeCompatPackageName name
+    depOptionKey = case lib of
+      LMainLibName -> unPackageName name
+      LSubLibName cn ->
+        unPackageName subPkgName <> ":" <> unUnqualComponentName cn
 
 -- | Get set of wanted package names from locals.
 wantedLocalPackages :: [LocalPackage] -> Set PackageName

src/Stack/Types/Package.hs

@@ -164,6 +164,8 @@ data Package = Package
     -- the hard-coded lookup.
   , packageAllDeps :: !(Set PackageName)
     -- ^ Original dependencies (not sieved).
+  , packageSubLibDeps :: !(Map MungedPackageName DepValue)
+    -- ^ Original sub-library dependencies (not sieved).
   , packageGhcOptions :: ![Text]
     -- ^ Ghc options used on package.
   , packageCabalConfigOpts :: ![Text]