From 8ad1d461c8c9b1f050e7f36e9db221fb98ea4420 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Thu, 16 Mar 2017 11:19:44 +0900 Subject: [PATCH] exclude ghc-boot from ghc-libraries but ghc-boot-th should be there for TH --- ghc.spec | 3 ++- libraries-versions.sh | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/ghc.spec b/ghc.spec index 204140b..4ea70d0 100644 --- a/ghc.spec +++ b/ghc.spec @@ -180,7 +180,7 @@ documention. # in ghc not ghc-libraries: %ghc_lib_subpackage -d -x ghc-%{ghc_version_override} %undefine ghc_pkg_obsoletes -%ghc_lib_subpackage -d ghc-boot-%{ghc_version_override} +%ghc_lib_subpackage -d -x ghc-boot-%{ghc_version_override} %ghc_lib_subpackage -d ghc-boot-th-%{ghc_version_override} %ghc_lib_subpackage -d -x ghci-%{ghc_version_override} %ghc_lib_subpackage -d haskeline-0.7.3.0 @@ -334,6 +334,7 @@ done # ghc-base should own ghclibdir echo "%%dir %{ghclibdir}" >> ghc-base.files +%ghc_gen_filelists ghc-boot %{ghc_version_override} %ghc_gen_filelists ghc %{ghc_version_override} %ghc_gen_filelists ghci %{ghc_version_override} %ghc_gen_filelists ghc-prim 0.5.0.0 diff --git a/libraries-versions.sh b/libraries-versions.sh index 4b51e27..ff78e57 100755 --- a/libraries-versions.sh +++ b/libraries-versions.sh @@ -7,4 +7,4 @@ fi cd libraries -grep -i ^version: Cabal/Cabal/Cabal.cabal */*.cabal | grep -v -e "\(Win32\|gmp.old\|gmp2\|integer-simple\|ghc-boot\)" | sed -e "s!/.*: \+!_ver !" +grep -i ^version: Cabal/Cabal/Cabal.cabal */*.cabal | grep -v -e "\(Win32\|gmp.old\|gmp2\|integer-simple\)" | sed -e "s!/.*: \+!-!"