proxmox-mirrors/llvm-toolchain
1
0
Fork 0
mirror of https://git.proxmox.com/git/llvm-toolchain synced 2025-06-14 05:46:27 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

* Fix the renaming of the manpages (Closes: #834077)

Browse Source 
* Use the manpage from clang.rst instead of help2man
This commit is contained in:
Sylvestre Ledru 2016-08-27 13:20:20 +00:00
commit 9b9eee9b57
5 changed files with 20 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
debian/changelog vendored
View File

@ -1,6 +1,8 @@
llvm-toolchain-snapshot (1:4.0~svn275971-1) unstable; urgency=medium llvm-toolchain-snapshot (1:4.0~svn275971-1) unstable; urgency=medium
* Introduce clang-include-fixer-4.0 * Introduce clang-include-fixer-4.0
* Fix the renaming of the manpages (Closes: #834077)
* Use the manpage from clang.rst instead of help2man
* Disable the build of lldb on mips64el, ppc64 and s390x for real * Disable the build of lldb on mips64el, ppc64 and s390x for real
* Add symlink from ./build to ../share and ../lib etc * Add symlink from ./build to ../share and ../lib etc
Thanks to Ximin Luo for the patch (Closes: #834144) Thanks to Ximin Luo for the patch (Closes: #834144)

5
debian/clang-X.Y.manpages.in vendored
View File

@ -1,4 +1,5 @@
debian/man/clang-@LLVM_VERSION@.1 clang/docs/_build/man/clang-@LLVM_VERSION@.1
clang/tools/scan-build/man/scan-build-@LLVM_VERSION@.1
debian/man/clang-check-@LLVM_VERSION@.1 debian/man/clang-check-@LLVM_VERSION@.1
debian/man/clang-rename-@LLVM_VERSION@.1 debian/man/clang-rename-@LLVM_VERSION@.1
debian/man/clang-query-@LLVM_VERSION@.1 debian/man/clang-query-@LLVM_VERSION@.1
@ -6,4 +7,4 @@ debian/man/clang-apply-replacements-@LLVM_VERSION@.1
debian/man/sancov-@LLVM_VERSION@.1 debian/man/sancov-@LLVM_VERSION@.1
debian/man/scan-view-@LLVM_VERSION@.1 debian/man/scan-view-@LLVM_VERSION@.1
debian/man/modularize-@LLVM_VERSION@.1 debian/man/modularize-@LLVM_VERSION@.1
clang/tools/scan-build/man/scan-build-@LLVM_VERSION@.1

11
debian/patches/silent-symbolizer.diff → debian/patches/disable-llvm-symbolizer-test.diff vendored
View File

@ -11,15 +11,16 @@ Description: Silent a test failing on yakkety amd64
Author: Sylvestre <sylvestre@debian.org> Author: Sylvestre <sylvestre@debian.org>
Last-Update: 2016-08-26 Last-Update: 2016-08-26
Index: llvm-toolchain-snapshot_4.0~svn279658/test/tools/llvm-symbolizer/print_context.c Index: llvm-toolchain-3.9-3.9~+rc1/test/tools/llvm-symbolizer/print_context.c
=================================================================== ===================================================================
--- llvm-toolchain-snapshot_4.0~svn279658.orig/test/tools/llvm-symbolizer/print_context.c --- llvm-toolchain-3.9-3.9~+rc1.orig/test/tools/llvm-symbolizer/print_context.c
+++ llvm-toolchain-snapshot_4.0~svn279658/test/tools/llvm-symbolizer/print_context.c +++ llvm-toolchain-3.9-3.9~+rc1/test/tools/llvm-symbolizer/print_context.c
@@ -1,6 +1,7 @@ @@ -1,7 +1,7 @@
// REQUIRES: x86_64-linux // REQUIRES: x86_64-linux
// RUN: %host_cc -O0 -g %s -o %t 2>&1 // RUN: %host_cc -O0 -g %s -o %t 2>&1
// RUN: %t 2>&1 | llvm-symbolizer -print-source-context-lines=5 -obj=%t | FileCheck %s // RUN: %t 2>&1 | llvm-symbolizer -print-source-context-lines=5 -obj=%t | FileCheck %s
-
+// XFAIL: * +// XFAIL: *
#include <stdio.h> #include <stdio.h>
int inc(int a) {

2
debian/patches/series vendored
View File

@ -32,4 +32,4 @@ fix-cmake-config-prefix.diff
lldb-link-atomic-cmake.patch lldb-link-atomic-cmake.patch
disable-source-interleave.diff disable-source-interleave.diff
silent-gold-utils.diff silent-gold-utils.diff
silent-symbolizer.diff disable-llvm-symbolizer-test.diff

14
debian/rules vendored
View File

@ -254,16 +254,18 @@ build_doc:
-(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) && 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 # Rename manpages
d=$(TARGET_BUILD)/docs/man/; \ d=$(CURDIR)/docs/_build/man/; \
if test -d $$d; then \ if test -d $$d; then \
cd $$d; \ cd $$d; \
for f in *.1; do \ for f in *.1; do \
echo "$$f"|grep $(LLVM_VERSION) || mv $$f `echo $$f|sed "s|\.1|-$(LLVM_VERSION).1|"`; \ echo "$$f"|grep $(LLVM_VERSION) || mv $$f `echo $$f|sed "s|\.1|-$(LLVM_VERSION).1|"`; \
done; \ done; \
else \
echo "could not find $$d"; \
fi fi
# the clang doc generation only generates clang manpage # the clang doc generation only generates clang manpage
# When it will do more, we should move that in the loop above # When it will do more, we should move that in the loop above
# cd $(CURDIR)/clang/docs/_build/man/; mv clang.1 clang-$(LLVM_VERSION).1 cd $(CURDIR)/clang/docs/_build/man/; mv clang.1 clang-$(LLVM_VERSION).1
# Remove the copy of jquery. See bug #701087 # 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)/docs/html/_static/ $(TARGET_BUILD)/tools/clang/docs/html/_static/ $(TARGET_BUILD)/tools/clang/tools/extra/docs/html/_static/; do \