revert dropping ppc64 and instead don't build .o file for ghci for ppc64

This commit is contained in:
Jens Petersen 2012-05-22 19:37:16 +09:00
parent f5c5c1ad7d
commit 598d795170

View File

@ -19,7 +19,7 @@ your own extensions.
Name: ghc-%{pkg_name} Name: ghc-%{pkg_name}
Version: 0.10 Version: 0.10
Release: 4.1%{?dist} Release: 4.2%{?dist}
Summary: %{common_summary} Summary: %{common_summary}
Group: System Environment/Libraries Group: System Environment/Libraries
@ -28,7 +28,6 @@ License: BSD
URL: http://hackage.haskell.org/package/%{pkg_name} URL: http://hackage.haskell.org/package/%{pkg_name}
Source0: http://hackage.haskell.org/packages/archive/%{pkg_name}/%{version}/%{pkg_name}-%{version}.tar.gz Source0: http://hackage.haskell.org/packages/archive/%{pkg_name}/%{version}/%{pkg_name}-%{version}.tar.gz
ExclusiveArch: %{ghc_arches} ExclusiveArch: %{ghc_arches}
ExcludeArch: ppc64
BuildRequires: ghc-Cabal-devel BuildRequires: ghc-Cabal-devel
BuildRequires: ghc-rpm-macros %{!?without_hscolour:hscolour} BuildRequires: ghc-rpm-macros %{!?without_hscolour:hscolour}
# END cabal2spec # END cabal2spec
@ -61,7 +60,10 @@ Patch3: xmonad-contrib-0.10-BorderResize-smaller.patch
%build %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 %ghc_lib_build
@ -82,9 +84,8 @@ Patch3: xmonad-contrib-0.10-BorderResize-smaller.patch
%changelog %changelog
* Mon May 21 2012 Jens Petersen <petersen@redhat.com> - 0.10-4.1 * Mon May 21 2012 Jens Petersen <petersen@redhat.com> - 0.10-4.2
- exclude ppc64 since linking fails with - skip building the ghci .o file for ppc64
"/usr/bin/ld: TOC section size exceeds 64k"
* Fri Mar 23 2012 Jens Petersen <petersen@redhat.com> - 0.10-4 * Fri Mar 23 2012 Jens Petersen <petersen@redhat.com> - 0.10-4
- add license to ghc_files - add license to ghc_files