diff --git a/ghc-rpm-macros.spec b/ghc-rpm-macros.spec index f0162fc..efaba1e 100644 --- a/ghc-rpm-macros.spec +++ b/ghc-rpm-macros.spec @@ -6,7 +6,7 @@ #%%global without_hscolour 1 Name: ghc-rpm-macros -Version: 1.3.3 +Version: 1.3.4 Release: 1%{?dist} Summary: RPM macros for building packages for GHC @@ -93,6 +93,9 @@ EOF %changelog +* Thu Aug 28 2014 Jens Petersen - 1.3.4-1 +- drop -O2 for ghc-7.8: it uses too much build mem + * Fri Aug 22 2014 Jens Petersen - 1.3.3-1 - temporarily revert to ghc-7.6 config for shared libs until we move to ghc-7.8 diff --git a/macros.ghc b/macros.ghc index 2420624..d45ce18 100644 --- a/macros.ghc +++ b/macros.ghc @@ -21,7 +21,7 @@ fi # configure %cabal_configure\ %ghc_check_bootstrap\ -%cabal configure --prefix=%{_prefix} --libdir=%{_libdir} --docdir=%{?_pkgdocdir}%{!?_pkgdocdir:%{_docdir}/%{name}-%{version}} --libsubdir='$compiler/$pkgid' --datasubdir='$pkgid' --ghc %{!?ghc_without_dynamic:--enable-executable-dynamic} --ghc-option=-O2 %{?with_tests:--enable-tests} %{?cabal_configure_options} $cabal_configure_extra_options +%cabal configure --prefix=%{_prefix} --libdir=%{_libdir} --docdir=%{?_pkgdocdir}%{!?_pkgdocdir:%{_docdir}/%{name}-%{version}} --libsubdir='$compiler/$pkgid' --datasubdir='$pkgid' --ghc %{!?ghc_without_dynamic:--enable-executable-dynamic} %{?with_tests:--enable-tests} %{?cabal_configure_options} $cabal_configure_extra_options # install %cabal_install %cabal copy --destdir=%{buildroot} -v