[pandoc] fix building on ARM (llvm) by using -O1 (#992430)

Jens Petersen petersen at fedoraproject.org
Tue May 13 10:00:11 UTC 2014


commit 1b3993adac2ca54de0c26194ddc72c5ba7d608c8
Author: Jens Petersen <petersen at redhat.com>
Date:   Tue May 13 18:59:58 2014 +0900

    fix building on ARM (llvm) by using -O1 (#992430)
    
    This is a known problem with ghc-7.6 -O2 with llvm.
    Should be fixed with ghc-7.8.
    Might be better actually to using -O1 only on ARM for now?

 pandoc.spec |   11 +++++++++--
 1 files changed, 9 insertions(+), 2 deletions(-)
---
diff --git a/pandoc.spec b/pandoc.spec
index 7080d9a..ad33de0 100644
--- a/pandoc.spec
+++ b/pandoc.spec
@@ -4,7 +4,7 @@
 
 Name:           %{pkg_name}
 Version:        1.12.3.3
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Conversion between markup formats
 
 License:        GPLv2+
@@ -54,7 +54,6 @@ BuildRequires:  ghc-zip-archive-devel
 BuildRequires:  ghc-zlib-devel
 BuildRequires:  happy
 # End cabal-rpm deps
-ExcludeArch:    armv7hl
 
 %description
 Pandoc is a Haskell library for converting from one markup format to another,
@@ -114,6 +113,11 @@ cabal-tweak-flag http-conduit False
 
 
 %build
+# llvm opt hangs on Pretty with -O2 with ghc-7.6! (#992430)
+# remove for ghc-7.8
+%ifarch armv7hl
+cabal_configure_extra_options=--ghc-option="-O1"
+%endif
 %ghc_lib_build
 
 
@@ -155,6 +159,9 @@ ln -s pandoc %{buildroot}%{_bindir}/hsmarkdown
 
 
 %changelog
+* Tue May 13 2014 Jens Petersen <petersen at redhat.com> - 1.12.3.3-2
+- fix building on ARM (llvm) by using -O1 (#992430)
+
 * Thu May 08 2014 Jens Petersen <petersen at redhat.com> - 1.12.3.3-1
 - update to 1.12.3.3
 


More information about the scm-commits mailing list