rpms/ghc-rpm-macros
6
0
Fork 0
Code Issues Pull Requests Releases Activity

don't run cabal haddock for meta libraries

Browse Source
This commit is contained in:
Jens Petersen 2015-01-31 18:03:52 +00:00
parent d80a2ea958
commit c13aaea995
2 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ghc-rpm-macros.spec
View File

@ -101,6 +101,7 @@ EOF
* Sat Jan 31 2015 Jens Petersen <petersen@redhat.com> - 1.4.6-1 * Sat Jan 31 2015 Jens Petersen <petersen@redhat.com> - 1.4.6-1
- disable Cabal tests on armv7 since they give an internal error - disable Cabal tests on armv7 since they give an internal error
https://ghc.haskell.org/trac/ghc/ticket/10029 https://ghc.haskell.org/trac/ghc/ticket/10029
- only run cabal haddock for real libraries with modules
* Sat Jan 31 2015 Jens Petersen <petersen@redhat.com> - 1.4.5-1 * Sat Jan 31 2015 Jens Petersen <petersen@redhat.com> - 1.4.5-1
- fix the R*PATH regexp - fix the R*PATH regexp

4
macros.ghc
View File

@ -106,7 +106,11 @@ install -D --mode=0644 %{pkgnamever}.conf %{buildroot}%{ghclibdir}/package.conf.
%ghc_lib_build()\ %ghc_lib_build()\
%ghc_lib_build_without_haddock\ %ghc_lib_build_without_haddock\
%if %{undefined without_haddock}\ %if %{undefined without_haddock}\
%define pkgname %{?1}%{!?1:%{pkg_name}}\
%define pkgver %{?2}%{!?2:%{version}}\
if [ -f dist/build/libHS%{pkgname}-%{pkgver}.a ]; then\
%cabal haddock --html %{!?without_hscolour:%(if [ -x %{_bindir}/HsColour ]; then echo --hyperlink-source; fi)} --hoogle\ %cabal haddock --html %{!?without_hscolour:%(if [ -x %{_bindir}/HsColour ]; then echo --hyperlink-source; fi)} --hoogle\
fi\
%endif\ %endif\
%{nil} %{nil}