[ghc-rpm-macros] compile Setup to help speed up builds

Jens Petersen petersen at fedoraproject.org
Fri Jan 21 00:48:28 UTC 2011


commit 0f8bb5330bdc7386071f0eadc0f788a5ab3ced9d
Author: Jens Petersen <petersen at redhat.com>
Date:   Fri Jan 21 10:48:06 2011 +1000

    compile Setup to help speed up builds

 ghc-rpm-macros.ghc  |    4 +++-
 ghc-rpm-macros.spec |    5 ++++-
 2 files changed, 7 insertions(+), 2 deletions(-)
---
diff --git a/ghc-rpm-macros.ghc b/ghc-rpm-macros.ghc
index 2386f03..046c1ed 100644
--- a/ghc-rpm-macros.ghc
+++ b/ghc-rpm-macros.ghc
@@ -1,5 +1,5 @@
 # "cabal"
-%cabal %{_bindir}/runghc Setup
+%cabal ./Setup
 
 # configure
 %cabal_configure\
@@ -199,12 +199,14 @@ find $RPM_BUILD_ROOT -type f -exec sh -c "file {} | grep -q 'dynamically linked'
 
 # ghc_bin_build
 %ghc_bin_build\
+ghc --make -dynamic Setup\
 %cabal_configure\
 %cabal build
 
 # ghc_lib_build [name] [version]
 %ghc_lib_build()\
 %{?1:cd %1-%2}\
+ghc --make -dynamic Setup\
 %cabal_configure -p %{?1:--docdir=%{_docdir}/ghc-%1-%2 --htmldir=%{ghcdocbasedir}/libraries/%1-%2}\
 %cabal build\
 %cabal haddock %{!?without_hscolour:--hyperlink-source}\
diff --git a/ghc-rpm-macros.spec b/ghc-rpm-macros.spec
index 5f91ba7..aed83f7 100644
--- a/ghc-rpm-macros.spec
+++ b/ghc-rpm-macros.spec
@@ -1,5 +1,5 @@
 Name:		ghc-rpm-macros
-Version:	0.11.2
+Version:	0.11.3
 Release:	1%{?dist}
 Summary:	Macros for building packages for GHC
 
@@ -47,6 +47,9 @@ install -p %{SOURCE3} ${RPM_BUILD_ROOT}/%{_prefix}/lib/rpm
 
 
 %changelog
+* Fri Jan 21 2011 Jens Petersen <petersen at redhat.com> - 0.11.3-1
+- compile Setup to help speed up builds
+
 * Thu Jan 20 2011 Jens Petersen <petersen at redhat.com> - 0.11.2-1
 - put docdir (license) also into shared lib subpackage
 - add ghc_binlib_package option to exclude package from ghc_packages_list


More information about the scm-commits mailing list