From 6d69503ff37cabe2fc084f9c088bb776ccb06cb4 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Wed, 15 Feb 2023 22:51:49 +0800 Subject: [PATCH] ghc-dep.sh: check for *_p.a under Hadrian platform subdir as well --- ghc-deps.sh | 2 +- ghc-rpm-macros.spec | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/ghc-deps.sh b/ghc-deps.sh index 57390e0..7e5cd6f 100755 --- a/ghc-deps.sh +++ b/ghc-deps.sh @@ -57,7 +57,7 @@ for i in $files; do echo "$GHCPREFIX-prof($d)" ;; *) - if [ -f "$PKGBASELIB"/*/libHS"${d}"_p.a ] || [ -f "$BUILDROOT$PKGBASELIB"/*/libHS"${d}"_p.a ]; then + if [ -f "$PKGBASELIB"/*/libHS"${d}"_p.a -o -f "$BUILDROOT$PKGBASELIB"/*/libHS"${d}"_p.a -o -f "$PKGBASELIB"/*/*/libHS"${d}"_p.a -o -f "$BUILDROOT$PKGBASELIB"/*/*/libHS"${d}"_p.a ]; then echo "$GHCPREFIX-prof($d)" fi ;; diff --git a/ghc-rpm-macros.spec b/ghc-rpm-macros.spec index 214938b..a076259 100644 --- a/ghc-rpm-macros.spec +++ b/ghc-rpm-macros.spec @@ -7,7 +7,7 @@ %endif Name: ghc-rpm-macros -Version: 2.5.1 +Version: 2.5.2 Release: 1%{?dist} Summary: RPM macros for building Haskell packages for GHC @@ -190,6 +190,9 @@ mkdir -p %{buildroot}%{_docdir}/ghc/html/libraries %changelog +* Wed Feb 15 2023 Jens Petersen - 2.5.2-1 +- ghc-dep.sh: check for *_p.a under Hadrian platform subdir as well + * Sat Feb 11 2023 Jens Petersen - 2.5.1-1 - add ghc_merge_filelist