lock manual bcond to with_haddock

We should probably just use haddock until Hadrian...
This commit is contained in:
Jens Petersen 2019-07-17 16:42:57 +00:00
parent 48dd6aa4cd
commit 850e71d743

View File

@ -11,21 +11,22 @@
%global base_ver 4.11.1.0 %global base_ver 4.11.1.0
# build profiling libraries # build profiling libraries
# build haddock and manuals # build haddock
# - earlier combined since disabling haddock seems to cause no manuals built?
# - <https://ghc.haskell.org/trac/ghc/ticket/15190>
# perf production build (disable for quick build) # perf production build (disable for quick build)
%if %{with quickbuild} %if %{with quickbuild}
%undefine with_ghc_prof %undefine with_ghc_prof
%undefine with_haddock %undefine with_haddock
%bcond_with manual
%bcond_with perf_build %bcond_with perf_build
%undefine _enable_debug_packages %undefine _enable_debug_packages
%else %else
%bcond_without manual
%bcond_without perf_build %bcond_without perf_build
%endif %endif
# locked together since disabling haddock causes no manuals built
# and disabling haddock still created index.html
# https://ghc.haskell.org/trac/ghc/ticket/15190
%{?with_haddock:%bcond_without manual}
# no longer build testsuite (takes time and not really being used) # no longer build testsuite (takes time and not really being used)
%bcond_with testsuite %bcond_with testsuite
@ -347,8 +348,10 @@ HADDOCK_DOCS = NO
%endif %endif
%if %{with manual} %if %{with manual}
BUILD_MAN = YES BUILD_MAN = YES
BUILD_SPHINX_HTML = YES
%else %else
BUILD_MAN = NO BUILD_MAN = NO
BUILD_SPHINX_HTML = NO
%endif %endif
BUILD_SPHINX_PDF = NO BUILD_SPHINX_PDF = NO
EOF EOF
@ -623,10 +626,10 @@ make test
#%%{ghc_html_dir}/Cabal #%%{ghc_html_dir}/Cabal
%if %{with haddock} %if %{with haddock}
%{ghc_html_dir}/haddock %{ghc_html_dir}/haddock
%endif
%{ghc_html_dir}/index.html %{ghc_html_dir}/index.html
%{ghc_html_dir}/users_guide %{ghc_html_dir}/users_guide
%endif %endif
%endif
%if %{with ghc_prof} %if %{with ghc_prof}
%files prof %files prof