From 26005406d30c153143caa7cbf721d82c84e2610e Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Fri, 11 Feb 2011 01:50:04 +1000 Subject: [PATCH] revert setting without_shared and without_dynamic on secondary archs --- ghc-rpm-macros.ghc | 8 -------- ghc-rpm-macros.spec | 8 ++++++-- 2 files changed, 6 insertions(+), 10 deletions(-) diff --git a/ghc-rpm-macros.ghc b/ghc-rpm-macros.ghc index 88410b3..0b5bd29 100644 --- a/ghc-rpm-macros.ghc +++ b/ghc-rpm-macros.ghc @@ -201,20 +201,12 @@ find %{buildroot} -type f -exec sh -c "file {} | grep -q 'dynamically linked'" \ # ghc_bin_build %ghc_bin_build\ -%ifnarch %{ix86} x86_64\ -%global without_dynamic 1\ -%global without_shared 1\ -%endif\ %cabal_configure\ %cabal build # ghc_lib_build [name] [version] %ghc_lib_build()\ %{?1:cd %1-%2}\ -%ifnarch %{ix86} x86_64\ -%global without_dynamic 1\ -%global without_shared 1\ -%endif\ %cabal_configure %{!?without_prof:-p} %{?1:--docdir=%{_docdir}/ghc-%1-%2 --htmldir=%{ghclibdocdir}/%1-%2}\ %cabal build\ %{!?without_haddock:%cabal haddock %{!?without_hscolour:--hyperlink-source}}\ diff --git a/ghc-rpm-macros.spec b/ghc-rpm-macros.spec index 4561fdf..ac66a97 100644 --- a/ghc-rpm-macros.spec +++ b/ghc-rpm-macros.spec @@ -1,5 +1,5 @@ Name: ghc-rpm-macros -Version: 0.11.8 +Version: 0.11.9 Release: 1%{?dist} Summary: Macros for building packages for GHC @@ -47,11 +47,15 @@ install -p %{SOURCE3} ${RPM_BUILD_ROOT}/%{_prefix}/lib/rpm %changelog +* Fri Feb 11 2011 Jens Petersen - 0.11.9-1 +- revert "set without_shared and without_dynamic by default on secondary archs + in cabal_bin_build and cabal_lib_build" change, since happening for all archs + * Thu Feb 10 2011 Jens Petersen - 0.11.8-1 - only link Setup dynamically if without_shared and without_dynamic not set -- add cabal_configure_options to pass extra options to cabal_configure - set without_shared and without_dynamic by default on secondary archs in cabal_bin_build and cabal_lib_build +- add cabal_configure_options to pass extra options to cabal_configure * Thu Feb 10 2011 Jens Petersen - 0.11.7-1 - fix ghc-deps.sh for without_shared libraries