From 598d79517044b1bf07a2bc0e2af6110f5dfd7274 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Tue, 22 May 2012 19:37:16 +0900 Subject: [PATCH] revert dropping ppc64 and instead don't build .o file for ghci for ppc64 --- ghc-xmonad-contrib.spec | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/ghc-xmonad-contrib.spec b/ghc-xmonad-contrib.spec index c29dc80..6ae48b3 100644 --- a/ghc-xmonad-contrib.spec +++ b/ghc-xmonad-contrib.spec @@ -19,7 +19,7 @@ your own extensions. Name: ghc-%{pkg_name} Version: 0.10 -Release: 4.1%{?dist} +Release: 4.2%{?dist} Summary: %{common_summary} Group: System Environment/Libraries @@ -28,7 +28,6 @@ License: BSD URL: http://hackage.haskell.org/package/%{pkg_name} Source0: http://hackage.haskell.org/packages/archive/%{pkg_name}/%{version}/%{pkg_name}-%{version}.tar.gz ExclusiveArch: %{ghc_arches} -ExcludeArch: ppc64 BuildRequires: ghc-Cabal-devel BuildRequires: ghc-rpm-macros %{!?without_hscolour:hscolour} # END cabal2spec @@ -61,7 +60,10 @@ Patch3: xmonad-contrib-0.10-BorderResize-smaller.patch %build -%define cabal_configure_options -f use_xft +%ifarch ppc64 +%define disable_ghci --disable-library-for-ghci +%endif +%define cabal_configure_options -f use_xft %{?disable_ghci} %ghc_lib_build @@ -82,9 +84,8 @@ Patch3: xmonad-contrib-0.10-BorderResize-smaller.patch %changelog -* Mon May 21 2012 Jens Petersen - 0.10-4.1 -- exclude ppc64 since linking fails with - "/usr/bin/ld: TOC section size exceeds 64k" +* Mon May 21 2012 Jens Petersen - 0.10-4.2 +- skip building the ghci .o file for ppc64 * Fri Mar 23 2012 Jens Petersen - 0.10-4 - add license to ghc_files