From 0592593f31dde684dc1945a75cb2547585ce263b Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Wed, 17 Aug 2016 19:01:03 +0900 Subject: [PATCH] drop _smp_mflags for now since it can overwhelm armv7hl --- ghc-rpm-macros.spec | 1 + macros.ghc | 6 +++--- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/ghc-rpm-macros.spec b/ghc-rpm-macros.spec index a4a7e0e..10e42cc 100644 --- a/ghc-rpm-macros.spec +++ b/ghc-rpm-macros.spec @@ -137,6 +137,7 @@ EOF %changelog * Wed Aug 17 2016 Jens Petersen - 1.6.4-1 - add ghc_sublib_build and ghc_sublib_install to ease bundling libraries +- drop _smp_mflags for now since it can overwhelm armv7hl * Sat Aug 6 2016 Jens Petersen - 1.6.3-1 - cabal_verbose from github fedora-haskell/ghc-rpm-macros diff --git a/macros.ghc b/macros.ghc index 4824db9..9e90d88 100644 --- a/macros.ghc +++ b/macros.ghc @@ -104,13 +104,13 @@ install -D --mode=0644 %{pkgnamever}.conf %{buildroot}%{ghclibdir}/package.conf. %ghc_bin_build\ %global debug_package %{nil}\ %cabal_configure\ -%cabal build %{_smp_mflags} %{?cabal_verbose} +%cabal build %{?cabal_verbose} # ghc_lib_build_without_haddock [name] [version] %ghc_lib_build_without_haddock()\ %global debug_package %{nil}\ -%cabal_configure %{!?without_prof:-p} %{!?ghc_without_shared:--enable-shared} %{?ghc_without_shared:--disable-shared} %{?pkg_name:--htmldir=%{ghclibdocdir}/%{pkg_name}-%{version}} %{?1:--docdir=%{_docdir}/ghc-%1%{!?fedora:-%2} --htmldir=%{ghclibdocdir}/%1-%2} %{!?1:--global} %{?ghc_with_lib_for_ghci:--enable-library-for-ghci}\ -%cabal build %{_smp_mflags} %{?cabal_verbose}\ +%cabal_configure %{!?without_prof:-p} %{!?ghc_without_shared:--enable-shared} %{?ghc_without_shared:--disable-shared} %{?pkg_name:--htmldir=%{ghclibdocdir}/%{pkg_name}-%{version}} %{?1:--docdir=%{_docdir}/ghc-%1%{!?fedora:-%2} --htmldir=%{ghclibdocdir}/%1-%2} %{!?1:--global} %{?1:--package-db=user} %{?ghc_with_lib_for_ghci:--enable-library-for-ghci}\ +%cabal build %{?cabal_verbose}\ %{nil} # ghc_lib_build [name] [version]