From b344bafe9da49c5f52ba1adfd55e38fcee008cd3 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Tue, 27 Feb 2024 13:07:58 +0800 Subject: [PATCH] fixup %cabal_configure: print package build header --- ghc-rpm-macros.spec | 5 ++++- macros.ghc | 7 ++++--- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/ghc-rpm-macros.spec b/ghc-rpm-macros.spec index 3b5a588..728f056 100644 --- a/ghc-rpm-macros.spec +++ b/ghc-rpm-macros.spec @@ -7,7 +7,7 @@ %endif Name: ghc-rpm-macros -Version: 2.6.7 +Version: 2.6.7.1 Release: 1%{?dist} Summary: RPM macros for building Haskell packages for GHC @@ -201,6 +201,9 @@ mkdir -p %{buildroot}%{_docdir}/ghc/html/libraries %changelog +* Tue Feb 27 2024 Jens Petersen - 2.6.7.1-1 +- fixup cabal_configure: when subpackaging print subpackage header + * Tue Feb 27 2024 Jens Petersen - 2.6.7-1 - fix no-prof subpackage to undefine with_ghc_prof properly - cabal_configure: when subpackaging print subpackage header diff --git a/macros.ghc b/macros.ghc index 2cd5398..f5ee4ae 100644 --- a/macros.ghc +++ b/macros.ghc @@ -93,9 +93,10 @@ export LDFLAGS="${LDFLAGS:-%{?__global_ldflags}}"\ # configure %cabal_configure\ -%if %{defined 1}\ -echo ==== Building %{1}%{?2:-%2} ====\ -%endif\ +%define pkgname %{?1}%{!?1:%{pkg_name}}\ +%define pkgver %{?2}%{!?2:%{version}}\ +%define pkgnamever %{pkgname}-%{pkgver}\ +echo -e "\\n==== Build %{pkgnamever} ===="\ %ghc_set_gcc_flags\ if ! [ -f Setup.hs -o -f Setup.lhs ]; then\ # datadir hardcoded for flatpaks\