[packages/ghc] fix build without doc
atler
atler at pld-linux.org
Thu Mar 17 19:25:03 CET 2022
commit 29d2792e4f9cbfd7671770ba7c0a17f9beb7d45c
Author: Jan Palus <atler at pld-linux.org>
Date: Thu Mar 17 19:04:30 2022 +0100
fix build without doc
- always build haddock, xhtml module depends on it and irrespective of
doc bcond we do want to ship haddock tool
ghc.spec | 12 ++++--------
1 file changed, 4 insertions(+), 8 deletions(-)
---
diff --git a/ghc.spec b/ghc.spec
index 14d2c61..bbd9273 100644
--- a/ghc.spec
+++ b/ghc.spec
@@ -334,7 +334,7 @@ cat <<'EOF' > mk/build.mk
#GhcLibHcOpts += -O -dcore-lint -keep-hc-files
#SplitObjs += NO
PlatformSupportsSharedLibs = YES
-HADDOCK_DOCS = %{!?with_doc:NO}%{?with_doc:YES}
+HADDOCK_DOCS = YES
LATEX_DOCS = %{!?with_doc:NO}%{?with_doc:YES}
BUILD_DOCBOOK_HTMLS = %{!?with_doc:NO}%{?with_doc:YES}
BUILD_DOCBOOK_PDFS = %{!?with_doc:NO}%{?with_doc:YES}
@@ -421,6 +421,8 @@ rm -rf docs-root
# fix paths to docs in package list
sed -i -e 's|%{_datadir}/doc/%{name}|%{_docdir}/%{name}-%{version}|g' $RPM_BUILD_ROOT%{_libdir}/%{name}-%{version}/package.conf.d/*.conf
+%else
+%{__rm} -r $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
%endif
%clean
@@ -443,10 +445,8 @@ fi
%attr(755,root,root) %{_bindir}/ghc-pkg-%{version}
%attr(755,root,root) %{_bindir}/ghci
%attr(755,root,root) %{_bindir}/ghci-%{version}
-%if %{with doc}
%attr(755,root,root) %{_bindir}/haddock
%attr(755,root,root) %{_bindir}/haddock-ghc-%{version}
-%endif
%attr(755,root,root) %{_bindir}/hp2ps
%attr(755,root,root) %{_bindir}/hpc
%attr(755,root,root) %{_bindir}/hsc2hs
@@ -460,10 +460,8 @@ fi
%attr(755,root,root) %{_libdir}/ghc-%{version}/bin/ghc-iserv-dyn
%attr(755,root,root) %{_libdir}/ghc-%{version}/bin/ghc-iserv-prof
%attr(755,root,root) %{_libdir}/ghc-%{version}/bin/ghc-pkg
-%if %{with doc}
%attr(755,root,root) %{_libdir}/ghc-%{version}/bin/haddock
%attr(755,root,root) %{_libdir}/ghc-%{version}/bin/hp2ps
-%endif
%attr(755,root,root) %{_libdir}/ghc-%{version}/bin/hpc
%attr(755,root,root) %{_libdir}/ghc-%{version}/bin/hsc2hs
%attr(755,root,root) %{_libdir}/ghc-%{version}/bin/runghc
@@ -475,12 +473,10 @@ fi
%{_libdir}/ghc-%{version}/llvm-passes
%{_libdir}/ghc-%{version}/llvm-targets
%{_libdir}/ghc-%{version}/platformConstants
-%if %{with doc}
%{_libdir}/ghc-%{version}/html
%dir %{_libdir}/ghc-%{version}/latex
%{_libdir}/ghc-%{version}/latex/haddock.sty
-%{_mandir}/man1/ghc.1*
-%endif
+%{?with_doc:%{_mandir}/man1/ghc.1*}
%dir %{_libdir}/ghc-%{version}/package.conf.d
%ghost %{_libdir}/ghc-%{version}/package.conf.d/package.cache
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/ghc.git/commitdiff/6d507b632ff1c6737787817db35f795868c0315b
More information about the pld-cvs-commit
mailing list