From c17dd21b04954539b3d70090bebfb3a0c1e65366 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Sun, 26 Mar 2017 19:57:33 +0900 Subject: [PATCH] %cabal_configure now outputs Cabal version --- ghc-rpm-macros.spec | 1 + macros.ghc | 1 + 2 files changed, 2 insertions(+) diff --git a/ghc-rpm-macros.spec b/ghc-rpm-macros.spec index b294212..4a91f6c 100644 --- a/ghc-rpm-macros.spec +++ b/ghc-rpm-macros.spec @@ -160,6 +160,7 @@ EOF %changelog * Fri Mar 24 2017 Jens Petersen - 1.6.19-1 - fix haddock generation +- cabal_configure now outputs Cabal version * Thu Mar 16 2017 Jens Petersen - 1.6.18-3 - condition obsoletes on fedora version diff --git a/macros.ghc b/macros.ghc index 6371042..c9be051 100644 --- a/macros.ghc +++ b/macros.ghc @@ -31,6 +31,7 @@ fi CFLAGS="${CFLAGS:-%optflags}"; export CFLAGS\ %endif\ LDFLAGS="${LDFLAGS:-%{?__global_ldflags}}"; export LDFLAGS\ +%cabal --version\ %cabal configure --prefix=%{_prefix} --libdir=%{_libdir} --docdir=%{_ghcdocdir} --libsubdir='$compiler/$pkgkey' --datasubdir='$pkgid' --ghc %{!?ghc_without_dynamic:--enable-executable-dynamic} %{?with_tests:--enable-tests} %{?ghc_subpackaging:--user}%{!?ghc_subpackaging:--global} --ghc-options="${CFLAGS:+$(echo ' '$CFLAGS | sed -e 's/ / -optc/g')} ${LDFLAGS:+$(echo ' '$LDFLAGS | sed -e 's/ / -optl/g')}" %{?cabal_configure_options} $cabal_configure_extra_options # install