From bff7a5f6ac9f2ccf18a48610370d0e29b9141a1a Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Wed, 5 Jan 2022 14:48:09 +0800 Subject: [PATCH] ghc-deps.sh: fix the rts deps erasure cleanly was breaking ghc-ghci-devel deps: ghc*-devel(ghc-heap-8.10.7template-haskell-2.16.0.0) for non-Hadrian --- ghc-deps.sh | 4 ++-- ghc-rpm-macros.spec | 5 ++++- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/ghc-deps.sh b/ghc-deps.sh index ffd0d10..0f215fe 100755 --- a/ghc-deps.sh +++ b/ghc-deps.sh @@ -36,7 +36,7 @@ for i in $files; do # exclude rts.conf $PKGCONFDIR/*-*.conf) 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 case $d in *-*-internal) ;; @@ -47,7 +47,7 @@ for i in $files; do ;; */libHS*_p.a) 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 case $d in *-*-internal) ;; diff --git a/ghc-rpm-macros.spec b/ghc-rpm-macros.spec index ce65fbc..5e99c53 100644 --- a/ghc-rpm-macros.spec +++ b/ghc-rpm-macros.spec @@ -7,7 +7,7 @@ %endif Name: ghc-rpm-macros -Version: 2.3.10 +Version: 2.3.11 Release: 1%{?dist} Summary: RPM macros for building Haskell packages for GHC @@ -184,6 +184,9 @@ EOF %changelog +* Wed Jan 5 2022 Jens Petersen - 2.3.11-1 +- ghc-deps.sh: fix the rts deps erasure cleanly + * Wed Dec 29 2021 Jens Petersen - 2.3.10-1 - ghc_html_dir: use ghc_name for ghcX.Y docs