[ghc-rpm-macros] use ghc system config when compiling Setup; don't setup hscolour if without_hscolour
Jens Petersen
petersen at fedoraproject.org
Fri Dec 2 13:20:21 UTC 2011
commit 72e5db37b55a972d0e06f4e682fbe8b19ade3281
Author: Jens Petersen <petersen at redhat.com>
Date: Fri Dec 2 22:20:12 2011 +0900
use ghc system config when compiling Setup; don't setup hscolour if without_hscolour
ghc-rpm-macros.ghc | 4 ++--
ghc-rpm-macros.spec | 8 ++++++--
2 files changed, 8 insertions(+), 4 deletions(-)
---
diff --git a/ghc-rpm-macros.ghc b/ghc-rpm-macros.ghc
index f13bc63..6fff5ed 100644
--- a/ghc-rpm-macros.ghc
+++ b/ghc-rpm-macros.ghc
@@ -2,7 +2,7 @@
# see https://fedoraproject.org/wiki/PackagingDrafts/Haskell for more details
# "cabal"
-%cabal [ -x Setup ] || ghc --make %{!?ghc_without_shared:%{!?ghc_without_dynamic:-dynamic}} Setup\
+%cabal [ -x Setup ] || ghc --make %{!?ghc_user_conf:-no-user-package-conf} %{!?ghc_without_shared:%{!?ghc_without_dynamic:-dynamic}} Setup\
./Setup
# check ghc version was rebuilt against self
@@ -184,7 +184,7 @@ find %{buildroot} -type f -exec sh -c "file {} | grep -q 'dynamically linked'" \
%cabal_configure %{!?without_prof:-p} %{?1:--docdir=%{_docdir}/ghc-%1-%2 --htmldir=%{ghclibdocdir}/%1-%2}\
%cabal build\
%if %{undefined without_haddock}\
-%cabal haddock $(if [ -x %{_bindir}/HsColour ]; then echo --hyperlink-source; fi)\
+%cabal haddock %{!?without_hscolour:%(if [ -x %{_bindir}/HsColour ]; then echo --hyperlink-source; fi)}\
%endif\
%{?1:cd -}\
%{nil}
diff --git a/ghc-rpm-macros.spec b/ghc-rpm-macros.spec
index 0220290..ee7c75e 100644
--- a/ghc-rpm-macros.spec
+++ b/ghc-rpm-macros.spec
@@ -3,7 +3,7 @@
%global macros_file %{_sysconfdir}/rpm/macros.ghc
Name: ghc-rpm-macros
-Version: 0.14.2
+Version: 0.14.3
Release: 1%{?dist}
Summary: Macros for building packages for GHC
@@ -59,9 +59,13 @@ EOF
%changelog
+* Fri Dec 2 2011 Jens Petersen <petersen at redhat.com> - 0.14.3-1
+- do not use ghc user config by default when compiling Setup
+- do not setup hscolour if without_hscolour defined
+
* Thu Nov 17 2011 Jens Petersen <petersen at redhat.com> - 0.14.2-1
- test for HsColour directly when running "cabal haddock" instead of
- checking for without_haddock
+ check hscolour is available (reported by Giam Teck Choon, #753833)
* Sat Nov 12 2011 Jens Petersen <petersen at redhat.com> - 0.14.1-1
- fix double listing of docdir in base lib package
More information about the scm-commits
mailing list