From daf38c1634954d9aad7a1393eef0828c57f41a53 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Fri, 22 Oct 2021 11:07:40 +0200 Subject: [PATCH] Adjust the sphinx build as the makefile have been removed --- debian/changelog | 5 +++-- debian/rules | 12 ++++++++++-- 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/debian/changelog b/debian/changelog index 22cd1ab8..132b9b17 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -llvm-toolchain-snapshot (1:14~++20211018020854+59a994e8daee-1~exp1) UNRELEASED; urgency=medium +llvm-toolchain-snapshot (1:14~++20211022081626+13755436bb3d-1~exp1) UNRELEASED; urgency=medium * Remove the triple patch. it is causing the library search path to fail. Add a test in debian/qualify-clang.sh to verify we don't regress @@ -15,8 +15,9 @@ llvm-toolchain-snapshot (1:14~++20211018020854+59a994e8daee-1~exp1) UNRELEASED; * Disable the build of libclc on old Ubuntu (Groovy & focal) as llvm-spir is too old on these version. See bug #52200 + * Adjust the sphinx build as the makefile have been removed - -- Sylvestre Ledru Mon, 18 Oct 2021 16:14:57 +0200 + -- Sylvestre Ledru Fri, 22 Oct 2021 08:21:06 +0200 llvm-toolchain-snapshot (1:14~++20210926041028+6063e6b499c7-1~exp1) experimental; urgency=medium diff --git a/debian/rules b/debian/rules index d8083682..e7cc98c4 100755 --- a/debian/rules +++ b/debian/rules @@ -557,8 +557,16 @@ override_dh_prep: build_doc dh_prep build_doc: - cd $(CURDIR)/llvm/docs && make -f Makefile.sphinx && make -f Makefile.sphinx man - cd $(CURDIR)/clang/docs && make -f Makefile.sphinx && make -f Makefile.sphinx man + BUILDDIR="_build"; \ + ALLSPHINXOPTS="-d $$BUILDDIR/doctrees ."; \ + cd $(CURDIR)/llvm/docs && \ + sphinx-build -b html $$ALLSPHINXOPTS $$BUILDDIR/html && \ + sphinx-build -b man $$ALLSPHINXOPTS $$BUILDDIR/man && \ + cd -; \ + cd $(CURDIR)/clang/docs && \ + sphinx-build -b html $$ALLSPHINXOPTS $$BUILDDIR/html && \ + sphinx-build -b man $$ALLSPHINXOPTS $$BUILDDIR/man + -(if test "$(OCAML_ENABLE)" = yes; then \ ninja -C "$(TARGET_BUILD_STAGE2)" $(VERBOSE) ocaml_doc; \ fi)