ghc-pkg < 8 only accepts pkg-ver not pkg-ver-id_hash
This commit is contained in:
parent
c17dd21b04
commit
7855aaa8f1
@ -17,13 +17,18 @@ case $mode in
|
|||||||
*) echo "`basename $0`: Need --provides or --requires" ; exit 1
|
*) echo "`basename $0`: Need --provides or --requires" ; exit 1
|
||||||
esac
|
esac
|
||||||
|
|
||||||
|
ghc_ver=$(basename $pkgbasedir | sed -e s/ghc-//)
|
||||||
|
|
||||||
files=$(cat)
|
files=$(cat)
|
||||||
|
|
||||||
for i in $files; do
|
for i in $files; do
|
||||||
case $i in
|
case $i in
|
||||||
# exclude builtin_rts.conf
|
# exclude builtin_rts.conf
|
||||||
$pkgconfdir/*-*.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-[^ ]\+//")
|
ids=$($ghc_pkg field $id $field | sed -e "s/rts//" -e "s/bin-package-db-[^ ]\+//")
|
||||||
|
|
||||||
for d in $ids; do
|
for d in $ids; do
|
||||||
|
@ -161,6 +161,7 @@ EOF
|
|||||||
* Fri Mar 24 2017 Jens Petersen <petersen@redhat.com> - 1.6.19-1
|
* Fri Mar 24 2017 Jens Petersen <petersen@redhat.com> - 1.6.19-1
|
||||||
- fix haddock generation
|
- fix haddock generation
|
||||||
- cabal_configure now outputs Cabal version
|
- 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
|
* Thu Mar 16 2017 Jens Petersen <petersen@redhat.com> - 1.6.18-3
|
||||||
- condition obsoletes on fedora version
|
- condition obsoletes on fedora version
|
||||||
|
Loading…
Reference in New Issue
Block a user