From 0c2595d4f830e67c440529373ff704ce3fde6db7 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Mon, 8 Aug 2016 14:56:53 +0000 Subject: [PATCH 01/21] do not ship the manpage of bugpoint --- debian/llvm-X.Y.manpages.in | 1 - 1 file changed, 1 deletion(-) diff --git a/debian/llvm-X.Y.manpages.in b/debian/llvm-X.Y.manpages.in index e059b467..98f095fb 100644 --- a/debian/llvm-X.Y.manpages.in +++ b/debian/llvm-X.Y.manpages.in @@ -6,4 +6,3 @@ debian/man/llvm-objdump-@LLVM_VERSION@.1 debian/man/llvm-rtdyld-@LLVM_VERSION@.1 debian/man/llvm-size-@LLVM_VERSION@.1 debian/man/llvm-ranlib-@LLVM_VERSION@.1 -build-llvm/docs/man/bugpoint-@LLVM_VERSION@.1 \ No newline at end of file From 5c47153ca493e7f36cf9224200c0c9681149dcc7 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Mon, 8 Aug 2016 15:04:09 +0000 Subject: [PATCH 02/21] Improve the repack script to use a cache --- debian/orig-tar.sh | 52 +++++++++++++++++++++++++++++++++++++++------- 1 file changed, 45 insertions(+), 7 deletions(-) diff --git a/debian/orig-tar.sh b/debian/orig-tar.sh index 2e04c0eb..ede42feb 100755 --- a/debian/orig-tar.sh +++ b/debian/orig-tar.sh @@ -60,7 +60,39 @@ get_higher_revision() { echo $REVISION_MAX } +SVN_ARCHIVES=svn-archives +checkout_sources() { + PROJECT=$1 + URL=$2 + TARGET=$3 + BRANCH=$4 + if test -n "$BRANCH"; then + REVISION=$5 + fi + echo "$PROJECT / $URL / $BRANCH / $TARGET / $REVISION" + + cd $SVN_ARCHIVES/ + DEST=$PROJECT-$BRANCH + if test -d $DEST; then + cd $DEST + if test -n "$BRANCH"; then + svn up + else + svn up -r $REVISION + fi + cd .. + else + if test -n "$BRANCH"; then + svn co $URL $DEST + else + svn co -r $REVISION $URL $DIST + fi + fi + rm -rf ../$TARGET + rsync -r --exclude=.svn $DEST/ ../$TARGET + cd .. +} if test -n "$BRANCH"; then REVISION=$(get_higher_revision) @@ -85,49 +117,55 @@ else fi fi +mkdir -p $SVN_ARCHIVES + # LLVM LLVM_TARGET=$FULL_VERSION -$SVN_CMD $(get_svn_url llvm $BRANCH $TAG) $LLVM_TARGET +checkout_sources llvm $(get_svn_url llvm $BRANCH $TAG) $LLVM_TARGET "$BRANCH" $REVISION tar jcvf $FULL_VERSION.orig.tar.bz2 $LLVM_TARGET rm -rf $LLVM_TARGET # Clang CLANG_TARGET=clang_$VERSION -$SVN_CMD $(get_svn_url cfe $BRANCH $TAG) $CLANG_TARGET +checkout_sources clang $(get_svn_url cfe $BRANCH $TAG) $CLANG_TARGET "$BRANCH" $REVISION tar jcvf $FULL_VERSION.orig-clang.tar.bz2 $CLANG_TARGET rm -rf $CLANG_TARGET # Clang extra CLANG_TARGET=clang-tools-extra_$VERSION -$SVN_CMD $(get_svn_url clang-tools-extra $BRANCH $TAG) $CLANG_TARGET +checkout_sources clang-tools-extra $(get_svn_url clang-tools-extra $BRANCH $TAG) $CLANG_TARGET "$BRANCH" $REVISION tar jcvf $FULL_VERSION.orig-clang-tools-extra.tar.bz2 $CLANG_TARGET rm -rf $CLANG_TARGET # Compiler-rt COMPILER_RT_TARGET=compiler-rt_$VERSION -$SVN_CMD $(get_svn_url compiler-rt $BRANCH $TAG) $COMPILER_RT_TARGET +checkout_sources compiler-rt $(get_svn_url compiler-rt $BRANCH $TAG) $COMPILER_RT_TARGET "$BRANCH" $REVISION +#$SVN_CMD $(get_svn_url compiler-rt $BRANCH $TAG) $COMPILER_RT_TARGET tar jcvf $FULL_VERSION.orig-compiler-rt.tar.bz2 $COMPILER_RT_TARGET rm -rf $COMPILER_RT_TARGET # Polly POLLY_TARGET=polly_$VERSION -$SVN_CMD $(get_svn_url polly $BRANCH $TAG) $POLLY_TARGET +checkout_sources polly $(get_svn_url polly $BRANCH $TAG) $POLLY_TARGET "$BRANCH" $REVISION +#$SVN_CMD $(get_svn_url polly $BRANCH $TAG) $POLLY_TARGET rm -rf $POLLY_TARGET/www $POLLY_TARGET/autoconf/config.sub $POLLY_TARGET/autoconf/config.guess tar jcvf $FULL_VERSION.orig-polly.tar.bz2 $POLLY_TARGET rm -rf $POLLY_TARGET # LLD LLD_TARGET=lld_$VERSION -$SVN_CMD $(get_svn_url lld $BRANCH $TAG) $LLD_TARGET +checkout_sources lld $(get_svn_url lld $BRANCH $TAG) $LLD_TARGET "$BRANCH" $REVISION +#$SVN_CMD $(get_svn_url lld $BRANCH $TAG) $LLD_TARGET rm -rf $LLD_TARGET/www/ tar jcvf $FULL_VERSION.orig-lld.tar.bz2 $LLD_TARGET rm -rf $LLD_TARGET # LLDB LLDB_TARGET=lldb_$VERSION -$SVN_CMD $(get_svn_url lldb $BRANCH $TAG) $LLDB_TARGET +checkout_sources lldb $(get_svn_url lldb $BRANCH $TAG) $LLDB_TARGET "$BRANCH" $REVISION +#$SVN_CMD $(get_svn_url lldb $BRANCH $TAG) $LLDB_TARGET rm -rf $LLDB_TARGET/www/ tar jcvf $FULL_VERSION.orig-lldb.tar.bz2 $LLDB_TARGET rm -rf $LLDB_TARGET From 543274af81b8e63ef29b5cca5f32a7232ec97b00 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Mon, 8 Aug 2016 16:52:15 +0000 Subject: [PATCH 03/21] Bring back the lto (gone with the cmake migration) (Closes: #819333) (upstream: #27223) --- debian/changelog | 2 ++ debian/clang-format-X.Y.manpages.in | 1 + debian/rules | 1 + 3 files changed, 4 insertions(+) diff --git a/debian/changelog b/debian/changelog index 856e269f..bcd2757a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,8 @@ llvm-toolchain-3.9 (1:3.9~+rc1-1~exp1) experimental; urgency=medium * new testing version * Sync the 3.8 changes into 3.9 * amd64 llvm testsuite is green, bring back the failure in case of error + * Bring back the lto (gone with the cmake migration) + (Closes: #819333) (upstream: #27223) * Fix the cmake paths in llvm-3.9-dev deb package. Thanks to Brad King for the patch (Closes: #819072) * LLVMConfig.cmake is now installed to /lib/cmake/llvm instead of diff --git a/debian/clang-format-X.Y.manpages.in b/debian/clang-format-X.Y.manpages.in index 486b909d..db4dd8f7 100644 --- a/debian/clang-format-X.Y.manpages.in +++ b/debian/clang-format-X.Y.manpages.in @@ -1,2 +1,3 @@ debian/man/clang-format-diff-@LLVM_VERSION@.1 debian/man/clang-format-@LLVM_VERSION@.1 + diff --git a/debian/rules b/debian/rules index 361e70aa..0f6b7f03 100755 --- a/debian/rules +++ b/debian/rules @@ -63,6 +63,7 @@ ifneq (,$(filter $(DEB_HOST_ARCH),$(BINUTILS_GOLD_ARCHS))) # -fused-ld=gold enables the gold linker (but is not supported by all archs / distro) LDFLAGS_EXTRA += -fuse-ld=gold CXXFLAGS_EXTRA += -Wl,-fuse-ld=gold + CMAKE_EXTRA += -DLLVM_BINUTILS_INCDIR=/usr/include/ endif endif From ef7d177b5f591e5e9c62d748fc58ad0e664140ba Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Mon, 8 Aug 2016 19:48:57 +0000 Subject: [PATCH 04/21] fix the man page copy --- debian/rules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/rules b/debian/rules index 0f6b7f03..ce8d80eb 100755 --- a/debian/rules +++ b/debian/rules @@ -258,7 +258,7 @@ build_doc: fi # the clang doc generation only generates clang manpage # 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 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 \ From ed3804ae4cc2cb2c173abe19f28095c75ed53906 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Tue, 9 Aug 2016 08:44:11 +0000 Subject: [PATCH 05/21] unexisting manpage --- debian/llvm-X.Y-tools.manpages.in | 1 - 1 file changed, 1 deletion(-) delete mode 100644 debian/llvm-X.Y-tools.manpages.in diff --git a/debian/llvm-X.Y-tools.manpages.in b/debian/llvm-X.Y-tools.manpages.in deleted file mode 100644 index 3dfb2ce6..00000000 --- a/debian/llvm-X.Y-tools.manpages.in +++ /dev/null @@ -1 +0,0 @@ -build-llvm/docs/man/FileCheck-@LLVM_VERSION@.1 From 178231c7ae8a3b08fdc6406ce37ffa14ca06b0ab Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Tue, 9 Aug 2016 08:48:31 +0000 Subject: [PATCH 06/21] fix a typo in the repack script --- debian/orig-tar.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/orig-tar.sh b/debian/orig-tar.sh index ede42feb..cff38332 100755 --- a/debian/orig-tar.sh +++ b/debian/orig-tar.sh @@ -86,7 +86,7 @@ checkout_sources() { if test -n "$BRANCH"; then svn co $URL $DEST else - svn co -r $REVISION $URL $DIST + svn co -r $REVISION $URL $DEST fi fi rm -rf ../$TARGET From 839e291c278decb52f512cbb55ad90bc1e8cf3ec Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Wed, 10 Aug 2016 11:02:57 +0000 Subject: [PATCH 07/21] Disable the build of lldb on mips64el and ppc64 --- debian/changelog | 6 ++++++ debian/control | 16 ++++++++-------- debian/rules | 2 +- 3 files changed, 15 insertions(+), 9 deletions(-) diff --git a/debian/changelog b/debian/changelog index bcd2757a..e4cec09a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +llvm-toolchain-3.9 (1:3.9~+rc1-1~exp2) experimental; urgency=medium + + * Disable the build of lldb on mips64el and ppc64 + + -- + llvm-toolchain-3.9 (1:3.9~+rc1-1~exp1) experimental; urgency=medium * new testing version diff --git a/debian/control b/debian/control index e2f47162..68172b30 100644 --- a/debian/control +++ b/debian/control @@ -446,8 +446,8 @@ Description: Modular compiler and toolchain technologies, examples # ------------- lldb ------------- Package: lldb-3.9 -Architecture: amd64 armel armhf i386 kfreebsd-amd64 kfreebsd-i386 s390 s390x sparc alpha hppa m68k powerpcspe ppc64 sh4 x32 mips mipsel -# ia64 mips mipsel hurd powerpc ppc64el sparc64 have been removed +Architecture: amd64 armel armhf i386 kfreebsd-amd64 kfreebsd-i386 s390 s390x sparc alpha hppa m68k powerpcspe sh4 x32 mips mipsel +# ia64 mips mipsel hurd powerpc ppc64 ppc64el sparc64 have been removed Depends: ${shlibs:Depends}, ${misc:Depends}, libllvm3.9 (= ${binary:Version}), llvm-3.9-dev Suggests: python-lldb-3.9 Conflicts: lldb-3.4, lldb-3.5 @@ -458,8 +458,8 @@ Description: Next generation, high-performance debugger Project, such as the Clang expression parser and LLVM disassembler. Package: liblldb-3.9 -Architecture: amd64 armel armhf i386 kfreebsd-amd64 kfreebsd-i386 s390 sparc alpha hppa m68k powerpcspe ppc64 sh4 x32 mips mipsel -# ia64 mips mipsel hurd powerpc ppc64el sparc64 have been removed +Architecture: amd64 armel armhf i386 kfreebsd-amd64 kfreebsd-i386 s390 sparc alpha hppa m68k powerpcspe sh4 x32 mips mipsel +# ia64 mips mipsel hurd powerpc ppc64 ppc64el sparc64 have been removed Depends: ${shlibs:Depends}, ${misc:Depends}, libllvm3.9 (= ${binary:Version}) Pre-Depends: ${misc:Pre-Depends} Section: libs @@ -473,8 +473,8 @@ Description: Next generation, high-performance debugger, library This package contains the LLDB runtime library. Package: liblldb-3.9-dbg -Architecture: amd64 armel armhf i386 kfreebsd-amd64 kfreebsd-i386 s390 sparc hppa m68k powerpcspe ppc64 sh4 x32 mips mipsel -# ia64 mips mipsel hurd ppc64el alpha s390x powerpc sparc64 have been removed +Architecture: amd64 armel armhf i386 kfreebsd-amd64 kfreebsd-i386 s390 sparc hppa m68k powerpcspe sh4 x32 mips mipsel +# ia64 mips mipsel hurd ppc64 ppc64el alpha s390x powerpc sparc64 have been removed Depends: ${shlibs:Depends}, ${misc:Depends}, liblldb-3.9 (= ${binary:Version}) Pre-Depends: ${misc:Pre-Depends} Section: debug @@ -503,8 +503,8 @@ Description: Next generation, high-performance debugger, python lib Package: liblldb-3.9-dev Section: libdevel -Architecture: amd64 armel armhf i386 kfreebsd-amd64 kfreebsd-i386 s390 sparc alpha hppa m68k powerpcspe ppc64 sh4 x32 mips mipsel -# ia64 mips mipsel hurd powerpc ppc64el sparc64 have been removed +Architecture: amd64 armel armhf i386 kfreebsd-amd64 kfreebsd-i386 s390 sparc alpha hppa m68k powerpcspe sh4 x32 mips mipsel +# ia64 mips mipsel hurd powerpc ppc64 ppc64el sparc64 have been removed Depends: ${shlibs:Depends}, ${misc:Depends}, lldb-3.9 (= ${binary:Version}) Replaces: lldb-3.9-dev (<= 1:3.9~svn215195-2) Breaks: lldb-3.9-dev (<< 1:3.9~svn215195-2) diff --git a/debian/rules b/debian/rules index ce8d80eb..9c5d8b2b 100755 --- a/debian/rules +++ b/debian/rules @@ -113,7 +113,7 @@ endif LLDB_ENABLE=yes -LLDB_DISABLE_ARCHS := arm64 hurd-i386 ia64 ppc64el powerpc s390x sparc64 +LLDB_DISABLE_ARCHS := arm64 hurd-i386 ia64 ppc64el powerpc s390x sparc64 mips64el ppc64 # hurd has threading issues ifeq (,$(filter-out $(LLDB_DISABLE_ARCHS), $(DEB_HOST_ARCH))) # Disable LLDB for this arch. From b265045ed9f0f012796a3cc880cd0aeafe547288 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Thu, 11 Aug 2016 07:35:12 +0000 Subject: [PATCH 08/21] Disable the build of lldb on mips64el, ppc64 and s390x for real --- debian/changelog | 2 +- debian/control | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/debian/changelog b/debian/changelog index e4cec09a..ae72be93 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,6 @@ llvm-toolchain-3.9 (1:3.9~+rc1-1~exp2) experimental; urgency=medium - * Disable the build of lldb on mips64el and ppc64 + * Disable the build of lldb on mips64el, ppc64 and s390x for real -- diff --git a/debian/control b/debian/control index 68172b30..5c7a0691 100644 --- a/debian/control +++ b/debian/control @@ -446,8 +446,8 @@ Description: Modular compiler and toolchain technologies, examples # ------------- lldb ------------- Package: lldb-3.9 -Architecture: amd64 armel armhf i386 kfreebsd-amd64 kfreebsd-i386 s390 s390x sparc alpha hppa m68k powerpcspe sh4 x32 mips mipsel -# ia64 mips mipsel hurd powerpc ppc64 ppc64el sparc64 have been removed +Architecture: amd64 armel armhf i386 kfreebsd-amd64 kfreebsd-i386 s390 sparc alpha hppa m68k powerpcspe sh4 x32 mips mipsel +# ia64 mips mipsel hurd powerpc ppc64 ppc64el sparc64 s390x have been removed Depends: ${shlibs:Depends}, ${misc:Depends}, libllvm3.9 (= ${binary:Version}), llvm-3.9-dev Suggests: python-lldb-3.9 Conflicts: lldb-3.4, lldb-3.5 From 7475c885900210a1fe0f33d12359efdc27fbd144 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Fri, 12 Aug 2016 16:30:08 +0000 Subject: [PATCH 09/21] Add symlink from ./build to ../share and ../lib etc Thanks to Ximin Luo for the patch (Closes: #834144) --- debian/changelog | 2 ++ debian/llvm-X.Y-dev.links.in | 2 ++ 2 files changed, 4 insertions(+) diff --git a/debian/changelog b/debian/changelog index ae72be93..e7a670d8 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,8 @@ llvm-toolchain-3.9 (1:3.9~+rc1-1~exp2) experimental; urgency=medium * Disable the build of lldb on mips64el, ppc64 and s390x for real + * Add symlink from ./build to ../share and ../lib etc + Thanks to Ximin Luo for the patch (Closes: #834144) -- diff --git a/debian/llvm-X.Y-dev.links.in b/debian/llvm-X.Y-dev.links.in index c8cbce2f..f4dbfc6b 100644 --- a/debian/llvm-X.Y-dev.links.in +++ b/debian/llvm-X.Y-dev.links.in @@ -10,6 +10,8 @@ usr/include/llvm-c-@LLVM_VERSION@/llvm-c usr/lib/llvm-@LLVM_VERSION@/build/inclu usr/include/llvm-@LLVM_VERSION@/llvm usr/lib/llvm-@LLVM_VERSION@/build/include/llvm usr/lib/llvm-@LLVM_VERSION@/include/ usr/lib/llvm-@LLVM_VERSION@/build/include +usr/lib/llvm-@LLVM_VERSION@/lib/ usr/lib/llvm-@LLVM_VERSION@/build/lib +usr/lib/llvm-@LLVM_VERSION@/share/ usr/lib/llvm-@LLVM_VERSION@/build/share usr/lib/llvm-@LLVM_VERSION@/ usr/lib/llvm-@LLVM_VERSION@/build/Release usr/lib/llvm-@LLVM_VERSION@/ usr/lib/llvm-@LLVM_VERSION@/build/Debug+Asserts From 67615eda9235e7abcc67fc181fd1ffa3ae6dfd0b Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Wed, 17 Aug 2016 13:04:15 +0000 Subject: [PATCH 10/21] remove autogenerated files --- debian/llvm-X.Y-runtime.links.in | 1 - debian/llvm-X.Y.links.in | 1 - 2 files changed, 2 deletions(-) delete mode 100644 debian/llvm-X.Y-runtime.links.in delete mode 100644 debian/llvm-X.Y.links.in diff --git a/debian/llvm-X.Y-runtime.links.in b/debian/llvm-X.Y-runtime.links.in deleted file mode 100644 index 655ca2dc..00000000 --- a/debian/llvm-X.Y-runtime.links.in +++ /dev/null @@ -1 +0,0 @@ -# AUTOGENERATED in debian/rules.d/binary.mk. diff --git a/debian/llvm-X.Y.links.in b/debian/llvm-X.Y.links.in deleted file mode 100644 index 655ca2dc..00000000 --- a/debian/llvm-X.Y.links.in +++ /dev/null @@ -1 +0,0 @@ -# AUTOGENERATED in debian/rules.d/binary.mk. From a74d5d960cdc3fe6cdf47862104c2729a090e7f7 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Thu, 18 Aug 2016 12:03:41 +0000 Subject: [PATCH 11/21] ignore a test failing on ubuntu yakkety --- debian/patches/disable-llvm-symbolizer-test.diff | 13 +++++++++++++ debian/patches/series | 1 + 2 files changed, 14 insertions(+) create mode 100644 debian/patches/disable-llvm-symbolizer-test.diff diff --git a/debian/patches/disable-llvm-symbolizer-test.diff b/debian/patches/disable-llvm-symbolizer-test.diff new file mode 100644 index 00000000..607141c1 --- /dev/null +++ b/debian/patches/disable-llvm-symbolizer-test.diff @@ -0,0 +1,13 @@ +Index: llvm-toolchain-3.9-3.9~+rc1/test/tools/llvm-symbolizer/print_context.c +=================================================================== +--- llvm-toolchain-3.9-3.9~+rc1.orig/test/tools/llvm-symbolizer/print_context.c ++++ llvm-toolchain-3.9-3.9~+rc1/test/tools/llvm-symbolizer/print_context.c +@@ -1,7 +1,7 @@ + // REQUIRES: x86_64-linux + // 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 +- ++// XFAIL: * + #include + + int inc(int a) { diff --git a/debian/patches/series b/debian/patches/series index e3a14907..5f613739 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -32,3 +32,4 @@ mips-fpxx-enable.diff disable-test-failing-sparc-i386.diff fix-cmake-config-prefix.diff lldb-link-atomic-cmake.patch +disable-llvm-symbolizer-test.diff From c0a7d6af8dcf45ebb4bd219f19d759d750d5b1de Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Thu, 18 Aug 2016 15:34:55 +0000 Subject: [PATCH 12/21] Introduce clang-include-fixer-4.0 --- debian/changelog | 1 + debian/control | 7 +++++++ debian/rules | 2 +- 3 files changed, 9 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index e7a670d8..6170eb24 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,5 +1,6 @@ llvm-toolchain-3.9 (1:3.9~+rc1-1~exp2) experimental; urgency=medium + * Introduce clang-include-fixer-4.0 * Disable the build of lldb on mips64el, ppc64 and s390x for real * Add symlink from ./build to ../share and ../lib etc Thanks to Ximin Luo for the patch (Closes: #834144) diff --git a/debian/control b/debian/control index 5c7a0691..0de0b091 100644 --- a/debian/control +++ b/debian/control @@ -67,6 +67,13 @@ Description: clang-based C++ linter tool via static analysis. clang-tidy is modular and provides a convenient interface for writing new checks. +Package: clang-include-fixer-3.9 +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends}, python +Description: clang-based C/C++ include fixer + Provide automated way of adding #include directives for missing symbols in one + translation unit. + Package: clang-3.9-doc Architecture: all diff --git a/debian/rules b/debian/rules index 9c5d8b2b..86565157 100755 --- a/debian/rules +++ b/debian/rules @@ -269,7 +269,7 @@ build_doc: 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 - CMDS="llvm-dwarfdump llvm-mc llvm-mcmarkup llvm-objdump llvm-rtdyld llvm-size llvm-ranlib lldb lldb-mi clang-format clang clang-tblgen clang-check clang-tidy clang-apply-replacements clang-rename clang-query pp-trace sancov lli modularize"; \ + CMDS="llvm-dwarfdump llvm-mc llvm-mcmarkup llvm-objdump llvm-rtdyld llvm-size llvm-ranlib lldb lldb-mi clang-format clang clang-tblgen clang-check clang-tidy clang-apply-replacements clang-rename clang-query pp-trace sancov lli modularize clang-include-fixer find-all-symbols"; \ 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; \ From d97a1169ac5c237b5ea62dbea40f18c74ae49982 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Thu, 18 Aug 2016 15:35:09 +0000 Subject: [PATCH 13/21] I meant 3.9 --- debian/changelog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 6170eb24..03104b24 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,6 @@ llvm-toolchain-3.9 (1:3.9~+rc1-1~exp2) experimental; urgency=medium - * Introduce clang-include-fixer-4.0 + * Introduce clang-include-fixer-3.9 * Disable the build of lldb on mips64el, ppc64 and s390x for real * Add symlink from ./build to ../share and ../lib etc Thanks to Ximin Luo for the patch (Closes: #834144) From bb784b151391ffe14ca15917432b47ded68f27c3 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Thu, 18 Aug 2016 15:35:37 +0000 Subject: [PATCH 14/21] install the files too --- debian/clang-include-fixer-X.Y.install.in | 7 +++++++ debian/clang-include-fixer-X.Y.manpages.in | 2 ++ 2 files changed, 9 insertions(+) create mode 100644 debian/clang-include-fixer-X.Y.install.in create mode 100644 debian/clang-include-fixer-X.Y.manpages.in diff --git a/debian/clang-include-fixer-X.Y.install.in b/debian/clang-include-fixer-X.Y.install.in new file mode 100644 index 00000000..c39889ca --- /dev/null +++ b/debian/clang-include-fixer-X.Y.install.in @@ -0,0 +1,7 @@ +usr/bin/find-all-symbols-@LLVM_VERSION@ +usr/bin/clang-include-fixer-@LLVM_VERSION@ +usr/lib/llvm-@LLVM_VERSION@/bin/clang-include-fixer +usr/lib/llvm-@LLVM_VERSION@/bin/find-all-symbols +usr/lib/llvm-@LLVM_VERSION@/share/clang/clang-include-fixer.el +usr/lib/llvm-@LLVM_VERSION@/share/clang/run-find-all-symbols.py +usr/lib/llvm-@LLVM_VERSION@/share/clang/clang-include-fixer.py diff --git a/debian/clang-include-fixer-X.Y.manpages.in b/debian/clang-include-fixer-X.Y.manpages.in new file mode 100644 index 00000000..743c7c59 --- /dev/null +++ b/debian/clang-include-fixer-X.Y.manpages.in @@ -0,0 +1,2 @@ +debian/man/find-all-symbols-@LLVM_VERSION@.1 +debian/man/clang-include-fixer-@LLVM_VERSION@.1 From 98c787078e87ce0c777f0843955752ae4fd42ce7 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Thu, 18 Aug 2016 22:02:47 +0000 Subject: [PATCH 15/21] remove non existing file --- debian/clang-include-fixer-X.Y.install.in | 1 - 1 file changed, 1 deletion(-) diff --git a/debian/clang-include-fixer-X.Y.install.in b/debian/clang-include-fixer-X.Y.install.in index c39889ca..d8226a33 100644 --- a/debian/clang-include-fixer-X.Y.install.in +++ b/debian/clang-include-fixer-X.Y.install.in @@ -2,6 +2,5 @@ usr/bin/find-all-symbols-@LLVM_VERSION@ usr/bin/clang-include-fixer-@LLVM_VERSION@ usr/lib/llvm-@LLVM_VERSION@/bin/clang-include-fixer usr/lib/llvm-@LLVM_VERSION@/bin/find-all-symbols -usr/lib/llvm-@LLVM_VERSION@/share/clang/clang-include-fixer.el usr/lib/llvm-@LLVM_VERSION@/share/clang/run-find-all-symbols.py usr/lib/llvm-@LLVM_VERSION@/share/clang/clang-include-fixer.py From 77a35ba96ee2ce876d2d658a395b094080e60f2a Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Fri, 19 Aug 2016 07:57:30 +0000 Subject: [PATCH 16/21] fix the changelog --- debian/changelog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 03104b24..f0ffb279 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,7 +5,7 @@ llvm-toolchain-3.9 (1:3.9~+rc1-1~exp2) experimental; urgency=medium * Add symlink from ./build to ../share and ../lib etc Thanks to Ximin Luo for the patch (Closes: #834144) - -- + -- Sylvestre Ledru Fri, 19 Aug 2016 09:57:21 +0200 llvm-toolchain-3.9 (1:3.9~+rc1-1~exp1) experimental; urgency=medium From 0209d1f00b76d14e60cf5a8c3d54d9be9b8f545e Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Sat, 20 Aug 2016 11:43:55 +0000 Subject: [PATCH 17/21] New RC release --- debian/changelog | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index f0ffb279..76d9d92a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,5 +1,6 @@ -llvm-toolchain-3.9 (1:3.9~+rc1-1~exp2) experimental; urgency=medium +llvm-toolchain-3.9 (1:3.9~+rc2-1~exp1) experimental; urgency=medium + * New RC release * Introduce clang-include-fixer-3.9 * Disable the build of lldb on mips64el, ppc64 and s390x for real * Add symlink from ./build to ../share and ../lib etc From 078edc07c59b106b6c4837b73b5f091d7bbd8372 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Thu, 25 Aug 2016 21:43:19 +0000 Subject: [PATCH 18/21] new RC release --- debian/changelog | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/debian/changelog b/debian/changelog index 76d9d92a..a65c84f0 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +llvm-toolchain-3.9 (1:3.9~+rc3-1~exp1) experimental; urgency=medium + + * new RC release + + -- Sylvestre Ledru Thu, 25 Aug 2016 16:54:25 +0200 + llvm-toolchain-3.9 (1:3.9~+rc2-1~exp1) experimental; urgency=medium * New RC release From 5b373e73146a0e59fee415e79a587b8397ad3cc0 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Fri, 26 Aug 2016 21:36:32 +0000 Subject: [PATCH 19/21] * Fix the renaming of the manpages (Closes: #834077) * Fix a crash with clang-tidy (Closes: #833802) Fixed in 1:3.9~+rc1-1~exp1 --- debian/changelog | 8 ++++++++ debian/rules | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index a65c84f0..4e931f20 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +llvm-toolchain-3.9 (1:3.9~+rc3-1~exp2) experimental; urgency=medium + + * Fix the renaming of the manpages (Closes: #834077) + * Fix a crash with clang-tidy (Closes: #833802) + Fixed in 1:3.9~+rc1-1~exp1 + + -- Sylvestre Ledru Fri, 26 Aug 2016 23:34:16 +0200 + llvm-toolchain-3.9 (1:3.9~+rc3-1~exp1) experimental; urgency=medium * new RC release diff --git a/debian/rules b/debian/rules index 86565157..40d7fde8 100755 --- a/debian/rules +++ b/debian/rules @@ -249,7 +249,7 @@ 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) # Rename manpages - d=$(TARGET_BUILD)/docs/man/; \ + d=$(TARGET_BUILD)/docs/_build/man/; \ if test -d $$d; then \ cd $$d; \ for f in *.1; do \ From 25fa4b413493829015ee923d266e4e31253e2c53 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Sat, 27 Aug 2016 12:41:16 +0000 Subject: [PATCH 20/21] fix the path in which man pages are now generated --- debian/rules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/rules b/debian/rules index 40d7fde8..86565157 100755 --- a/debian/rules +++ b/debian/rules @@ -249,7 +249,7 @@ 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) # Rename manpages - d=$(TARGET_BUILD)/docs/_build/man/; \ + d=$(TARGET_BUILD)/docs/man/; \ if test -d $$d; then \ cd $$d; \ for f in *.1; do \ From a9ab44f72ba7fe0cf2d84021e2f445a9770b328f Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Sat, 27 Aug 2016 12:58:58 +0000 Subject: [PATCH 21/21] Use the manpage from clang.rst instead of help2man --- debian/changelog | 1 + debian/clang-X.Y.manpages.in | 5 +++-- debian/rules | 14 ++++++++------ 3 files changed, 12 insertions(+), 8 deletions(-) diff --git a/debian/changelog b/debian/changelog index 4e931f20..09d1d2a1 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,7 @@ llvm-toolchain-3.9 (1:3.9~+rc3-1~exp2) experimental; urgency=medium * Fix the renaming of the manpages (Closes: #834077) + * Use the manpage from clang.rst instead of help2man * Fix a crash with clang-tidy (Closes: #833802) Fixed in 1:3.9~+rc1-1~exp1 diff --git a/debian/clang-X.Y.manpages.in b/debian/clang-X.Y.manpages.in index a7215f7c..ef0d30e9 100644 --- a/debian/clang-X.Y.manpages.in +++ b/debian/clang-X.Y.manpages.in @@ -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-rename-@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/scan-view-@LLVM_VERSION@.1 debian/man/modularize-@LLVM_VERSION@.1 -clang/tools/scan-build/man/scan-build-@LLVM_VERSION@.1 + diff --git a/debian/rules b/debian/rules index 86565157..f228daa6 100755 --- a/debian/rules +++ b/debian/rules @@ -249,16 +249,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) # Rename manpages - d=$(TARGET_BUILD)/docs/man/; \ + d=$(CURDIR)/docs/_build/man/; \ if test -d $$d; then \ - cd $$d; \ - for f in *.1; do \ - echo "$$f"|grep $(LLVM_VERSION) || mv $$f `echo $$f|sed "s|\.1|-$(LLVM_VERSION).1|"`; \ - done; \ + cd $$d; \ + for f in *.1; do \ + echo "$$f"|grep $(LLVM_VERSION) || mv $$f `echo $$f|sed "s|\.1|-$(LLVM_VERSION).1|"`; \ + done; \ + else \ + echo "could not find $$d"; \ fi # the clang doc generation only generates clang manpage # 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 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 \