From 064678e245cc12cf6fb461221906076ac4429b24 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Tue, 20 Mar 2018 15:29:22 +0100 Subject: [PATCH 01/12] fix the changelog --- debian/changelog | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-) diff --git a/debian/changelog b/debian/changelog index 1854d1de..d78321db 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,5 @@ -llvm-toolchain-5.0 (1:5.0.1-4) UNRELEASED; urgency=medium +llvm-toolchain-5.0 (1:5.0.1-3) unstable; urgency=medium - [ Sylvestre Ledru ] * Move the VCS to git. Many thanks to James Clarke for doing the conversion * Ignore the test tools/gold/X86/comdat.ll @@ -11,7 +10,10 @@ llvm-toolchain-5.0 (1:5.0.1-4) UNRELEASED; urgency=medium * clang-tidy-5.0: depends on libclang-common-5.0-dev (Closes: #891999) * clang-tidy-5.0 also depends on clang-tools-5.0 for, at least - clang-apply-replacements + clang-apply-replacements (Closes: #893600) + * Update of the clang-tools-X.Y description + * Fix the libclang1-X.Y.symbols.in file (two spaces) + (Closes: #889035) [ John Paul Adrian Glaubitz ] * Add proposed upstream patch by James Clarke to add the @@ -21,15 +23,7 @@ llvm-toolchain-5.0 (1:5.0.1-4) UNRELEASED; urgency=medium [ James Clarke ] * Disable LLDB on powerpcspe - -- James Clarke Mon, 26 Feb 2018 16:07:18 +0000 - -llvm-toolchain-5.0 (1:5.0.1-3) unstable; urgency=medium - - * Update of the clang-tools-X.Y description - * Fix the libclang1-X.Y.symbols.in file (two spaces) - (Closes: #889035) - - -- + -- Sylvestre Ledru Tue, 20 Mar 2018 15:29:03 +0100 llvm-toolchain-5.0 (1:5.0.1-2) unstable; urgency=medium From 7cd3737d9065467eb4bc38fd4072e2e8f1450a16 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Wed, 21 Mar 2018 22:56:46 +0100 Subject: [PATCH 02/12] Fix the FTBFS with glibc 2.27 --- debian/changelog | 6 +++ debian/patches/glibc_2.27.diff | 77 ++++++++++++++++++++++++++++++++++ debian/patches/series | 1 + 3 files changed, 84 insertions(+) create mode 100644 debian/patches/glibc_2.27.diff diff --git a/debian/changelog b/debian/changelog index d78321db..20bbb8c9 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +llvm-toolchain-5.0 (1:5.0.1-4) unstable; urgency=medium + + * Fix the FTBFS with glibc 2.27 + + -- Sylvestre Ledru Wed, 21 Mar 2018 22:56:33 +0100 + llvm-toolchain-5.0 (1:5.0.1-3) unstable; urgency=medium * Move the VCS to git. diff --git a/debian/patches/glibc_2.27.diff b/debian/patches/glibc_2.27.diff new file mode 100644 index 00000000..fa53ba47 --- /dev/null +++ b/debian/patches/glibc_2.27.diff @@ -0,0 +1,77 @@ +# DP: Fix PR sanitizer/84761, taken from the trunk + +libsanitizer/ + +2018-03-19 Jakub Jelinek + + PR sanitizer/84761 + * sanitizer_common/sanitizer_linux_libcdep.cc (__GLIBC_PREREQ): + Define if not defined. + (DL_INTERNAL_FUNCTION): Don't define. + (InitTlsSize): For __i386__ if not compiled against glibc 2.27+ + determine at runtime whether to use regparm(3), stdcall calling + convention for older glibcs or normal calling convention for + newer glibcs for call to _dl_get_tls_static_info. + +Index: llvm-toolchain-5.0-5.0.1/compiler-rt/lib/sanitizer_common/sanitizer_linux_libcdep.cc +=================================================================== +--- llvm-toolchain-5.0-5.0.1.orig/compiler-rt/lib/sanitizer_common/sanitizer_linux_libcdep.cc ++++ llvm-toolchain-5.0-5.0.1/compiler-rt/lib/sanitizer_common/sanitizer_linux_libcdep.cc +@@ -148,28 +148,43 @@ bool SanitizerGetThreadName(char *name, + #endif + } + ++#ifndef __GLIBC_PREREQ ++#define __GLIBC_PREREQ(x, y) 0 ++#endif ++ + #if !SANITIZER_FREEBSD && !SANITIZER_ANDROID && !SANITIZER_GO + static uptr g_tls_size; + +-#ifdef __i386__ +-# define DL_INTERNAL_FUNCTION __attribute__((regparm(3), stdcall)) +-#else +-# define DL_INTERNAL_FUNCTION +-#endif +- + void InitTlsSize() { + // all current supported platforms have 16 bytes stack alignment + const size_t kStackAlign = 16; +- typedef void (*get_tls_func)(size_t*, size_t*) DL_INTERNAL_FUNCTION; +- get_tls_func get_tls; +- void *get_tls_static_info_ptr = dlsym(RTLD_NEXT, "_dl_get_tls_static_info"); +- CHECK_EQ(sizeof(get_tls), sizeof(get_tls_static_info_ptr)); +- internal_memcpy(&get_tls, &get_tls_static_info_ptr, +- sizeof(get_tls_static_info_ptr)); +- CHECK_NE(get_tls, 0); + size_t tls_size = 0; + size_t tls_align = 0; +- get_tls(&tls_size, &tls_align); ++ void *get_tls_static_info_ptr = dlsym(RTLD_NEXT, "_dl_get_tls_static_info"); ++#if defined(__i386__) && !__GLIBC_PREREQ(2, 27) ++ /* On i?86, _dl_get_tls_static_info used to be internal_function, i.e. ++ __attribute__((regparm(3), stdcall)) before glibc 2.27 and is normal ++ function in 2.27 and later. */ ++ if (!dlvsym(RTLD_NEXT, "glob", "GLIBC_2.27")) { ++ typedef void (*get_tls_func)(size_t*, size_t*) ++ __attribute__((regparm(3), stdcall)); ++ get_tls_func get_tls; ++ CHECK_EQ(sizeof(get_tls), sizeof(get_tls_static_info_ptr)); ++ internal_memcpy(&get_tls, &get_tls_static_info_ptr, ++ sizeof(get_tls_static_info_ptr)); ++ CHECK_NE(get_tls, 0); ++ get_tls(&tls_size, &tls_align); ++ } else ++#endif ++ { ++ typedef void (*get_tls_func)(size_t*, size_t*); ++ get_tls_func get_tls; ++ CHECK_EQ(sizeof(get_tls), sizeof(get_tls_static_info_ptr)); ++ internal_memcpy(&get_tls, &get_tls_static_info_ptr, ++ sizeof(get_tls_static_info_ptr)); ++ CHECK_NE(get_tls, 0); ++ get_tls(&tls_size, &tls_align); ++ } + if (tls_align < kStackAlign) + tls_align = kStackAlign; + g_tls_size = RoundUpTo(tls_size, tls_align); diff --git a/debian/patches/series b/debian/patches/series index 6eb754fb..a02c701d 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -50,3 +50,4 @@ update-cuda-search-path.patch test-keep-alive.diff libfuzzer-path.diff silent-gold-regression.diff +glibc_2.27.diff From fe4f762558456bc1a49a91f61b0785ddef282b59 Mon Sep 17 00:00:00 2001 From: Nicholas D Steeves Date: Sat, 10 Feb 2018 20:26:49 -0500 Subject: [PATCH 03/12] Add libjs-mathjax to Build-Depends and to clang-x.y-doc Depends. Signed-off-by: Nicholas D Steeves --- debian/control | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/debian/control b/debian/control index 8189b279..cd2affab 100644 --- a/debian/control +++ b/debian/control @@ -10,6 +10,7 @@ Build-Depends: debhelper (>= 9.0), flex, bison, dejagnu, tcl, expect, libjsoncpp-dev, pkg-config, lcov, procps, help2man, zlib1g-dev, g++-multilib [amd64 i386 kfreebsd-amd64 mips mips64 mips64el mipsel powerpc ppc64 s390 s390x sparc sparc64 x32], + libjs-mathjax # ocaml-nox [amd64 arm64 armel armhf i386], # ocaml-findlib [amd64 arm64 armel armhf i386], # libctypes-ocaml-dev [amd64 arm64 armel armhf i386], @@ -86,7 +87,7 @@ Description: clang-based C++ linter tool Package: clang-5.0-doc Architecture: all Section: doc -Depends: ${shlibs:Depends}, ${misc:Depends} +Depends: ${shlibs:Depends}, ${misc:Depends}, libjs-mathjax Description: C, C++ and Objective-C compiler - Documentation Clang project is a C, C++, Objective C and Objective C++ front-end based on the LLVM compiler. Its goal is to offer a replacement to the From 75ae8865bc4b0f4e6b8a4d3cd95d2d167fd7cd31 Mon Sep 17 00:00:00 2001 From: Nicholas D Steeves Date: Sat, 10 Feb 2018 21:07:21 -0500 Subject: [PATCH 04/12] Add patches to use static docs using Debian-provided MathJax Signed-off-by: Nicholas D Steeves --- ...-html_static_path-_static-everywhere.patch | 63 +++++++++ ...e-Debian-provided-MathJax-everywhere.patch | 122 ++++++++++++++++++ debian/patches/series | 3 + 3 files changed, 188 insertions(+) create mode 100644 debian/patches/0048-Set-html_static_path-_static-everywhere.patch create mode 100644 debian/patches/0049-Use-Debian-provided-MathJax-everywhere.patch diff --git a/debian/patches/0048-Set-html_static_path-_static-everywhere.patch b/debian/patches/0048-Set-html_static_path-_static-everywhere.patch new file mode 100644 index 00000000..10663a82 --- /dev/null +++ b/debian/patches/0048-Set-html_static_path-_static-everywhere.patch @@ -0,0 +1,63 @@ +From: Nicholas D Steeves +Date: Sat, 10 Feb 2018 21:00:55 -0500 +Subject: Set html_static_path = ['_static'] everywhere. + +--- + clang-tools-extra/docs/conf.py | 2 +- + clang/docs/analyzer/conf.py | 2 +- + clang/docs/conf.py | 2 +- + polly/docs/conf.py | 2 +- + 4 files changed, 4 insertions(+), 4 deletions(-) + +diff --git a/clang-tools-extra/docs/conf.py b/clang-tools-extra/docs/conf.py +index e872c55..69f425a 100644 +--- a/clang-tools-extra/docs/conf.py ++++ b/clang-tools-extra/docs/conf.py +@@ -121,7 +121,7 @@ html_theme = 'haiku' + # Add any paths that contain custom static files (such as style sheets) here, + # relative to this directory. They are copied after the builtin static files, + # so a file named "default.css" will overwrite the builtin "default.css". +-html_static_path = [] ++html_static_path = ['_static'] + + # If not '', a 'Last updated on:' timestamp is inserted at every page bottom, + # using the given strftime format. +diff --git a/clang/docs/analyzer/conf.py b/clang/docs/analyzer/conf.py +index c40af7a..666308d 100644 +--- a/clang/docs/analyzer/conf.py ++++ b/clang/docs/analyzer/conf.py +@@ -121,7 +121,7 @@ html_theme = 'haiku' + # Add any paths that contain custom static files (such as style sheets) here, + # relative to this directory. They are copied after the builtin static files, + # so a file named "default.css" will overwrite the builtin "default.css". +-html_static_path = [] ++html_static_path = ['_static'] + + # If not '', a 'Last updated on:' timestamp is inserted at every page bottom, + # using the given strftime format. +diff --git a/clang/docs/conf.py b/clang/docs/conf.py +index a9861cd..d125dc6 100644 +--- a/clang/docs/conf.py ++++ b/clang/docs/conf.py +@@ -121,7 +121,7 @@ html_theme = 'haiku' + # Add any paths that contain custom static files (such as style sheets) here, + # relative to this directory. They are copied after the builtin static files, + # so a file named "default.css" will overwrite the builtin "default.css". +-html_static_path = [] ++html_static_path = ['_static'] + + # If not '', a 'Last updated on:' timestamp is inserted at every page bottom, + # using the given strftime format. +diff --git a/polly/docs/conf.py b/polly/docs/conf.py +index 64d3968..aa854ad 100644 +--- a/polly/docs/conf.py ++++ b/polly/docs/conf.py +@@ -127,7 +127,7 @@ except ImportError: + # Add any paths that contain custom static files (such as style sheets) here, + # relative to this directory. They are copied after the builtin static files, + # so a file named "default.css" will overwrite the builtin "default.css". +-html_static_path = [] ++html_static_path = ['_static'] + + # If not '', a 'Last updated on:' timestamp is inserted at every page bottom, + # using the given strftime format. diff --git a/debian/patches/0049-Use-Debian-provided-MathJax-everywhere.patch b/debian/patches/0049-Use-Debian-provided-MathJax-everywhere.patch new file mode 100644 index 00000000..dce925ee --- /dev/null +++ b/debian/patches/0049-Use-Debian-provided-MathJax-everywhere.patch @@ -0,0 +1,122 @@ +From: Nicholas D Steeves +Date: Sat, 10 Feb 2018 21:02:17 -0500 +Subject: Use Debian-provided MathJax everywhere. + +--- + clang-tools-extra/docs/Doxyfile | 2 +- + clang-tools-extra/docs/conf.py | 3 +++ + clang-tools-extra/docs/doxygen.cfg.in | 2 +- + clang/docs/analyzer/conf.py | 3 +++ + clang/docs/conf.py | 3 +++ + clang/docs/doxygen.cfg.in | 2 +- + docs/doxygen.cfg.in | 2 +- + polly/docs/doxygen.cfg.in | 2 +- + 8 files changed, 14 insertions(+), 5 deletions(-) + +diff --git a/clang-tools-extra/docs/Doxyfile b/clang-tools-extra/docs/Doxyfile +index d674390..1bf4f72 100644 +--- a/clang-tools-extra/docs/Doxyfile ++++ b/clang-tools-extra/docs/Doxyfile +@@ -1206,7 +1206,7 @@ USE_MATHJAX = NO + # MathJax, but it is strongly recommended to install a local copy of MathJax + # before deployment. + +-MATHJAX_RELPATH = http://www.mathjax.org/mathjax ++MATHJAX_RELPATH = /usr/share/javascript/mathjax + + # The MATHJAX_EXTENSIONS tag can be used to specify one or MathJax extension + # names that should be enabled during MathJax rendering. +diff --git a/clang-tools-extra/docs/conf.py b/clang-tools-extra/docs/conf.py +index 69f425a..46f8eea 100644 +--- a/clang-tools-extra/docs/conf.py ++++ b/clang-tools-extra/docs/conf.py +@@ -123,6 +123,9 @@ html_theme = 'haiku' + # so a file named "default.css" will overwrite the builtin "default.css". + html_static_path = ['_static'] + ++# Use Debian-provided MathJax ++mathjax_path = '/usr/share/javascript/mathjax/MathJax.js?config=TeX-AMS-MML_HTMLorMML' ++ + # If not '', a 'Last updated on:' timestamp is inserted at every page bottom, + # using the given strftime format. + #html_last_updated_fmt = '%b %d, %Y' +diff --git a/clang-tools-extra/docs/doxygen.cfg.in b/clang-tools-extra/docs/doxygen.cfg.in +index 6dbf6db..da44cfc 100644 +--- a/clang-tools-extra/docs/doxygen.cfg.in ++++ b/clang-tools-extra/docs/doxygen.cfg.in +@@ -1438,7 +1438,7 @@ MATHJAX_FORMAT = HTML-CSS + # The default value is: http://cdn.mathjax.org/mathjax/latest. + # This tag requires that the tag USE_MATHJAX is set to YES. + +-MATHJAX_RELPATH = http://cdn.mathjax.org/mathjax/latest ++MATHJAX_RELPATH = /usr/share/javascript/mathjax + + # The MATHJAX_EXTENSIONS tag can be used to specify one or more MathJax + # extension names that should be enabled during MathJax rendering. For example +diff --git a/clang/docs/analyzer/conf.py b/clang/docs/analyzer/conf.py +index 666308d..2881bcc 100644 +--- a/clang/docs/analyzer/conf.py ++++ b/clang/docs/analyzer/conf.py +@@ -123,6 +123,9 @@ html_theme = 'haiku' + # so a file named "default.css" will overwrite the builtin "default.css". + html_static_path = ['_static'] + ++# Use Debian-provided MathJax ++mathjax_path = '/usr/share/javascript/mathjax/MathJax.js?config=TeX-AMS-MML_HTMLorMML' ++ + # If not '', a 'Last updated on:' timestamp is inserted at every page bottom, + # using the given strftime format. + #html_last_updated_fmt = '%b %d, %Y' +diff --git a/clang/docs/conf.py b/clang/docs/conf.py +index d125dc6..2ce1a91 100644 +--- a/clang/docs/conf.py ++++ b/clang/docs/conf.py +@@ -123,6 +123,9 @@ html_theme = 'haiku' + # so a file named "default.css" will overwrite the builtin "default.css". + html_static_path = ['_static'] + ++# Use Debian-provided MathJax ++mathjax_path = '/usr/share/javascript/mathjax/MathJax.js?config=TeX-AMS-MML_HTMLorMML' ++ + # If not '', a 'Last updated on:' timestamp is inserted at every page bottom, + # using the given strftime format. + #html_last_updated_fmt = '%b %d, %Y' +diff --git a/clang/docs/doxygen.cfg.in b/clang/docs/doxygen.cfg.in +index 13ed722..77bed6e 100644 +--- a/clang/docs/doxygen.cfg.in ++++ b/clang/docs/doxygen.cfg.in +@@ -1432,7 +1432,7 @@ MATHJAX_FORMAT = HTML-CSS + # The default value is: http://cdn.mathjax.org/mathjax/latest. + # This tag requires that the tag USE_MATHJAX is set to YES. + +-MATHJAX_RELPATH = http://cdn.mathjax.org/mathjax/latest ++MATHJAX_RELPATH = /usr/share/javascript/mathjax + + # The MATHJAX_EXTENSIONS tag can be used to specify one or more MathJax + # extension names that should be enabled during MathJax rendering. For example +diff --git a/docs/doxygen.cfg.in b/docs/doxygen.cfg.in +index e3c7f47..dcdade1 100644 +--- a/docs/doxygen.cfg.in ++++ b/docs/doxygen.cfg.in +@@ -1433,7 +1433,7 @@ MATHJAX_FORMAT = HTML-CSS + # The default value is: http://cdn.mathjax.org/mathjax/latest. + # This tag requires that the tag USE_MATHJAX is set to YES. + +-MATHJAX_RELPATH = http://cdn.mathjax.org/mathjax/latest ++MATHJAX_RELPATH = /usr/share/javascript/mathjax + + # The MATHJAX_EXTENSIONS tag can be used to specify one or more MathJax + # extension names that should be enabled during MathJax rendering. For example +diff --git a/polly/docs/doxygen.cfg.in b/polly/docs/doxygen.cfg.in +index 36786aa..26a8984 100644 +--- a/polly/docs/doxygen.cfg.in ++++ b/polly/docs/doxygen.cfg.in +@@ -1433,7 +1433,7 @@ MATHJAX_FORMAT = HTML-CSS + # The default value is: http://cdn.mathjax.org/mathjax/latest. + # This tag requires that the tag USE_MATHJAX is set to YES. + +-MATHJAX_RELPATH = http://cdn.mathjax.org/mathjax/latest ++MATHJAX_RELPATH = /usr/share/javascript/mathjax + + # The MATHJAX_EXTENSIONS tag can be used to specify one or more MathJax + # extension names that should be enabled during MathJax rendering. For example diff --git a/debian/patches/series b/debian/patches/series index a02c701d..d5b28833 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -51,3 +51,6 @@ test-keep-alive.diff libfuzzer-path.diff silent-gold-regression.diff glibc_2.27.diff +0048-Set-html_static_path-_static-everywhere.patch +0049-Use-Debian-provided-MathJax-everywhere.patch + From 522b1035fc4f06710e622b4398a6fabdc3fa167c Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Thu, 22 Mar 2018 12:11:30 +0100 Subject: [PATCH 05/12] Fix the lintian error 'privacy-breach-uses-embedded-file' Many thanks to Nicholas D Steeves for the patch (Closes: #829361) --- debian/changelog | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/debian/changelog b/debian/changelog index 20bbb8c9..2673e037 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +llvm-toolchain-5.0 (1:5.0.1-5) unstable; urgency=medium + + * Fix the lintian error 'privacy-breach-uses-embedded-file' + Many thanks to Nicholas D Steeves for the patch + (Closes: #829361) + + -- Sylvestre Ledru Thu, 22 Mar 2018 12:11:21 +0100 + llvm-toolchain-5.0 (1:5.0.1-4) unstable; urgency=medium * Fix the FTBFS with glibc 2.27 From 7d1b8a2ae011679fd8a6443d56e06a5123c6cd5b Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Thu, 22 Mar 2018 13:21:13 +0100 Subject: [PATCH 06/12] do not fail if the dir exists --- debian/rules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/rules b/debian/rules index f8e340ef..2f0f2eb3 100755 --- a/debian/rules +++ b/debian/rules @@ -338,7 +338,7 @@ build_doc: cd $$d && rm -f underscore.js && ln -s /usr/share/javascript/underscore/underscore.js && cd -; \ done - mkdir debian/man/ + mkdir -p debian/man/ help2man --version-string=$(LLVM_VERSION) clang/tools/scan-view/bin/scan-view > debian/man/scan-view-$(LLVM_VERSION).1 help2man --version-string=$(LLVM_VERSION) clang/tools/clang-format/clang-format-diff.py > debian/man/clang-format-diff-$(LLVM_VERSION).1 From 0cc88dc8168608e94c77270f57a2bf4cacf7cb11 Mon Sep 17 00:00:00 2001 From: Athos Ribeiro Date: Wed, 28 Mar 2018 08:54:08 +0200 Subject: [PATCH 07/12] Create symlink to run-clang-tidy-X.Y.py to remove its .py extension (Closes: #892089) --- debian/changelog | 6 +++++- debian/clang-tidy-X.Y.links.in | 1 + 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 2673e037..2ac3be49 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,7 +4,11 @@ llvm-toolchain-5.0 (1:5.0.1-5) unstable; urgency=medium Many thanks to Nicholas D Steeves for the patch (Closes: #829361) - -- Sylvestre Ledru Thu, 22 Mar 2018 12:11:21 +0100 + [ Athos Ribeiro ] + * Create symlink to run-clang-tidy-X.Y.py to remove its .py extension + (Closes: #892089) + + -- Sylvestre Ledru Tue, 27 Mar 2018 21:22:11 +0200 llvm-toolchain-5.0 (1:5.0.1-4) unstable; urgency=medium diff --git a/debian/clang-tidy-X.Y.links.in b/debian/clang-tidy-X.Y.links.in index 5d959f49..ad03ae1d 100644 --- a/debian/clang-tidy-X.Y.links.in +++ b/debian/clang-tidy-X.Y.links.in @@ -1,3 +1,4 @@ usr/lib/llvm-@LLVM_VERSION@/share/clang/run-clang-tidy.py usr/bin/run-clang-tidy-@LLVM_VERSION@.py +usr/lib/llvm-@LLVM_VERSION@/share/clang/run-clang-tidy.py usr/bin/run-clang-tidy-@LLVM_VERSION@ usr/lib/llvm-@LLVM_VERSION@/share/clang/clang-tidy-diff.py usr/bin/clang-tidy-diff-@LLVM_VERSION@.py From b32b5cf5d6eeb7020137b19a950c8833243f6682 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Wed, 28 Mar 2018 09:54:26 +0200 Subject: [PATCH 08/12] improve the changelog --- debian/changelog | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/debian/changelog b/debian/changelog index 2ac3be49..573b1bc0 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,14 +1,16 @@ -llvm-toolchain-5.0 (1:5.0.1-5) unstable; urgency=medium +llvm-toolchain-5.0 (1:5.0.2~+rc1-1~exp1) UNRELEASED; urgency=medium + * New snapshot release + + [ Nicholas D Steeves ] * Fix the lintian error 'privacy-breach-uses-embedded-file' - Many thanks to Nicholas D Steeves for the patch (Closes: #829361) [ Athos Ribeiro ] * Create symlink to run-clang-tidy-X.Y.py to remove its .py extension (Closes: #892089) - -- Sylvestre Ledru Tue, 27 Mar 2018 21:22:11 +0200 + -- Sylvestre Ledru Wed, 28 Mar 2018 09:18:47 +0200 llvm-toolchain-5.0 (1:5.0.1-4) unstable; urgency=medium From f25e249938f4732634727e9865904e991224ede4 Mon Sep 17 00:00:00 2001 From: Reshabh Sharma Date: Wed, 28 Mar 2018 09:59:36 +0200 Subject: [PATCH 09/12] Enable autopkgtest for amd64 & i386 on the llvm test suite (Closes: #774294) --- debian/changelog | 6 +++++- debian/rules | 3 ++- debian/tests/control | 4 ++++ debian/tests/llvm | 9 +++++++++ 4 files changed, 20 insertions(+), 2 deletions(-) create mode 100644 debian/tests/control create mode 100644 debian/tests/llvm diff --git a/debian/changelog b/debian/changelog index 573b1bc0..312f1c0c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,7 +1,11 @@ -llvm-toolchain-5.0 (1:5.0.2~+rc1-1~exp1) UNRELEASED; urgency=medium +llvm-toolchain-5.0 (1:5.0.2~+rc1-1~exp1) experimental; urgency=medium * New snapshot release + [ Reshabh Sharma ] + * Enable autopkgtest for amd64 & i386 on the llvm test suite + (Closes: #774294) + [ Nicholas D Steeves ] * Fix the lintian error 'privacy-breach-uses-embedded-file' (Closes: #829361) diff --git a/debian/rules b/debian/rules index 2f0f2eb3..06d4d4f3 100755 --- a/debian/rules +++ b/debian/rules @@ -532,7 +532,8 @@ override_dh_auto_test: # LLVM tests ifneq (,$(findstring $(DEB_HOST_ARCH),$(ARCH_LLVM_TEST_OK))) - $(MAKE) $(NJOBS) -C $(TARGET_BUILD) check-llvm +# logs the output to check-llvm_build_log.txt for validation through autopkgtest + $(MAKE) $(NJOBS) -C $(TARGET_BUILD) check-llvm | tee check-llvm_build_log.txt else $(MAKE) $(NJOBS) -C $(TARGET_BUILD) check-llvm || true endif diff --git a/debian/tests/control b/debian/tests/control new file mode 100644 index 00000000..82582ae3 --- /dev/null +++ b/debian/tests/control @@ -0,0 +1,4 @@ +Tests: llvm +Depends: @ +Restrictions: build-needed + diff --git a/debian/tests/llvm b/debian/tests/llvm new file mode 100644 index 00000000..c1a74d4e --- /dev/null +++ b/debian/tests/llvm @@ -0,0 +1,9 @@ +#!/bin/sh +# Checks llvm build passing on architectiures known to have 100% tests workings + +if grep -q "Unexpected Failure" check-llvm_build_log.txt; then + exit 1 +else + echo "build OK" +f1 +rm check-llvm_build_log.txt From 8a8fe8e7237d8d5f881d87c75ba40a499199aa5d Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Tue, 3 Apr 2018 19:22:30 +0200 Subject: [PATCH 10/12] Remove the info text from the manpages (Closes: #894734) --- debian/changelog | 6 ++++++ debian/patches/fix-LLVM_VERSION_PATCH.diff | 13 +++++++++++++ debian/rules | 6 +++--- 3 files changed, 22 insertions(+), 3 deletions(-) create mode 100644 debian/patches/fix-LLVM_VERSION_PATCH.diff diff --git a/debian/changelog b/debian/changelog index 312f1c0c..7ba00f0e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +llvm-toolchain-5.0 (1:5.0.2~+rc1-1~exp2) experimental; urgency=medium + + * Remove the info text from the manpages (Closes: #894734) + + -- Sylvestre Ledru Tue, 03 Apr 2018 19:22:12 +0200 + llvm-toolchain-5.0 (1:5.0.2~+rc1-1~exp1) experimental; urgency=medium * New snapshot release diff --git a/debian/patches/fix-LLVM_VERSION_PATCH.diff b/debian/patches/fix-LLVM_VERSION_PATCH.diff new file mode 100644 index 00000000..96ba1926 --- /dev/null +++ b/debian/patches/fix-LLVM_VERSION_PATCH.diff @@ -0,0 +1,13 @@ +Index: llvm-toolchain-5.0-5.0.2~+rc1/CMakeLists.txt +=================================================================== +--- llvm-toolchain-5.0-5.0.2~+rc1.orig/CMakeLists.txt ++++ llvm-toolchain-5.0-5.0.2~+rc1/CMakeLists.txt +@@ -26,7 +26,7 @@ if(NOT DEFINED LLVM_VERSION_MINOR) + set(LLVM_VERSION_MINOR 0) + endif() + if(NOT DEFINED LLVM_VERSION_PATCH) +- set(LLVM_VERSION_PATCH 1) ++ set(LLVM_VERSION_PATCH 2) + endif() + if(NOT DEFINED LLVM_VERSION_SUFFIX) + set(LLVM_VERSION_SUFFIX "") diff --git a/debian/rules b/debian/rules index 06d4d4f3..7df0dbd7 100755 --- a/debian/rules +++ b/debian/rules @@ -339,13 +339,13 @@ build_doc: done mkdir -p debian/man/ - help2man --version-string=$(LLVM_VERSION) clang/tools/scan-view/bin/scan-view > debian/man/scan-view-$(LLVM_VERSION).1 - help2man --version-string=$(LLVM_VERSION) clang/tools/clang-format/clang-format-diff.py > debian/man/clang-format-diff-$(LLVM_VERSION).1 + help2man --no-info --version-string=$(LLVM_VERSION) clang/tools/scan-view/bin/scan-view > debian/man/scan-view-$(LLVM_VERSION).1 + help2man --no-info --version-string=$(LLVM_VERSION) clang/tools/clang-format/clang-format-diff.py > debian/man/clang-format-diff-$(LLVM_VERSION).1 CMDS="llvm-dwarfdump llvm-mc llvm-mcmarkup llvm-objdump llvm-rtdyld llvm-size llvm-ranlib lldb lldb-mi clang-format clang clang++ clang-tblgen clang-check clang-cpp clang-import-test clang-tidy clang-apply-replacements clang-rename clang-query pp-trace sancov lli modularize clang-include-fixer find-all-symbols clang-reorder-fields ld.lld llvm-tblgen clang-change-namespace clang-offload-bundler"; \ for f in $$CMDS; do \ echo "Generating manpage of $$f"; \ - LD_LIBRARY_PATH=$(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/lib/:/usr/lib/*/libfakeroot help2man --version-string=$(LLVM_VERSION) $(TARGET_BUILD)/bin/$$f > debian/man/$$f-$(LLVM_VERSION).1; \ + LD_LIBRARY_PATH=$(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/lib/:/usr/lib/*/libfakeroot help2man --no-info --version-string=$(LLVM_VERSION) $(TARGET_BUILD)/bin/$$f > debian/man/$$f-$(LLVM_VERSION).1; \ done override_dh_auto_install: From 3101385abf8b7cf403fb4bbb933321b9ff9d9ef0 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Tue, 3 Apr 2018 19:22:59 +0200 Subject: [PATCH 11/12] fix version --- debian/orig-tar.sh | 2 +- debian/patches/series | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/debian/orig-tar.sh b/debian/orig-tar.sh index e8b792e4..02758dd1 100755 --- a/debian/orig-tar.sh +++ b/debian/orig-tar.sh @@ -16,7 +16,7 @@ set -e SVN_BASE_URL=http://llvm.org/svn/llvm-project/ MAJOR_VERSION=5.0 -CURRENT_VERSION=5.0.1 # Should be changed to 3.5.1 later +CURRENT_VERSION=5.0.2 # Should be changed to 3.5.1 later if test -n "$1"; then # http://llvm.org/svn/llvm-project/{cfe,llvm,compiler-rt,...}/branches/google/stable/ diff --git a/debian/patches/series b/debian/patches/series index d5b28833..80906d50 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -54,3 +54,4 @@ glibc_2.27.diff 0048-Set-html_static_path-_static-everywhere.patch 0049-Use-Debian-provided-MathJax-everywhere.patch +fix-LLVM_VERSION_PATCH.diff From 7deef1bda30b5251964923bdac0645c44510c02c Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Fri, 6 Apr 2018 17:27:13 +0200 Subject: [PATCH 12/12] Remove the fix-LLVM_VERSION_PATCH.diff patch (applied upstream) --- debian/changelog | 1 + debian/patches/fix-LLVM_VERSION_PATCH.diff | 13 ------------- debian/patches/series | 3 --- 3 files changed, 1 insertion(+), 16 deletions(-) delete mode 100644 debian/patches/fix-LLVM_VERSION_PATCH.diff diff --git a/debian/changelog b/debian/changelog index 7ba00f0e..c643dbb6 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,7 @@ llvm-toolchain-5.0 (1:5.0.2~+rc1-1~exp2) experimental; urgency=medium * Remove the info text from the manpages (Closes: #894734) + * Remove the fix-LLVM_VERSION_PATCH.diff patch (applied upstream) -- Sylvestre Ledru Tue, 03 Apr 2018 19:22:12 +0200 diff --git a/debian/patches/fix-LLVM_VERSION_PATCH.diff b/debian/patches/fix-LLVM_VERSION_PATCH.diff deleted file mode 100644 index 96ba1926..00000000 --- a/debian/patches/fix-LLVM_VERSION_PATCH.diff +++ /dev/null @@ -1,13 +0,0 @@ -Index: llvm-toolchain-5.0-5.0.2~+rc1/CMakeLists.txt -=================================================================== ---- llvm-toolchain-5.0-5.0.2~+rc1.orig/CMakeLists.txt -+++ llvm-toolchain-5.0-5.0.2~+rc1/CMakeLists.txt -@@ -26,7 +26,7 @@ if(NOT DEFINED LLVM_VERSION_MINOR) - set(LLVM_VERSION_MINOR 0) - endif() - if(NOT DEFINED LLVM_VERSION_PATCH) -- set(LLVM_VERSION_PATCH 1) -+ set(LLVM_VERSION_PATCH 2) - endif() - if(NOT DEFINED LLVM_VERSION_SUFFIX) - set(LLVM_VERSION_SUFFIX "") diff --git a/debian/patches/series b/debian/patches/series index 80906d50..42b2d521 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -46,12 +46,9 @@ silent-amd-tet.diff disable-error-xray.diff lldb-disable-swig-error.diff update-cuda-search-path.patch - test-keep-alive.diff libfuzzer-path.diff silent-gold-regression.diff glibc_2.27.diff 0048-Set-html_static_path-_static-everywhere.patch 0049-Use-Debian-provided-MathJax-everywhere.patch - -fix-LLVM_VERSION_PATCH.diff