From 4b26a33863d5b6ad65d074869d7e25a578ed6003 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Mon, 18 Oct 2021 13:30:12 +0200 Subject: [PATCH] Bring back the llvm manpages (Closes: #995684) Were generated at the wrong place --- debian/changelog | 4 ++++ debian/llvm-X.Y.manpages.in | 2 +- debian/qualify-clang.sh | 6 ++++++ debian/rules | 4 ++-- 4 files changed, 13 insertions(+), 3 deletions(-) diff --git a/debian/changelog b/debian/changelog index 2e6f93b4..fdf55f21 100644 --- a/debian/changelog +++ b/debian/changelog @@ -17,6 +17,10 @@ llvm-toolchain-12 (1:12.0.1-11) unstable; urgency=medium * d/rules: Add amdgcn-mesa-mesa3d to libclc build. Closes: #993904, #995069 + [ Sylvestre Ledru ] + * Bring back the llvm manpages (Closes: #995684) + Were generated at the wrong place + -- Erik Maciejewski Sat, 16 Oct 2021 09:07:25 -0700 llvm-toolchain-12 (1:12.0.1-10) unstable; urgency=medium diff --git a/debian/llvm-X.Y.manpages.in b/debian/llvm-X.Y.manpages.in index 35702d06..e2483708 100644 --- a/debian/llvm-X.Y.manpages.in +++ b/debian/llvm-X.Y.manpages.in @@ -1,4 +1,4 @@ -docs/_build/man/* +llvm/docs/_build/man/* debian/man/llvm-dwarfdump-@LLVM_VERSION@.1 debian/man/llvm-mc-@LLVM_VERSION@.1 debian/man/llvm-objdump-@LLVM_VERSION@.1 diff --git a/debian/qualify-clang.sh b/debian/qualify-clang.sh index c184fce9..029b0e55 100755 --- a/debian/qualify-clang.sh +++ b/debian/qualify-clang.sh @@ -44,6 +44,12 @@ if grep "File format not recognized" foo.log; then exit 1 fi +# Test #995684 +if test ! -f /usr/share/man/man1/llc-$VERSION.1.gz; then + echo "llvm manpage are missing (using llc as an example)" + exit 1 +fi + if test ! -f /usr/bin/scan-build-$VERSION; then echo "Install clang-tools-$VERSION" exit 1 diff --git a/debian/rules b/debian/rules index 831a4023..e1c52e70 100755 --- a/debian/rules +++ b/debian/rules @@ -585,7 +585,7 @@ ifeq (${POLLY_ENABLE},yes) endif # Rename manpages - d=$(CURDIR)/docs/_build/man/; \ + d=$(CURDIR)/llvm/docs/_build/man/; \ if test -d $$d; then \ cd $$d; \ for f in *.1; do \ @@ -943,7 +943,7 @@ override_dh_gencontrol: override_dh_auto_clean: - rm -rf $(TARGET_BUILD) tools/clang/include/clang/Debian/debian_path.h docs/_build/ clang/docs/_build tools/clang/docs/_html/ + rm -rf $(TARGET_BUILD) tools/clang/include/clang/Debian/debian_path.h llvm/docs/_build/ clang/docs/_build tools/clang/docs/_html/ # QA tools rm -rf cov-int/ reports/ rm -f `ls debian/*.in|sed -e "s|.in$$||g"`