ghc-pkg < 8 only accepts pkg-ver not pkg-ver-id_hash

This commit is contained in:
Jens Petersen 2017-03-26 20:12:10 +09:00
parent c17dd21b04
commit 7855aaa8f1
2 changed files with 7 additions and 1 deletions

View File

@ -17,13 +17,18 @@ case $mode in
*) echo "`basename $0`: Need --provides or --requires" ; exit 1
esac
ghc_ver=$(basename $pkgbasedir | sed -e s/ghc-//)
files=$(cat)
for i in $files; do
case $i in
# exclude builtin_rts.conf
$pkgconfdir/*-*.conf)
id=$(grep "id: " $i | sed -e "s/id: //")
case $ghc_ver in
8.*) id=$(grep "id: " $i | sed -e "s/id: //") ;;
*) id=$(echo $i | sed -e "s%$pkgconfdir/%%" -e "s%.conf%%") ;;
esac
ids=$($ghc_pkg field $id $field | sed -e "s/rts//" -e "s/bin-package-db-[^ ]\+//")
for d in $ids; do

View File

@ -161,6 +161,7 @@ EOF
* Fri Mar 24 2017 Jens Petersen <petersen@redhat.com> - 1.6.19-1
- fix haddock generation
- cabal_configure now outputs Cabal version
- fix ghc-deps.sh for ghc-pkg < 8 which does not accept pkg id
* Thu Mar 16 2017 Jens Petersen <petersen@redhat.com> - 1.6.18-3
- condition obsoletes on fedora version