mirror of
https://git.proxmox.com/git/llvm-toolchain
synced 2025-06-22 12:42:24 +00:00
Use stage2 files to build the doc. For some reasons, clang-tools-extra html generation stopped working
This commit is contained in:
parent
29cfc05b52
commit
dbba493888
2
debian/changelog
vendored
2
debian/changelog
vendored
@ -8,6 +8,8 @@ llvm-toolchain-9 (1:9.0.0-3~exp2) experimental; urgency=medium
|
||||
* disable-fuzzer-compiler-rt.diff: bring back this patch.
|
||||
Still breaks i386 compiler-rt/fuzzer
|
||||
Disable fuzzer only for i386
|
||||
* Use stage2 files to build the doc. For some reasons, clang-tools-extra
|
||||
html generation stopped working
|
||||
|
||||
-- Sylvestre Ledru <sylvestre@debian.org> Wed, 30 Oct 2019 19:09:12 +0100
|
||||
|
||||
|
11
debian/rules
vendored
11
debian/rules
vendored
@ -483,8 +483,7 @@ build_doc:
|
||||
make $(NJOBS) -C "$(TARGET_BUILD_STAGE2)/docs" ocaml_doc; \
|
||||
fi)
|
||||
|
||||
# Continue if failing, Ubuntu precise cannot generate manpages as sphinx is too old
|
||||
-(cd $(TARGET_BUILD) && make $(NJOBS) docs-llvm-html docs-clang-html docs-clang-tools-html docs-polly-html docs-polly-man docs-clang-tools-man docs-clang-man docs-llvm-man)
|
||||
cd $(TARGET_BUILD_STAGE2) && make $(NJOBS) docs-llvm-html docs-clang-html docs-clang-tools-html docs-polly-html docs-polly-man docs-clang-tools-man docs-clang-man docs-llvm-man
|
||||
|
||||
# Rename manpages
|
||||
d=$(CURDIR)/docs/_build/man/; \
|
||||
@ -501,7 +500,7 @@ build_doc:
|
||||
cd $(CURDIR)/clang/docs/_build/man/; mv clang.1 clang-$(LLVM_VERSION).1
|
||||
|
||||
# Remove the copy of jquery. See bug #701087
|
||||
for d in $(TARGET_BUILD)/docs/html/_static/ $(TARGET_BUILD)/tools/clang/docs/html/_static/ $(TARGET_BUILD)/tools/clang/tools/extra/docs/html/_static/; do \
|
||||
for d in $(TARGET_BUILD_STAGE2)/docs/html/_static/ $(TARGET_BUILD_STAGE2)/tools/clang/docs/html/_static/ $(TARGET_BUILD_STAGE2)/tools/clang/tools/extra/docs/html/_static/; do \
|
||||
cd $$d && rm -f jquery.js && ln -s /usr/share/javascript/jquery/jquery.js && cd -; \
|
||||
cd $$d && rm -f underscore.js && ln -s /usr/share/javascript/underscore/underscore.js && cd -; \
|
||||
done
|
||||
@ -666,9 +665,9 @@ endif
|
||||
fi
|
||||
|
||||
mkdir -p $(CURDIR)/debian/usr/share/doc/llvm-$(LLVM_VERSION)-doc/ $(CURDIR)/debian/usr/share/doc/clang-$(LLVM_VERSION)-doc/
|
||||
cp -R $(TARGET_BUILD)/docs/html $(CURDIR)/debian/usr/share/doc/llvm-$(LLVM_VERSION)-doc/
|
||||
cp -R $(TARGET_BUILD)/tools/clang/docs/html $(CURDIR)/debian/usr/share/doc/clang-$(LLVM_VERSION)-doc/
|
||||
cp -R $(TARGET_BUILD)/tools/clang/tools/extra/docs/html $(CURDIR)/debian/usr/share/doc/clang-$(LLVM_VERSION)-doc/clang-extra
|
||||
cp -R $(TARGET_BUILD_STAGE2)/docs/html $(CURDIR)/debian/usr/share/doc/llvm-$(LLVM_VERSION)-doc/
|
||||
cp -R $(TARGET_BUILD_STAGE2)/tools/clang/docs/html $(CURDIR)/debian/usr/share/doc/clang-$(LLVM_VERSION)-doc/
|
||||
cp -R $(TARGET_BUILD_STAGE2)/tools/clang/tools/extra/docs/html $(CURDIR)/debian/usr/share/doc/clang-$(LLVM_VERSION)-doc/clang-extra
|
||||
|
||||
# Rename OCaml bindings
|
||||
if test "$(OCAML_ENABLE)" = yes; then \
|
||||
|
Loading…
Reference in New Issue
Block a user