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

fix generation of haddock's

Browse Source
This commit is contained in:
Jens Petersen 2017-02-22 13:32:26 +09:00
parent df54044203
commit 66fe267a12
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ghc-rpm-macros.spec
View File

@ -10,8 +10,8 @@
#%%global without_hscolour 1 #%%global without_hscolour 1
Name: ghc-rpm-macros Name: ghc-rpm-macros
Version: 1.6.15 Version: 1.6.16
Release: 2%{?dist} Release: 1%{?dist}
Summary: RPM macros for building Haskell packages for GHC Summary: RPM macros for building Haskell packages for GHC
License: GPLv3+ License: GPLv3+
@ -147,6 +147,9 @@ EOF
%changelog %changelog
* Wed Feb 22 2017 Jens Petersen <petersen@redhat.com> - 1.6.16-1
- fix generation of haddock's
* Tue Feb 14 2017 Jens Petersen <petersen@redhat.com> - 1.6.15-2 * Tue Feb 14 2017 Jens Petersen <petersen@redhat.com> - 1.6.15-2
- do not set CFLAGS on ppc64 or ppc64le due to -Wunused-label noise - do not set CFLAGS on ppc64 or ppc64le due to -Wunused-label noise

2
macros.ghc
View File

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