Accepting request 233496 from devel:languages:haskell

- Enable ppc64le (ghc-ppc64le.patch) (forwarded request 233472 from k0da)

OBS-URL: https://build.opensuse.org/request/show/233496
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/ghc?expand=0&rev=15
This commit is contained in:
Stephan Kulow 2014-05-13 18:43:57 +00:00 committed by Git OBS Bridge
commit d925a6d64d
3 changed files with 46 additions and 3 deletions

36
ghc-ppc64le.patch Normal file
View File

@ -0,0 +1,36 @@
Index: ghc-7.6.3/aclocal.m4
===================================================================
--- ghc-7.6.3.orig/aclocal.m4
+++ ghc-7.6.3/aclocal.m4
@@ -173,7 +173,7 @@ AC_DEFUN([FPTOOLS_SET_HASKELL_PLATFORM_V
GET_ARM_ISA()
test -z "[$]2" || eval "[$]2=\"ArchARM {armISA = \$ARM_ISA, armISAExt = \$ARM_ISA_EXT, armABI = \$ARM_ABI}\""
;;
- alpha|mips|mipseb|mipsel|hppa|hppa1_1|ia64|m68k|rs6000|s390|s390x|sparc64|vax)
+ alpha|mips|mipseb|mipsel|hppa|hppa1_1|ia64|m68k|powerpc64le|rs6000|s390|s390x|sparc64|vax)
test -z "[$]2" || eval "[$]2=ArchUnknown"
;;
*)
@@ -1883,6 +1883,9 @@ case "$1" in
mips*)
$2="mips"
;;
+ powerpc64le*)
+ $2="powerpc64le"
+ ;;
powerpc64*)
$2="powerpc64"
;;
Index: ghc-7.6.3/includes/Stg.h
===================================================================
--- ghc-7.6.3.orig/includes/Stg.h
+++ ghc-7.6.3/includes/Stg.h
@@ -213,7 +213,7 @@ typedef StgFunPtr F_;
#define II_(X) static StgWordArray (X) GNU_ATTRIBUTE(aligned (8))
#define IF_(f) static StgFunPtr GNUC3_ATTRIBUTE(used) f(void)
#define FN_(f) StgFunPtr f(void)
-#define EF_(f) extern StgFunPtr f(void)
+#define EF_(f) extern StgFunPtr f()
/* -----------------------------------------------------------------------------
Tail calls

View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Sat May 10 19:30:44 UTC 2014 - dvaleev@suse.com
- Enable ppc64le (ghc-ppc64le.patch)
------------------------------------------------------------------- -------------------------------------------------------------------
Mon Dec 16 15:03:42 UTC 2013 - peter.trommler@ohm-hochschule.de Mon Dec 16 15:03:42 UTC 2013 - peter.trommler@ohm-hochschule.de

View File

@ -1,7 +1,7 @@
# #
# spec file for package ghc # spec file for package ghc
# #
# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. # Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
# #
# All modifications and additions to the file contributed by third parties # All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed # remain the property of their copyright owners, unless otherwise agreed
@ -16,7 +16,7 @@
# #
%global unregisterised_archs ppc64 s390 s390s %global unregisterised_archs ppc64 ppc64le s390 s390s
%ifarch %{unregisterised_archs} %ifarch %{unregisterised_archs}
%global ghc_without_shared 1 %global ghc_without_shared 1
@ -29,7 +29,7 @@ Url: http://haskell.org/ghc/dist/%{version}/%{name}-%{version}-src.ta
Summary: The Glorious Glasgow Haskell Compiler Summary: The Glorious Glasgow Haskell Compiler
License: BSD-3-Clause License: BSD-3-Clause
Group: Development/Languages/Other Group: Development/Languages/Other
ExclusiveArch: %{ix86} x86_64 ppc ppc64 ExclusiveArch: %{ix86} x86_64 ppc ppc64 ppc64le
BuildRequires: ghc-bytestring-devel BuildRequires: ghc-bytestring-devel
BuildRequires: ghc-compiler >= 7.0 BuildRequires: ghc-compiler >= 7.0
@ -109,6 +109,7 @@ Patch7: ghc-fix-infinite-loop-big-endian.patch
Patch8: llvm-powerpc64-datalayout.patch Patch8: llvm-powerpc64-datalayout.patch
# PATCH-FIX-OPENSUSE peter.trommler@ohm-hochschule.de - Remove versions in library docdirs. Required for compatibility with ghc-rpm-macros 1.0 and up. Can be removed once we move to ghc 7.8.x. Fedora patch 16. # PATCH-FIX-OPENSUSE peter.trommler@ohm-hochschule.de - Remove versions in library docdirs. Required for compatibility with ghc-rpm-macros 1.0 and up. Can be removed once we move to ghc 7.8.x. Fedora patch 16.
Patch9: ghc-cabal-unversion-docdir.patch Patch9: ghc-cabal-unversion-docdir.patch
Patch10: ghc-ppc64le.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRoot: %{_tmppath}/%{name}-%{version}-build
@ -212,6 +213,7 @@ rm -r ghc-tarballs/libffi
%patch7 -p1 %patch7 -p1
%patch8 -p1 %patch8 -p1
%patch9 -p1 %patch9 -p1
%patch10 -p1
%build %build
# required for patch and patch1 # required for patch and patch1