rpms/pandoc
7
0
Fork 0
Code Issues Pull Requests Releases Activity

disable threaded runtime also to allow building on all secondary archs

Browse Source
This commit is contained in:
Jens Petersen 2012-10-26 16:18:12 +09:00
parent 763914a38b
commit 3bdd3fce00
2 changed files with 48 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
pandoc-1.9.4-no-threaded-runtime.patch Normal file
View File

@ -0,0 +1,42 @@
Description: Don't build with the threaded runtime. It causes build failures
and has a performance penalty.
Origin: upstream, commit:a5db4246656afae3541936269e727d9a9cc39795
Forwarded: not-needed
Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=682433
Index: b/pandoc.cabal
===================================================================
--- a/pandoc.cabal
+++ b/pandoc.cabal
@@ -344,12 +344,12 @@
else
Build-depends: base >= 3 && < 4
if impl(ghc >= 7.0.1)
- Ghc-Options: -O2 -rtsopts -threaded -Wall -fno-warn-unused-do-bind -dno-debug-output
+ Ghc-Options: -O2 -rtsopts -Wall -fno-warn-unused-do-bind -dno-debug-output
else
if impl(ghc >= 6.12)
- Ghc-Options: -O2 -Wall -threaded -fno-warn-unused-do-bind -dno-debug-output
+ Ghc-Options: -O2 -Wall -fno-warn-unused-do-bind -dno-debug-output
else
- Ghc-Options: -O2 -Wall -threaded
+ Ghc-Options: -O2 -Wall
if impl(ghc >= 7.0.1)
Ghc-Prof-Options: -auto-all -caf-all -rtsopts
else
@@ -411,12 +411,12 @@
else
Build-depends: base >= 3 && < 4
if impl(ghc >= 7.0.1)
- Ghc-Options: -O2 -rtsopts -threaded -Wall -fno-warn-unused-do-bind -dno-debug-output
+ Ghc-Options: -O2 -rtsopts -Wall -fno-warn-unused-do-bind -dno-debug-output
else
if impl(ghc >= 6.12)
- Ghc-Options: -O2 -Wall -threaded -fno-warn-unused-do-bind -dno-debug-output
+ Ghc-Options: -O2 -Wall -fno-warn-unused-do-bind -dno-debug-output
else
- Ghc-Options: -O2 -Wall -threaded
+ Ghc-Options: -O2 -Wall
if impl(ghc >= 7.0.1)
Ghc-Prof-Options: -auto-all -caf-all -rtsopts
else

7
pandoc.spec
View File

@ -14,7 +14,7 @@ MediaWiki, groff man pages, EPUB, and S5 and Slidy HTML slide shows.
Name: %{pkg_name}
Version: 1.9.4.2
Release: 5%{?dist}
Release: 6%{?dist}
Summary: Markup conversion tool for markdown
Group: Applications/Publishing
@ -48,6 +48,7 @@ BuildRequires: ghc-zip-archive-devel
BuildRequires: ghc-zlib-devel
# this patch should be removed when texlive gets updated
Patch1: pandoc-templates-disable-luatex.patch
Patch2: pandoc-1.9.4-no-threaded-runtime.patch
%description
%{common_description}
@ -74,6 +75,7 @@ needed by pandoc to generate pdf output.
%prep
%setup -q
%patch1 -p1 -b .orig
%patch2 -p1 -b .orig
%build
@ -117,6 +119,9 @@ ln -s pandoc %{buildroot}%{_bindir}/hsmarkdown
%changelog
* Fri Oct 26 2012 Jens Petersen <petersen@redhat.com> - 1.9.4.2-6
- disable threaded rts with upstream patch copied from Debian
* Tue Oct 2 2012 Jens Petersen <petersen@redhat.com> - 1.9.4.2-5
- add a files section for the pdf subpackage so it is actually created