rpms/ghc-rpm-macros
6
0
Fork 0
Code Issues Pull Requests Releases Activity

ghc-deps.sh: fix the rts deps erasure cleanly

Browse Source 
was breaking ghc-ghci-devel deps:
ghc*-devel(ghc-heap-8.10.7template-haskell-2.16.0.0)
for non-Hadrian
This commit is contained in:
Jens Petersen 2022-01-05 14:48:09 +08:00
parent 6a30ca822b
commit bff7a5f6ac
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ghc-deps.sh
View File

@ -36,7 +36,7 @@ for i in $files; do
# exclude rts.conf # exclude rts.conf
$PKGCONFDIR/*-*.conf) $PKGCONFDIR/*-*.conf)
name=$(grep "^name: " $i | sed -e "s/name: //") name=$(grep "^name: " $i | sed -e "s/name: //")
ids=$($GHC_PKG field $name $field | sed -e "s/ rts[^-]//") ids=$($GHC_PKG field $name $field | sed -e "s/ rts / /")
for d in $ids; do for d in $ids; do
case $d in case $d in
*-*-internal) ;; *-*-internal) ;;
@ -47,7 +47,7 @@ for i in $files; do
;; ;;
*/libHS*_p.a) */libHS*_p.a)
pkgver=$(basename $(dirname $i)) pkgver=$(basename $(dirname $i))
ids=$($GHC_PKG field $pkgver $field | sed -e "s/ rts\b//" -e "s/bin-package-db-[^ ]\+//") ids=$($GHC_PKG field $pkgver $field | sed -e "s/ rts / /" -e "s/bin-package-db-[^ ]\+//")
for d in $ids; do for d in $ids; do
case $d in case $d in
*-*-internal) ;; *-*-internal) ;;

5
ghc-rpm-macros.spec
View File

@ -7,7 +7,7 @@
%endif %endif
Name: ghc-rpm-macros Name: ghc-rpm-macros
Version: 2.3.10 Version: 2.3.11
Release: 1%{?dist} Release: 1%{?dist}
Summary: RPM macros for building Haskell packages for GHC Summary: RPM macros for building Haskell packages for GHC
@ -184,6 +184,9 @@ EOF
%changelog %changelog
* Wed Jan 5 2022 Jens Petersen <petersen@redhat.com> - 2.3.11-1
- ghc-deps.sh: fix the rts deps erasure cleanly
* Wed Dec 29 2021 Jens Petersen <petersen@redhat.com> - 2.3.10-1 * Wed Dec 29 2021 Jens Petersen <petersen@redhat.com> - 2.3.10-1
- ghc_html_dir: use ghc_name for ghcX.Y docs - ghc_html_dir: use ghc_name for ghcX.Y docs