From f41a8a369796985a75dd618b969292e1e7033112 Mon Sep 17 00:00:00 2001 From: Duncan Coutts Date: Fri, 21 Oct 2016 14:32:02 -0700 Subject: Add and use a new dynamic-library-dirs field in the ghc-pkg info Summary: Build systems / package managers want to be able to control the file layout of installed libraries. In general they may want/need to be able to put the static libraries and dynamic libraries in different places. The ghc-pkg library regisrtation needs to be able to handle this. This is already possible in principle by listing both a static lib dir and a dynamic lib dir in the library-dirs field (indeed some previous versions of Cabal did this for shared libs on ELF platforms). The downside of listing both dirs is twofold. There is a lack of precision, if we're not careful with naming then we could end up picking up the wrong library. The more immediate problem however is that if we list both directories then both directories get included into the ELF and Mach-O shared object runtime search paths. On ELF this merely slows down loading of shared libs (affecting prog startup time). On the latest OSX versions this provokes a much more serious problem: that there is a rather low limit on the total size of the section containing the runtime search path (and lib names and related) and thus listing any unnecessary directories wastes the limited space. So the solution in this patch is fairly straightforward: split the static and dynamic library search paths in the ghc-pkg db and its use within ghc. This is a traditional solution: pkg-config has the same static / dynamic split (though it describes in in terms of private and public, but it translates into different behaviour for static and dynamic linking). Indeed it would make perfect sense to also have a static/dynamic split for the list of the libraries to use i.e. to have dynamic variants of the hs-libraries and extra-libraries fields. These are not immediately required so this patch does not add it, but it is a reasonable direction to follow. To handle compatibility, if the new dynamic-library-dirs field is not specified then its value is taken from the library-dirs field. Contains Cabal submodule update. Test Plan: Run ./validate Get christiaanb and carter to test it on OSX Sierra, in combination with Cabal/cabal-install changes to the default file layout for libraries. Reviewers: carter, austin, hvr, christiaanb, bgamari Reviewed By: christiaanb, bgamari Subscribers: ezyang, Phyx, thomie Differential Revision: https://phabricator.haskell.org/D2611 GHC Trac Issues: #12479 --- libraries/ghc-boot/GHC/PackageDb.hs | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) (limited to 'libraries/ghc-boot') diff --git a/libraries/ghc-boot/GHC/PackageDb.hs b/libraries/ghc-boot/GHC/PackageDb.hs index f0333d4333..09991092ee 100644 --- a/libraries/ghc-boot/GHC/PackageDb.hs +++ b/libraries/ghc-boot/GHC/PackageDb.hs @@ -83,6 +83,7 @@ data InstalledPackageInfo compid srcpkgid srcpkgname instunitid unitid modulenam extraLibraries :: [String], extraGHCiLibraries :: [String], libraryDirs :: [FilePath], + libraryDynDirs :: [FilePath], frameworks :: [String], frameworkDirs :: [FilePath], ldOptions :: [String], @@ -163,6 +164,7 @@ emptyInstalledPackageInfo = extraLibraries = [], extraGHCiLibraries = [], libraryDirs = [], + libraryDynDirs = [], frameworks = [], frameworkDirs = [], ldOptions = [], @@ -306,7 +308,8 @@ instance (RepInstalledPackageInfo a b c d e f g) => unitId componentId instantiatedWith sourcePackageId packageName packageVersion abiHash depends importDirs - hsLibraries extraLibraries extraGHCiLibraries libraryDirs + hsLibraries extraLibraries extraGHCiLibraries + libraryDirs libraryDynDirs frameworks frameworkDirs ldOptions ccOptions includes includeDirs @@ -327,6 +330,7 @@ instance (RepInstalledPackageInfo a b c d e f g) => put extraLibraries put extraGHCiLibraries put libraryDirs + put libraryDynDirs put frameworks put frameworkDirs put ldOptions @@ -356,6 +360,7 @@ instance (RepInstalledPackageInfo a b c d e f g) => extraLibraries <- get extraGHCiLibraries <- get libraryDirs <- get + libraryDynDirs <- get frameworks <- get frameworkDirs <- get ldOptions <- get @@ -379,7 +384,8 @@ instance (RepInstalledPackageInfo a b c d e f g) => abiHash (map fromStringRep depends) importDirs - hsLibraries extraLibraries extraGHCiLibraries libraryDirs + hsLibraries extraLibraries extraGHCiLibraries + libraryDirs libraryDynDirs frameworks frameworkDirs ldOptions ccOptions includes includeDirs -- cgit v1.2.1