diff options
| author | Matthew Pickering <matthewtpickering@gmail.com> | 2021-07-06 17:37:10 +0100 |
|---|---|---|
| committer | Zubin Duggal <zubin.duggal@gmail.com> | 2021-08-04 18:25:25 +0530 |
| commit | 0008a30385a2dcaf01d9b3c0da450c5278defbc6 (patch) | |
| tree | bb28494a63b01f5b7c33a3c7159232171f95427d | |
| parent | f8efc263afdb8d7b2fb2f842d833745f0247e800 (diff) | |
| download | haskell-0008a30385a2dcaf01d9b3c0da450c5278defbc6.tar.gz | |
packaging: Give ghc-pkg the same version as ProjectVersion
(cherry picked from commit e4c252619ebb0b10db9061b052ddce6f8f2b5c72)
| -rw-r--r-- | .gitignore | 1 | ||||
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | hadrian/src/Rules/Configure.hs | 2 | ||||
| -rw-r--r-- | utils/ghc-pkg/ghc-pkg.cabal.in (renamed from utils/ghc-pkg/ghc-pkg.cabal) | 2 |
4 files changed, 4 insertions, 3 deletions
diff --git a/.gitignore b/.gitignore index 14c7815ea8..21e34b1857 100644 --- a/.gitignore +++ b/.gitignore @@ -189,6 +189,7 @@ _darcs/ /utils/mkUserGuidePart/mkUserGuidePart.cabal /utils/runghc/runghc.cabal /utils/gen-dll/gen-dll.cabal +/utils/ghc-pkg/ghc-pkg.cabal utils/lndir/fs.* utils/unlit/fs.* rts/fs.* diff --git a/configure.ac b/configure.ac index 04c9c972b8..50b7edb453 100644 --- a/configure.ac +++ b/configure.ac @@ -1500,7 +1500,7 @@ checkMake380() { checkMake380 make checkMake380 gmake -AC_CONFIG_FILES([mk/config.mk mk/install.mk mk/project.mk rts/rts.cabal compiler/ghc.cabal ghc/ghc-bin.cabal utils/iserv/iserv.cabal utils/iserv-proxy/iserv-proxy.cabal utils/remote-iserv/remote-iserv.cabal utils/runghc/runghc.cabal utils/gen-dll/gen-dll.cabal libraries/ghc-boot/ghc-boot.cabal libraries/ghc-boot-th/ghc-boot-th.cabal libraries/ghci/ghci.cabal libraries/ghc-heap/ghc-heap.cabal libraries/libiserv/libiserv.cabal libraries/template-haskell/template-haskell.cabal docs/users_guide/ghc_config.py docs/index.html libraries/prologue.txt distrib/configure.ac]) +AC_CONFIG_FILES([mk/config.mk mk/install.mk mk/project.mk rts/rts.cabal compiler/ghc.cabal ghc/ghc-bin.cabal utils/iserv/iserv.cabal utils/iserv-proxy/iserv-proxy.cabal utils/ghc-pkg/ghc-pkg.cabal utils/remote-iserv/remote-iserv.cabal utils/runghc/runghc.cabal utils/gen-dll/gen-dll.cabal libraries/ghc-boot/ghc-boot.cabal libraries/ghc-boot-th/ghc-boot-th.cabal libraries/ghci/ghci.cabal libraries/ghc-heap/ghc-heap.cabal libraries/libiserv/libiserv.cabal libraries/template-haskell/template-haskell.cabal docs/users_guide/ghc_config.py docs/index.html libraries/prologue.txt distrib/configure.ac]) AC_OUTPUT [ if test "$print_make_warning" = "true"; then diff --git a/hadrian/src/Rules/Configure.hs b/hadrian/src/Rules/Configure.hs index 931801be5d..258bd40a7d 100644 --- a/hadrian/src/Rules/Configure.hs +++ b/hadrian/src/Rules/Configure.hs @@ -14,7 +14,7 @@ import qualified System.Info.Extra as System -- | Files generated by running the @configure@ script. configureResults :: [FilePath] configureResults = - [ configFile, configH, "compiler/ghc.cabal", "rts/rts.cabal"] + [ configFile, configH, "compiler/ghc.cabal", "rts/rts.cabal", "utils/ghc-pkg/ghc-pkg.cabal"] configureRules :: Rules () configureRules = do diff --git a/utils/ghc-pkg/ghc-pkg.cabal b/utils/ghc-pkg/ghc-pkg.cabal.in index 13f47c0c3e..d299c98372 100644 --- a/utils/ghc-pkg/ghc-pkg.cabal +++ b/utils/ghc-pkg/ghc-pkg.cabal.in @@ -1,6 +1,6 @@ Name: ghc-pkg -- XXX Version number -Version: 6.9 +Version: @ProjectVersion@ Copyright: XXX License: BSD3 -- XXX License-File: LICENSE |