From 4543161de1f94eb194efaee0cfd98a989243310f Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Thu, 24 Jul 2014 15:33:19 +0000 Subject: [PATCH 01/41] clang-X suggests clang-X-doc (Closes: #755922) --- debian/changelog | 1 + debian/control | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index f180c750..47da9765 100644 --- a/debian/changelog +++ b/debian/changelog @@ -6,6 +6,7 @@ llvm-toolchain-3.4 (1:3.4.2-6) unstable; urgency=medium of using *.install files. In llvm.org/apt/, I have to sometime disable polly * hurd-EIEIO-undef.diff: try to undef an errno.h to fix the ftbfs + * clang-X suggests clang-X-doc (Closes: #755922) -- Sylvestre Ledru Wed, 23 Jul 2014 13:02:56 +0200 diff --git a/debian/control b/debian/control index 38e7a064..e0eae770 100644 --- a/debian/control +++ b/debian/control @@ -25,7 +25,7 @@ Depends: ${shlibs:Depends}, ${misc:Depends}, ${dep:devlibs}, libclang1-3.4 (= ${binary:Version}), libc6-dev Provides: c-compiler, objc-compiler, c++-compiler Recommends: llvm-3.4-dev, python -Suggests: gnustep, gnustep-devel +Suggests: gnustep, gnustep-devel, clang-3.4-doc Replaces: clang (<< 1:3.4), clang-3.1, clang-3.2, clang-3.3, compiler-rt, llvm-3.4 (<< 1:3.4~svn194058) Breaks: clang (<< 1:3.4), clang-3.1, clang-3.2, clang-3.3, compiler-rt, From a068b0d1d2109ccd2ee718c36b1203e99e087388 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Sun, 27 Jul 2014 20:43:46 +0000 Subject: [PATCH 02/41] Manage all files using .in mecanism. It will simplify the upgrade of version --- debian/changelog | 2 ++ ...ang-3.4-doc.docs => clang-X.Y-doc.docs.in} | 0 ...4-doc.install => clang-X.Y-doc.install.in} | 0 ...xamples => clang-X.Y-examples.examples.in} | 0 ...clang-3.4.install => clang-X.Y.install.in} | 0 .../{clang-3.4.links => clang-X.Y.links.in} | 0 ...errides => clang-X.Y.lintian-overrides.in} | 0 ...ang-3.4.manpages => clang-X.Y.manpages.in} | 0 ...ang-3.4.postinst => clang-X.Y.postinst.in} | 0 .../{clang-3.4.prerm => clang-X.Y.prerm.in} | 0 ....4.install => clang-format-X.Y.install.in} | 0 ... => clang-format-X.Y.lintian-overrides.in} | 0 ....manpages => clang-format-X.Y.manpages.in} | 0 ...install => clang-modernize-X.Y.install.in} | 0 ... clang-modernize-X.Y.lintian-overrides.in} | 0 ...npages => clang-modernize-X.Y.manpages.in} | 0 ...ev.install => libclang-X.Y-dev.install.in} | 0 ...dev.links.in => libclang-X.Y-dev.links.in} | 0 ...all => libclang-common-X.Y-dev.install.in} | 0 ...links => libclang-common-X.Y-dev.links.in} | 0 ....4.install.in => libclang1-X.Y.install.in} | 0 ...g1-3.4.links.in => libclang1-X.Y.links.in} | 0 ...des => libclang1-X.Y.lintian-overrides.in} | 0 ...1-3.4.symbols => libclang1-X.Y.symbols.in} | 0 ...dev.META => libllvm-X.Y-ocaml-dev.META.in} | 0 ....dirs.in => libllvm-X.Y-ocaml-dev.dirs.in} | 0 ...base => libllvm-X.Y-ocaml-dev.doc-base.in} | 0 ...ll.in => libllvm-X.Y-ocaml-dev.install.in} | 0 ...ibllvm-X.Y-ocaml-dev.lintian-overrides.in} | 0 debian/libllvm3.4.links.in | 2 -- ...vm3.4.install.in => libllvmX.Y.install.in} | 0 ...rrides => libllvmX.Y.lintian-overrides.in} | 0 ....4-dev.install => lldb-X.Y-dev.install.in} | 0 ...ldb-3.4.install.in => lldb-X.Y.install.in} | 0 .../{lldb-3.4.links.in => lldb-X.Y.links.in} | 0 ...verrides => lldb-X.Y.lintian-overrides.in} | 0 ...lldb-3.4.manpages => lldb-X.Y.manpages.in} | 0 ...lldb-3.4.postinst => lldb-X.Y.postinst.in} | 0 ...llvm-3.4-dev.dirs => llvm-X.Y-dev.dirs.in} | 0 ....4-dev.install => llvm-X.Y-dev.install.in} | 0 ...3.4-dev.links.in => llvm-X.Y-dev.links.in} | 0 ...llvm-3.4-doc.dirs => llvm-X.Y-doc.dirs.in} | 0 ....4-doc.install => llvm-X.Y-doc.install.in} | 0 ...xamples.dirs => llvm-X.Y-examples.dirs.in} | 0 ...examples => llvm-X.Y-examples.examples.in} | 0 ...mples.links => llvm-X.Y-examples.links.in} | 0 ...e.binfmt.in => llvm-X.Y-runtime.binfmt.in} | 0 ...me.install => llvm-X.Y-runtime.install.in} | 0 ...untime.links => llvm-X.Y-runtime.links.in} | 0 ....manpages => llvm-X.Y-runtime.manpages.in} | 0 ....postinst => llvm-X.Y-runtime.postinst.in} | 0 ...ime.prerm.in => llvm-X.Y-runtime.prerm.in} | 0 ...-3.4-tools.dirs => llvm-X.Y-tools.dirs.in} | 0 ...ools.install => llvm-X.Y-tools.install.in} | 0 debian/{llvm-3.4.dirs => llvm-X.Y.dirs.in} | 0 .../{llvm-3.4.install => llvm-X.Y.install.in} | 0 debian/{llvm-3.4.links => llvm-X.Y.links.in} | 0 ...verrides => llvm-X.Y.lintian-overrides.in} | 0 ...llvm-3.4.manpages => llvm-X.Y.manpages.in} | 0 ....4.install => python-clang-X.Y.install.in} | 0 debian/rules | 21 ++++++++++++------- 61 files changed, 16 insertions(+), 9 deletions(-) rename debian/{clang-3.4-doc.docs => clang-X.Y-doc.docs.in} (100%) rename debian/{clang-3.4-doc.install => clang-X.Y-doc.install.in} (100%) rename debian/{clang-3.4-examples.examples => clang-X.Y-examples.examples.in} (100%) rename debian/{clang-3.4.install => clang-X.Y.install.in} (100%) rename debian/{clang-3.4.links => clang-X.Y.links.in} (100%) rename debian/{clang-3.4.lintian-overrides => clang-X.Y.lintian-overrides.in} (100%) rename debian/{clang-3.4.manpages => clang-X.Y.manpages.in} (100%) rename debian/{clang-3.4.postinst => clang-X.Y.postinst.in} (100%) rename debian/{clang-3.4.prerm => clang-X.Y.prerm.in} (100%) rename debian/{clang-format-3.4.install => clang-format-X.Y.install.in} (100%) rename debian/{clang-format-3.4.lintian-overrides => clang-format-X.Y.lintian-overrides.in} (100%) rename debian/{clang-format-3.4.manpages => clang-format-X.Y.manpages.in} (100%) rename debian/{clang-modernize-3.4.install => clang-modernize-X.Y.install.in} (100%) rename debian/{clang-modernize-3.4.lintian-overrides => clang-modernize-X.Y.lintian-overrides.in} (100%) rename debian/{clang-modernize-3.4.manpages => clang-modernize-X.Y.manpages.in} (100%) rename debian/{libclang-3.4-dev.install => libclang-X.Y-dev.install.in} (100%) rename debian/{libclang-3.4-dev.links.in => libclang-X.Y-dev.links.in} (100%) rename debian/{libclang-common-3.4-dev.install => libclang-common-X.Y-dev.install.in} (100%) rename debian/{libclang-common-3.4-dev.links => libclang-common-X.Y-dev.links.in} (100%) rename debian/{libclang1-3.4.install.in => libclang1-X.Y.install.in} (100%) rename debian/{libclang1-3.4.links.in => libclang1-X.Y.links.in} (100%) rename debian/{libclang1-3.4.lintian-overrides => libclang1-X.Y.lintian-overrides.in} (100%) rename debian/{libclang1-3.4.symbols => libclang1-X.Y.symbols.in} (100%) rename debian/{libllvm-3.4-ocaml-dev.META => libllvm-X.Y-ocaml-dev.META.in} (100%) rename debian/{libllvm-3.4-ocaml-dev.dirs.in => libllvm-X.Y-ocaml-dev.dirs.in} (100%) rename debian/{libllvm-3.4-ocaml-dev.doc-base => libllvm-X.Y-ocaml-dev.doc-base.in} (100%) rename debian/{libllvm-3.4-ocaml-dev.install.in => libllvm-X.Y-ocaml-dev.install.in} (100%) rename debian/{libllvm-3.4-ocaml-dev.lintian-overrides => libllvm-X.Y-ocaml-dev.lintian-overrides.in} (100%) delete mode 100644 debian/libllvm3.4.links.in rename debian/{libllvm3.4.install.in => libllvmX.Y.install.in} (100%) rename debian/{libllvm3.4.lintian-overrides => libllvmX.Y.lintian-overrides.in} (100%) rename debian/{lldb-3.4-dev.install => lldb-X.Y-dev.install.in} (100%) rename debian/{lldb-3.4.install.in => lldb-X.Y.install.in} (100%) rename debian/{lldb-3.4.links.in => lldb-X.Y.links.in} (100%) rename debian/{lldb-3.4.lintian-overrides => lldb-X.Y.lintian-overrides.in} (100%) rename debian/{lldb-3.4.manpages => lldb-X.Y.manpages.in} (100%) rename debian/{lldb-3.4.postinst => lldb-X.Y.postinst.in} (100%) rename debian/{llvm-3.4-dev.dirs => llvm-X.Y-dev.dirs.in} (100%) rename debian/{llvm-3.4-dev.install => llvm-X.Y-dev.install.in} (100%) rename debian/{llvm-3.4-dev.links.in => llvm-X.Y-dev.links.in} (100%) rename debian/{llvm-3.4-doc.dirs => llvm-X.Y-doc.dirs.in} (100%) rename debian/{llvm-3.4-doc.install => llvm-X.Y-doc.install.in} (100%) rename debian/{llvm-3.4-examples.dirs => llvm-X.Y-examples.dirs.in} (100%) rename debian/{llvm-3.4-examples.examples => llvm-X.Y-examples.examples.in} (100%) rename debian/{llvm-3.4-examples.links => llvm-X.Y-examples.links.in} (100%) rename debian/{llvm-3.4-runtime.binfmt.in => llvm-X.Y-runtime.binfmt.in} (100%) rename debian/{llvm-3.4-runtime.install => llvm-X.Y-runtime.install.in} (100%) rename debian/{llvm-3.4-runtime.links => llvm-X.Y-runtime.links.in} (100%) rename debian/{llvm-3.4-runtime.manpages => llvm-X.Y-runtime.manpages.in} (100%) rename debian/{llvm-3.4-runtime.postinst => llvm-X.Y-runtime.postinst.in} (100%) rename debian/{llvm-3.4-runtime.prerm.in => llvm-X.Y-runtime.prerm.in} (100%) rename debian/{llvm-3.4-tools.dirs => llvm-X.Y-tools.dirs.in} (100%) rename debian/{llvm-3.4-tools.install => llvm-X.Y-tools.install.in} (100%) rename debian/{llvm-3.4.dirs => llvm-X.Y.dirs.in} (100%) rename debian/{llvm-3.4.install => llvm-X.Y.install.in} (100%) rename debian/{llvm-3.4.links => llvm-X.Y.links.in} (100%) rename debian/{llvm-3.4.lintian-overrides => llvm-X.Y.lintian-overrides.in} (100%) rename debian/{llvm-3.4.manpages => llvm-X.Y.manpages.in} (100%) rename debian/{python-clang-3.4.install => python-clang-X.Y.install.in} (100%) diff --git a/debian/changelog b/debian/changelog index 47da9765..396e078d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -7,6 +7,8 @@ llvm-toolchain-3.4 (1:3.4.2-6) unstable; urgency=medium polly * hurd-EIEIO-undef.diff: try to undef an errno.h to fix the ftbfs * clang-X suggests clang-X-doc (Closes: #755922) + * Manage all files using .in mecanism. It will simplify the upgrade of + version -- Sylvestre Ledru Wed, 23 Jul 2014 13:02:56 +0200 diff --git a/debian/clang-3.4-doc.docs b/debian/clang-X.Y-doc.docs.in similarity index 100% rename from debian/clang-3.4-doc.docs rename to debian/clang-X.Y-doc.docs.in diff --git a/debian/clang-3.4-doc.install b/debian/clang-X.Y-doc.install.in similarity index 100% rename from debian/clang-3.4-doc.install rename to debian/clang-X.Y-doc.install.in diff --git a/debian/clang-3.4-examples.examples b/debian/clang-X.Y-examples.examples.in similarity index 100% rename from debian/clang-3.4-examples.examples rename to debian/clang-X.Y-examples.examples.in diff --git a/debian/clang-3.4.install b/debian/clang-X.Y.install.in similarity index 100% rename from debian/clang-3.4.install rename to debian/clang-X.Y.install.in diff --git a/debian/clang-3.4.links b/debian/clang-X.Y.links.in similarity index 100% rename from debian/clang-3.4.links rename to debian/clang-X.Y.links.in diff --git a/debian/clang-3.4.lintian-overrides b/debian/clang-X.Y.lintian-overrides.in similarity index 100% rename from debian/clang-3.4.lintian-overrides rename to debian/clang-X.Y.lintian-overrides.in diff --git a/debian/clang-3.4.manpages b/debian/clang-X.Y.manpages.in similarity index 100% rename from debian/clang-3.4.manpages rename to debian/clang-X.Y.manpages.in diff --git a/debian/clang-3.4.postinst b/debian/clang-X.Y.postinst.in similarity index 100% rename from debian/clang-3.4.postinst rename to debian/clang-X.Y.postinst.in diff --git a/debian/clang-3.4.prerm b/debian/clang-X.Y.prerm.in similarity index 100% rename from debian/clang-3.4.prerm rename to debian/clang-X.Y.prerm.in diff --git a/debian/clang-format-3.4.install b/debian/clang-format-X.Y.install.in similarity index 100% rename from debian/clang-format-3.4.install rename to debian/clang-format-X.Y.install.in diff --git a/debian/clang-format-3.4.lintian-overrides b/debian/clang-format-X.Y.lintian-overrides.in similarity index 100% rename from debian/clang-format-3.4.lintian-overrides rename to debian/clang-format-X.Y.lintian-overrides.in diff --git a/debian/clang-format-3.4.manpages b/debian/clang-format-X.Y.manpages.in similarity index 100% rename from debian/clang-format-3.4.manpages rename to debian/clang-format-X.Y.manpages.in diff --git a/debian/clang-modernize-3.4.install b/debian/clang-modernize-X.Y.install.in similarity index 100% rename from debian/clang-modernize-3.4.install rename to debian/clang-modernize-X.Y.install.in diff --git a/debian/clang-modernize-3.4.lintian-overrides b/debian/clang-modernize-X.Y.lintian-overrides.in similarity index 100% rename from debian/clang-modernize-3.4.lintian-overrides rename to debian/clang-modernize-X.Y.lintian-overrides.in diff --git a/debian/clang-modernize-3.4.manpages b/debian/clang-modernize-X.Y.manpages.in similarity index 100% rename from debian/clang-modernize-3.4.manpages rename to debian/clang-modernize-X.Y.manpages.in diff --git a/debian/libclang-3.4-dev.install b/debian/libclang-X.Y-dev.install.in similarity index 100% rename from debian/libclang-3.4-dev.install rename to debian/libclang-X.Y-dev.install.in diff --git a/debian/libclang-3.4-dev.links.in b/debian/libclang-X.Y-dev.links.in similarity index 100% rename from debian/libclang-3.4-dev.links.in rename to debian/libclang-X.Y-dev.links.in diff --git a/debian/libclang-common-3.4-dev.install b/debian/libclang-common-X.Y-dev.install.in similarity index 100% rename from debian/libclang-common-3.4-dev.install rename to debian/libclang-common-X.Y-dev.install.in diff --git a/debian/libclang-common-3.4-dev.links b/debian/libclang-common-X.Y-dev.links.in similarity index 100% rename from debian/libclang-common-3.4-dev.links rename to debian/libclang-common-X.Y-dev.links.in diff --git a/debian/libclang1-3.4.install.in b/debian/libclang1-X.Y.install.in similarity index 100% rename from debian/libclang1-3.4.install.in rename to debian/libclang1-X.Y.install.in diff --git a/debian/libclang1-3.4.links.in b/debian/libclang1-X.Y.links.in similarity index 100% rename from debian/libclang1-3.4.links.in rename to debian/libclang1-X.Y.links.in diff --git a/debian/libclang1-3.4.lintian-overrides b/debian/libclang1-X.Y.lintian-overrides.in similarity index 100% rename from debian/libclang1-3.4.lintian-overrides rename to debian/libclang1-X.Y.lintian-overrides.in diff --git a/debian/libclang1-3.4.symbols b/debian/libclang1-X.Y.symbols.in similarity index 100% rename from debian/libclang1-3.4.symbols rename to debian/libclang1-X.Y.symbols.in diff --git a/debian/libllvm-3.4-ocaml-dev.META b/debian/libllvm-X.Y-ocaml-dev.META.in similarity index 100% rename from debian/libllvm-3.4-ocaml-dev.META rename to debian/libllvm-X.Y-ocaml-dev.META.in diff --git a/debian/libllvm-3.4-ocaml-dev.dirs.in b/debian/libllvm-X.Y-ocaml-dev.dirs.in similarity index 100% rename from debian/libllvm-3.4-ocaml-dev.dirs.in rename to debian/libllvm-X.Y-ocaml-dev.dirs.in diff --git a/debian/libllvm-3.4-ocaml-dev.doc-base b/debian/libllvm-X.Y-ocaml-dev.doc-base.in similarity index 100% rename from debian/libllvm-3.4-ocaml-dev.doc-base rename to debian/libllvm-X.Y-ocaml-dev.doc-base.in diff --git a/debian/libllvm-3.4-ocaml-dev.install.in b/debian/libllvm-X.Y-ocaml-dev.install.in similarity index 100% rename from debian/libllvm-3.4-ocaml-dev.install.in rename to debian/libllvm-X.Y-ocaml-dev.install.in diff --git a/debian/libllvm-3.4-ocaml-dev.lintian-overrides b/debian/libllvm-X.Y-ocaml-dev.lintian-overrides.in similarity index 100% rename from debian/libllvm-3.4-ocaml-dev.lintian-overrides rename to debian/libllvm-X.Y-ocaml-dev.lintian-overrides.in diff --git a/debian/libllvm3.4.links.in b/debian/libllvm3.4.links.in deleted file mode 100644 index 9a00059a..00000000 --- a/debian/libllvm3.4.links.in +++ /dev/null @@ -1,2 +0,0 @@ -usr/lib/llvm-3.4/lib/libLLVM-3.4.2.so.1 /usr/lib/@DEB_HOST_MULTIARCH@/libLLVM-3.4.so.1 - diff --git a/debian/libllvm3.4.install.in b/debian/libllvmX.Y.install.in similarity index 100% rename from debian/libllvm3.4.install.in rename to debian/libllvmX.Y.install.in diff --git a/debian/libllvm3.4.lintian-overrides b/debian/libllvmX.Y.lintian-overrides.in similarity index 100% rename from debian/libllvm3.4.lintian-overrides rename to debian/libllvmX.Y.lintian-overrides.in diff --git a/debian/lldb-3.4-dev.install b/debian/lldb-X.Y-dev.install.in similarity index 100% rename from debian/lldb-3.4-dev.install rename to debian/lldb-X.Y-dev.install.in diff --git a/debian/lldb-3.4.install.in b/debian/lldb-X.Y.install.in similarity index 100% rename from debian/lldb-3.4.install.in rename to debian/lldb-X.Y.install.in diff --git a/debian/lldb-3.4.links.in b/debian/lldb-X.Y.links.in similarity index 100% rename from debian/lldb-3.4.links.in rename to debian/lldb-X.Y.links.in diff --git a/debian/lldb-3.4.lintian-overrides b/debian/lldb-X.Y.lintian-overrides.in similarity index 100% rename from debian/lldb-3.4.lintian-overrides rename to debian/lldb-X.Y.lintian-overrides.in diff --git a/debian/lldb-3.4.manpages b/debian/lldb-X.Y.manpages.in similarity index 100% rename from debian/lldb-3.4.manpages rename to debian/lldb-X.Y.manpages.in diff --git a/debian/lldb-3.4.postinst b/debian/lldb-X.Y.postinst.in similarity index 100% rename from debian/lldb-3.4.postinst rename to debian/lldb-X.Y.postinst.in diff --git a/debian/llvm-3.4-dev.dirs b/debian/llvm-X.Y-dev.dirs.in similarity index 100% rename from debian/llvm-3.4-dev.dirs rename to debian/llvm-X.Y-dev.dirs.in diff --git a/debian/llvm-3.4-dev.install b/debian/llvm-X.Y-dev.install.in similarity index 100% rename from debian/llvm-3.4-dev.install rename to debian/llvm-X.Y-dev.install.in diff --git a/debian/llvm-3.4-dev.links.in b/debian/llvm-X.Y-dev.links.in similarity index 100% rename from debian/llvm-3.4-dev.links.in rename to debian/llvm-X.Y-dev.links.in diff --git a/debian/llvm-3.4-doc.dirs b/debian/llvm-X.Y-doc.dirs.in similarity index 100% rename from debian/llvm-3.4-doc.dirs rename to debian/llvm-X.Y-doc.dirs.in diff --git a/debian/llvm-3.4-doc.install b/debian/llvm-X.Y-doc.install.in similarity index 100% rename from debian/llvm-3.4-doc.install rename to debian/llvm-X.Y-doc.install.in diff --git a/debian/llvm-3.4-examples.dirs b/debian/llvm-X.Y-examples.dirs.in similarity index 100% rename from debian/llvm-3.4-examples.dirs rename to debian/llvm-X.Y-examples.dirs.in diff --git a/debian/llvm-3.4-examples.examples b/debian/llvm-X.Y-examples.examples.in similarity index 100% rename from debian/llvm-3.4-examples.examples rename to debian/llvm-X.Y-examples.examples.in diff --git a/debian/llvm-3.4-examples.links b/debian/llvm-X.Y-examples.links.in similarity index 100% rename from debian/llvm-3.4-examples.links rename to debian/llvm-X.Y-examples.links.in diff --git a/debian/llvm-3.4-runtime.binfmt.in b/debian/llvm-X.Y-runtime.binfmt.in similarity index 100% rename from debian/llvm-3.4-runtime.binfmt.in rename to debian/llvm-X.Y-runtime.binfmt.in diff --git a/debian/llvm-3.4-runtime.install b/debian/llvm-X.Y-runtime.install.in similarity index 100% rename from debian/llvm-3.4-runtime.install rename to debian/llvm-X.Y-runtime.install.in diff --git a/debian/llvm-3.4-runtime.links b/debian/llvm-X.Y-runtime.links.in similarity index 100% rename from debian/llvm-3.4-runtime.links rename to debian/llvm-X.Y-runtime.links.in diff --git a/debian/llvm-3.4-runtime.manpages b/debian/llvm-X.Y-runtime.manpages.in similarity index 100% rename from debian/llvm-3.4-runtime.manpages rename to debian/llvm-X.Y-runtime.manpages.in diff --git a/debian/llvm-3.4-runtime.postinst b/debian/llvm-X.Y-runtime.postinst.in similarity index 100% rename from debian/llvm-3.4-runtime.postinst rename to debian/llvm-X.Y-runtime.postinst.in diff --git a/debian/llvm-3.4-runtime.prerm.in b/debian/llvm-X.Y-runtime.prerm.in similarity index 100% rename from debian/llvm-3.4-runtime.prerm.in rename to debian/llvm-X.Y-runtime.prerm.in diff --git a/debian/llvm-3.4-tools.dirs b/debian/llvm-X.Y-tools.dirs.in similarity index 100% rename from debian/llvm-3.4-tools.dirs rename to debian/llvm-X.Y-tools.dirs.in diff --git a/debian/llvm-3.4-tools.install b/debian/llvm-X.Y-tools.install.in similarity index 100% rename from debian/llvm-3.4-tools.install rename to debian/llvm-X.Y-tools.install.in diff --git a/debian/llvm-3.4.dirs b/debian/llvm-X.Y.dirs.in similarity index 100% rename from debian/llvm-3.4.dirs rename to debian/llvm-X.Y.dirs.in diff --git a/debian/llvm-3.4.install b/debian/llvm-X.Y.install.in similarity index 100% rename from debian/llvm-3.4.install rename to debian/llvm-X.Y.install.in diff --git a/debian/llvm-3.4.links b/debian/llvm-X.Y.links.in similarity index 100% rename from debian/llvm-3.4.links rename to debian/llvm-X.Y.links.in diff --git a/debian/llvm-3.4.lintian-overrides b/debian/llvm-X.Y.lintian-overrides.in similarity index 100% rename from debian/llvm-3.4.lintian-overrides rename to debian/llvm-X.Y.lintian-overrides.in diff --git a/debian/llvm-3.4.manpages b/debian/llvm-X.Y.manpages.in similarity index 100% rename from debian/llvm-3.4.manpages rename to debian/llvm-X.Y.manpages.in diff --git a/debian/python-clang-3.4.install b/debian/python-clang-X.Y.install.in similarity index 100% rename from debian/python-clang-3.4.install rename to debian/python-clang-X.Y.install.in diff --git a/debian/rules b/debian/rules index 8b20b116..e4bfc538 100755 --- a/debian/rules +++ b/debian/rules @@ -130,14 +130,22 @@ endif dh $@ --with ocaml -debian/%: debian/%.in - sed -e 's|@DEB_HOST_MULTIARCH@|$(DEB_HOST_MULTIARCH)|g' -e "s|@OCAML_STDLIB_DIR@|$(OCAML_STDLIB_DIR)|g" -e "s|@LLVM_VERSION@|$(LLVM_VERSION)|g" $< > $@ + +preconfigure: + for f in debian/*.in; do \ + f2=$$(echo $$f | sed 's/\.in$$//;s/X\.Y/$(LLVM_VERSION)/'); \ + echo "$$f => $$f2"; \ + sed -e 's|@DEB_HOST_MULTIARCH@|$(DEB_HOST_MULTIARCH)|g' \ + -e "s|@OCAML_STDLIB_DIR@|$(OCAML_STDLIB_DIR)|g" \ + -e "s|@LLVM_VERSION@|$(LLVM_VERSION)|g" $$f > $$f2; \ + done # Override this two targets. They are trying to manage the .in conversion for me override_dh_ocamlinit: override_dh_ocamlclean: -override_dh_auto_configure: debian/lldb-$(LLVM_VERSION).install debian/libclang1-$(LLVM_VERSION).install.in debian/lldb-$(LLVM_VERSION).links debian/libllvm$(LLVM_VERSION).install debian/llvm-$(LLVM_VERSION)-dev.links debian/libllvm-$(LLVM_VERSION)-ocaml-dev.install debian/libllvm-$(LLVM_VERSION)-ocaml-dev.dirs debian/llvm-$(LLVM_VERSION)-runtime.binfmt debian/llvm-$(LLVM_VERSION)-runtime.prerm debian/libclang-$(LLVM_VERSION)-dev.links debian/libclang1-$(LLVM_VERSION).install debian/pollycc + +override_dh_auto_configure: preconfigure echo "Using gcc: " $(CC) -v mkdir -p $(TARGET_BUILD) @@ -343,16 +351,12 @@ override_dh_installman: rm -f $(CURDIR)/debian/llvm-$(LLVM_VERSION)/usr/share/man/man1/lli* -.PHONY: override_dh_strip override_dh_strip: dh_strip -p libclang$(SONAME_EXT)-$(LLVM_VERSION) --dbg-package=libclang$(SONAME_EXT)-$(LLVM_VERSION)-dbg dh_strip -p libllvm$(LLVM_VERSION) --dbg-package=libllvm$(LLVM_VERSION)-dbg dh_strip -a -#override_dh_shlibdeps: -# LD_LIBRARY_PATH=$$LD_LIBRARY_PATH:$(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/lib/ dh_shlibdeps - override_dh_install: dh_install --fail-missing @@ -444,3 +448,6 @@ override_dh_auto_clean: rm -f $(CURDIR)/utils/vim/llvm-$(LLVM_VERSION).vim $(CURDIR)/utils/vim/tablegen-$(LLVM_VERSION).vim rm -f $(CURDIR)/clang/tools/clang-format/clang-format-diff-$(LLVM_VERSION) rm -f $(CURDIR)/clang/tools/clang-format/clang-format-$(LLVM_VERSION).py + + +.PHONY: override_dh_strip preconfigure From 5541b3aca23f4af58f982a2724fb91e41c56f6c2 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Sun, 27 Jul 2014 20:50:31 +0000 Subject: [PATCH 03/41] also manage files with the LLVM_VERSION & LLVM_VERSION_FULL --- debian/changelog | 2 +- debian/clang-X.Y-doc.install.in | 6 +-- debian/clang-X.Y.install.in | 34 +++++++------- debian/clang-X.Y.links.in | 20 ++++----- debian/clang-X.Y.lintian-overrides.in | 6 +-- debian/clang-format-X.Y.install.in | 10 ++--- debian/clang-format-X.Y.lintian-overrides.in | 4 +- debian/clang-format-X.Y.manpages.in | 2 +- debian/clang-modernize-X.Y.install.in | 4 +- .../clang-modernize-X.Y.lintian-overrides.in | 2 +- debian/clang-modernize-X.Y.manpages.in | 2 +- debian/libclang-X.Y-dev.install.in | 10 ++--- debian/libclang-X.Y-dev.links.in | 6 +-- debian/libclang-common-X.Y-dev.install.in | 8 ++-- debian/libclang-common-X.Y-dev.links.in | 12 ++--- debian/libclang1-X.Y.install.in | 4 +- debian/libclang1-X.Y.links.in | 2 +- debian/libclang1-X.Y.lintian-overrides.in | 2 +- debian/libclang1-X.Y.symbols.in | 44 +++++++++---------- debian/libllvm-X.Y-ocaml-dev.META.in | 28 ++++++------ debian/libllvm-X.Y-ocaml-dev.doc-base.in | 6 +-- debian/libllvm-X.Y-ocaml-dev.install.in | 4 +- ...libllvm-X.Y-ocaml-dev.lintian-overrides.in | 2 +- debian/libllvmX.Y.install.in | 2 +- debian/libllvmX.Y.lintian-overrides.in | 2 +- debian/lldb-X.Y-dev.install.in | 4 +- debian/lldb-X.Y.install.in | 10 ++--- debian/lldb-X.Y.links.in | 12 ++--- debian/lldb-X.Y.lintian-overrides.in | 6 +-- debian/lldb-X.Y.manpages.in | 2 +- debian/llvm-X.Y-dev.dirs.in | 10 ++--- debian/llvm-X.Y-dev.install.in | 38 ++++++++-------- debian/llvm-X.Y-dev.links.in | 22 +++++----- debian/llvm-X.Y-doc.dirs.in | 2 +- debian/llvm-X.Y-doc.install.in | 12 ++--- debian/llvm-X.Y-examples.dirs.in | 2 +- debian/llvm-X.Y-examples.links.in | 6 +-- debian/llvm-X.Y-runtime.install.in | 10 ++--- debian/llvm-X.Y-runtime.postinst.in | 2 +- debian/llvm-X.Y-tools.dirs.in | 4 +- debian/llvm-X.Y-tools.install.in | 16 +++---- debian/llvm-X.Y.dirs.in | 4 +- debian/llvm-X.Y.install.in | 10 ++--- debian/llvm-X.Y.lintian-overrides.in | 16 +++---- debian/llvm-X.Y.manpages.in | 16 +++---- debian/rules | 1 + 46 files changed, 215 insertions(+), 214 deletions(-) diff --git a/debian/changelog b/debian/changelog index 396e078d..c8f5d728 100644 --- a/debian/changelog +++ b/debian/changelog @@ -8,7 +8,7 @@ llvm-toolchain-3.4 (1:3.4.2-6) unstable; urgency=medium * hurd-EIEIO-undef.diff: try to undef an errno.h to fix the ftbfs * clang-X suggests clang-X-doc (Closes: #755922) * Manage all files using .in mecanism. It will simplify the upgrade of - version + version + file names -- Sylvestre Ledru Wed, 23 Jul 2014 13:02:56 +0200 diff --git a/debian/clang-X.Y-doc.install.in b/debian/clang-X.Y-doc.install.in index 4dfcdbb4..877ca598 100644 --- a/debian/clang-X.Y-doc.install.in +++ b/debian/clang-X.Y-doc.install.in @@ -1,3 +1,3 @@ -usr/lib/llvm-3.4/docs/llvm/html/clang/manpage.css -usr/lib/llvm-3.4/docs/llvm/html/clang/clang.html -usr/lib/llvm-3.4/docs/llvm/ps/clang.ps +usr/lib/llvm-@LLVM_VERSION@/docs/llvm/html/clang/manpage.css +usr/lib/llvm-@LLVM_VERSION@/docs/llvm/html/clang/clang.html +usr/lib/llvm-@LLVM_VERSION@/docs/llvm/ps/clang.ps diff --git a/debian/clang-X.Y.install.in b/debian/clang-X.Y.install.in index 8ef5d908..07476e5e 100644 --- a/debian/clang-X.Y.install.in +++ b/debian/clang-X.Y.install.in @@ -1,11 +1,11 @@ -usr/lib/llvm-3.4/bin/clang -usr/lib/llvm-3.4/bin/clang++ -usr/lib/llvm-3.4/bin/clang-check -usr/lib/llvm-3.4/bin/clang-tblgen -usr/lib/llvm-3.4/bin/c-index-test -usr/lib/llvm-3.4/bin/clang-apply-replacements -usr/lib/llvm-3.4/bin/clang-tidy -usr/lib/llvm-3.4/bin/pp-trace +usr/lib/llvm-@LLVM_VERSION@/bin/clang +usr/lib/llvm-@LLVM_VERSION@/bin/clang++ +usr/lib/llvm-@LLVM_VERSION@/bin/clang-check +usr/lib/llvm-@LLVM_VERSION@/bin/clang-tblgen +usr/lib/llvm-@LLVM_VERSION@/bin/c-index-test +usr/lib/llvm-@LLVM_VERSION@/bin/clang-apply-replacements +usr/lib/llvm-@LLVM_VERSION@/bin/clang-tidy +usr/lib/llvm-@LLVM_VERSION@/bin/pp-trace usr/bin/c-index-test* tools/clang/tools/scan-build /usr/share/clang/ @@ -13,13 +13,13 @@ tools/clang/tools/scan-view /usr/share/clang/ #usr/share/man/man1/clang.1 usr/share/man/man1/ debian/pollycc /usr/bin/ -usr/bin/clang-3.4 -usr/bin/clang++-3.4 -usr/bin/clang-check-3.4 -usr/bin/clang-tblgen-3.4 -usr/bin/c-index-test-3.4 -usr/bin/clang-apply-replacements-3.4 -usr/bin/clang-tidy-3.4 -usr/bin/pp-trace-3.4 +usr/bin/clang-@LLVM_VERSION@ +usr/bin/clang++-@LLVM_VERSION@ +usr/bin/clang-check-@LLVM_VERSION@ +usr/bin/clang-tblgen-@LLVM_VERSION@ +usr/bin/c-index-test-@LLVM_VERSION@ +usr/bin/clang-apply-replacements-@LLVM_VERSION@ +usr/bin/clang-tidy-@LLVM_VERSION@ +usr/bin/pp-trace-@LLVM_VERSION@ -usr/lib/llvm-3.4/share/man/man1/clang.1 +usr/lib/llvm-@LLVM_VERSION@/share/man/man1/clang.1 diff --git a/debian/clang-X.Y.links.in b/debian/clang-X.Y.links.in index e36d05fc..1451dc25 100644 --- a/debian/clang-X.Y.links.in +++ b/debian/clang-X.Y.links.in @@ -1,14 +1,14 @@ -usr/share/man/man1/clang-3.4.1.gz usr/share/man/man1/llvm-clang.1.gz -usr/share/man/man1/clang-3.4.1.gz usr/share/man/man1/clang++.1.gz +usr/share/man/man1/clang-@LLVM_VERSION@.1.gz usr/share/man/man1/llvm-clang.1.gz +usr/share/man/man1/clang-@LLVM_VERSION@.1.gz usr/share/man/man1/clang++.1.gz /usr/share/clang/scan-build/scan-build /usr/bin/scan-build /usr/share/clang/scan-view/scan-view /usr/bin/scan-view /usr/bin/clang /usr/bin/llvm-clang -usr/bin/clang-3.4 usr/bin/clang -usr/bin/clang++-3.4 usr/bin/clang++ -usr/bin/clang-check-3.4 usr/bin/clang-check -usr/bin/clang-tblgen-3.4 usr/bin/clang-tblgen -usr/bin/c-index-test-3.4 usr/bin/c-index-test -usr/bin/clang-apply-replacements-3.4 usr/bin/clang-apply-replacements -usr/bin/clang-tidy-3.4 usr/bin/clang-tidy -usr/bin/pp-trace-3.4 usr/bin/pp-trace +usr/bin/clang-@LLVM_VERSION@ usr/bin/clang +usr/bin/clang++-@LLVM_VERSION@ usr/bin/clang++ +usr/bin/clang-check-@LLVM_VERSION@ usr/bin/clang-check +usr/bin/clang-tblgen-@LLVM_VERSION@ usr/bin/clang-tblgen +usr/bin/c-index-test-@LLVM_VERSION@ usr/bin/c-index-test +usr/bin/clang-apply-replacements-@LLVM_VERSION@ usr/bin/clang-apply-replacements +usr/bin/clang-tidy-@LLVM_VERSION@ usr/bin/clang-tidy +usr/bin/pp-trace-@LLVM_VERSION@ usr/bin/pp-trace diff --git a/debian/clang-X.Y.lintian-overrides.in b/debian/clang-X.Y.lintian-overrides.in index 890b17a7..52efa24f 100644 --- a/debian/clang-X.Y.lintian-overrides.in +++ b/debian/clang-X.Y.lintian-overrides.in @@ -1,4 +1,4 @@ # I know but well... -clang-3.4: manpage-has-useless-whatis-entry usr/share/man/man1/clang-check.1.gz -clang-3.4: manpage-has-useless-whatis-entry usr/share/man/man1/clang-tblgen.1.gz -clang-3.4: manpage-has-useless-whatis-entry usr/share/man/man1/scan-view.1.gz +clang-@LLVM_VERSION@: manpage-has-useless-whatis-entry usr/share/man/man1/clang-check.1.gz +clang-@LLVM_VERSION@: manpage-has-useless-whatis-entry usr/share/man/man1/clang-tblgen.1.gz +clang-@LLVM_VERSION@: manpage-has-useless-whatis-entry usr/share/man/man1/scan-view.1.gz diff --git a/debian/clang-format-X.Y.install.in b/debian/clang-format-X.Y.install.in index 68b087da..8e968405 100644 --- a/debian/clang-format-X.Y.install.in +++ b/debian/clang-format-X.Y.install.in @@ -1,5 +1,5 @@ -clang/tools/clang-format/clang-format-3.4.py usr/share/vim/addons/syntax/ -clang/tools/clang-format/clang-format-diff-3.4 /usr/bin/ -clang/tools/clang-format/clang-format.el usr/share/emacs/site-lisp/clang-format-3.4/ -usr/bin/clang-format-3.4 -usr/lib/llvm-3.4/bin/clang-format +clang/tools/clang-format/clang-format-@LLVM_VERSION@.py usr/share/vim/addons/syntax/ +clang/tools/clang-format/clang-format-diff-@LLVM_VERSION@ /usr/bin/ +clang/tools/clang-format/clang-format.el usr/share/emacs/site-lisp/clang-format-@LLVM_VERSION@/ +usr/bin/clang-format-@LLVM_VERSION@ +usr/lib/llvm-@LLVM_VERSION@/bin/clang-format diff --git a/debian/clang-format-X.Y.lintian-overrides.in b/debian/clang-format-X.Y.lintian-overrides.in index cd34b189..aa786799 100644 --- a/debian/clang-format-X.Y.lintian-overrides.in +++ b/debian/clang-format-X.Y.lintian-overrides.in @@ -1,4 +1,4 @@ # I know but well... -clang-format-3.4: manpage-has-useless-whatis-entry usr/share/man/man1/clang-format-diff-3.4.1.gz -clang-format-3.4: manpage-has-useless-whatis-entry usr/share/man/man1/clang-format-3.4.1.gz +clang-format-@LLVM_VERSION@: manpage-has-useless-whatis-entry usr/share/man/man1/clang-format-diff-@LLVM_VERSION@.1.gz +clang-format-@LLVM_VERSION@: manpage-has-useless-whatis-entry usr/share/man/man1/clang-format-@LLVM_VERSION@.1.gz diff --git a/debian/clang-format-X.Y.manpages.in b/debian/clang-format-X.Y.manpages.in index 636bc81e..a073eda3 100644 --- a/debian/clang-format-X.Y.manpages.in +++ b/debian/clang-format-X.Y.manpages.in @@ -1,2 +1,2 @@ -debian/man/clang-format-diff-3.4.1 +debian/man/clang-format-diff-@LLVM_VERSION@.1 diff --git a/debian/clang-modernize-X.Y.install.in b/debian/clang-modernize-X.Y.install.in index a05991a9..3400bb61 100644 --- a/debian/clang-modernize-X.Y.install.in +++ b/debian/clang-modernize-X.Y.install.in @@ -1,2 +1,2 @@ -usr/lib/llvm-3.4/bin/clang-modernize -usr/bin/clang-modernize-3.4 +usr/lib/llvm-@LLVM_VERSION@/bin/clang-modernize +usr/bin/clang-modernize-@LLVM_VERSION@ diff --git a/debian/clang-modernize-X.Y.lintian-overrides.in b/debian/clang-modernize-X.Y.lintian-overrides.in index 40dff786..bbb307e2 100644 --- a/debian/clang-modernize-X.Y.lintian-overrides.in +++ b/debian/clang-modernize-X.Y.lintian-overrides.in @@ -1,2 +1,2 @@ # I know but well... -clang-modernize-3.4: manpage-has-useless-whatis-entry usr/share/man/man1/clang-modernize-3.4.1.gz +clang-modernize-@LLVM_VERSION@: manpage-has-useless-whatis-entry usr/share/man/man1/clang-modernize-@LLVM_VERSION@.1.gz diff --git a/debian/clang-modernize-X.Y.manpages.in b/debian/clang-modernize-X.Y.manpages.in index 539cd271..bff37127 100644 --- a/debian/clang-modernize-X.Y.manpages.in +++ b/debian/clang-modernize-X.Y.manpages.in @@ -1 +1 @@ -debian/man/clang-modernize-3.4.1 +debian/man/clang-modernize-@LLVM_VERSION@.1 diff --git a/debian/libclang-X.Y-dev.install.in b/debian/libclang-X.Y-dev.install.in index 2ad16bc1..eeb39575 100644 --- a/debian/libclang-X.Y-dev.install.in +++ b/debian/libclang-X.Y-dev.install.in @@ -1,10 +1,10 @@ -usr/lib/llvm-3.4/include/clang -usr/lib/llvm-3.4/include/clang-c -usr/lib/llvm-3.4/lib/libclang*a +usr/lib/llvm-@LLVM_VERSION@/include/clang +usr/lib/llvm-@LLVM_VERSION@/include/clang-c +usr/lib/llvm-@LLVM_VERSION@/lib/libclang*a -usr/lib/llvm-3.4/lib/libmodernizeCore.a +usr/lib/llvm-@LLVM_VERSION@/lib/libmodernizeCore.a -build-llvm/tools/clang/runtime/compiler-rt/clang_linux/ usr/lib/llvm-3.4/lib/clang/3.4.2/lib/ +build-llvm/tools/clang/runtime/compiler-rt/clang_linux/ usr/lib/llvm-@LLVM_VERSION@/lib/clang/@LLVM_VERSION_FULL@/lib/ #usr/include/clang /usr/include/ #usr/include/clang-c /usr/include/ diff --git a/debian/libclang-X.Y-dev.links.in b/debian/libclang-X.Y-dev.links.in index 611ca4cd..e5025d27 100644 --- a/debian/libclang-X.Y-dev.links.in +++ b/debian/libclang-X.Y-dev.links.in @@ -1,3 +1,3 @@ -usr/lib/@DEB_HOST_MULTIARCH@/libclang-3.4.so.1 usr/lib/@DEB_HOST_MULTIARCH@/libclang-3.4.so -usr/lib/@DEB_HOST_MULTIARCH@/libclang-3.4.so.1 usr/lib/llvm-3.4/lib/libclang-3.4.so -usr/lib/@DEB_HOST_MULTIARCH@/libclang-3.4.so.1 usr/lib/llvm-3.4/lib/libclang.so +usr/lib/@DEB_HOST_MULTIARCH@/libclang-@LLVM_VERSION@.so.1 usr/lib/@DEB_HOST_MULTIARCH@/libclang-@LLVM_VERSION@.so +usr/lib/@DEB_HOST_MULTIARCH@/libclang-@LLVM_VERSION@.so.1 usr/lib/llvm-@LLVM_VERSION@/lib/libclang-@LLVM_VERSION@.so +usr/lib/@DEB_HOST_MULTIARCH@/libclang-@LLVM_VERSION@.so.1 usr/lib/llvm-@LLVM_VERSION@/lib/libclang.so diff --git a/debian/libclang-common-X.Y-dev.install.in b/debian/libclang-common-X.Y-dev.install.in index 18dc4578..2d0077c1 100644 --- a/debian/libclang-common-X.Y-dev.install.in +++ b/debian/libclang-common-X.Y-dev.install.in @@ -1,7 +1,7 @@ -usr/lib/llvm-3.4/lib/clang/3.4.2/include +usr/lib/llvm-@LLVM_VERSION@/lib/clang/@LLVM_VERSION_FULL@/include -usr/lib/llvm-3.4/lib/clang/3.4.2/lib +usr/lib/llvm-@LLVM_VERSION@/lib/clang/@LLVM_VERSION_FULL@/lib -#usr/lib/clang/3.4/lib /usr/lib/clang/3.4/ -#usr/lib/clang/3.4/include/ /usr/include/clang/3.4/ +#usr/lib/clang/@LLVM_VERSION@/lib /usr/lib/clang/@LLVM_VERSION@/ +#usr/lib/clang/@LLVM_VERSION@/include/ /usr/include/clang/@LLVM_VERSION@/ diff --git a/debian/libclang-common-X.Y-dev.links.in b/debian/libclang-common-X.Y-dev.links.in index 734b2393..0b56aa0d 100644 --- a/debian/libclang-common-X.Y-dev.links.in +++ b/debian/libclang-common-X.Y-dev.links.in @@ -1,6 +1,6 @@ -usr/lib/llvm-3.4/lib/clang/3.4.2/include usr/include/clang/3.4/include -usr/lib/llvm-3.4/lib/clang/3.4.2/include usr/lib/clang/3.4/include -usr/lib/llvm-3.4/lib/clang/3.4.2/lib usr/lib/clang/3.4/lib -usr/lib/llvm-3.4/lib/clang/3.4.2/include usr/include/clang/3.4.2/include -usr/lib/llvm-3.4/lib/clang/3.4.2/include usr/lib/clang/3.4.2/include -usr/lib/llvm-3.4/lib/clang/3.4.2/lib usr/lib/clang/3.4.2/lib \ No newline at end of file +usr/lib/llvm-@LLVM_VERSION@/lib/clang/@LLVM_VERSION_FULL@/include usr/include/clang/@LLVM_VERSION@/include +usr/lib/llvm-@LLVM_VERSION@/lib/clang/@LLVM_VERSION_FULL@/include usr/lib/clang/@LLVM_VERSION@/include +usr/lib/llvm-@LLVM_VERSION@/lib/clang/@LLVM_VERSION_FULL@/lib usr/lib/clang/@LLVM_VERSION@/lib +usr/lib/llvm-@LLVM_VERSION@/lib/clang/@LLVM_VERSION_FULL@/include usr/include/clang/@LLVM_VERSION_FULL@/include +usr/lib/llvm-@LLVM_VERSION@/lib/clang/@LLVM_VERSION_FULL@/include usr/lib/clang/@LLVM_VERSION_FULL@/include +usr/lib/llvm-@LLVM_VERSION@/lib/clang/@LLVM_VERSION_FULL@/lib usr/lib/clang/@LLVM_VERSION_FULL@/lib \ No newline at end of file diff --git a/debian/libclang1-X.Y.install.in b/debian/libclang1-X.Y.install.in index eb534313..d44e84f6 100644 --- a/debian/libclang1-X.Y.install.in +++ b/debian/libclang1-X.Y.install.in @@ -1,2 +1,2 @@ -usr/lib/llvm-3.4/lib/libclang-3.4.so.1 /usr/lib/@DEB_HOST_MULTIARCH@/ -usr/lib/llvm-3.4/lib/libclang.so.1 +usr/lib/llvm-@LLVM_VERSION@/lib/libclang-@LLVM_VERSION@.so.1 /usr/lib/@DEB_HOST_MULTIARCH@/ +usr/lib/llvm-@LLVM_VERSION@/lib/libclang.so.1 diff --git a/debian/libclang1-X.Y.links.in b/debian/libclang1-X.Y.links.in index 50ecb228..6784ba82 100644 --- a/debian/libclang1-X.Y.links.in +++ b/debian/libclang1-X.Y.links.in @@ -1,2 +1,2 @@ -usr/lib/@DEB_HOST_MULTIARCH@/libclang-3.4.so.1 usr/lib/llvm-3.4/lib/libclang-3.4.so.1 +usr/lib/@DEB_HOST_MULTIARCH@/libclang-@LLVM_VERSION@.so.1 usr/lib/llvm-@LLVM_VERSION@/lib/libclang-@LLVM_VERSION@.so.1 diff --git a/debian/libclang1-X.Y.lintian-overrides.in b/debian/libclang1-X.Y.lintian-overrides.in index c311a192..096da0c0 100644 --- a/debian/libclang1-X.Y.lintian-overrides.in +++ b/debian/libclang1-X.Y.lintian-overrides.in @@ -1,2 +1,2 @@ # I know and I am not planning to change that. -libclang1-3.4: package-name-doesnt-match-sonames libclang1 \ No newline at end of file +libclang1-@LLVM_VERSION@: package-name-doesnt-match-sonames libclang1 \ No newline at end of file diff --git a/debian/libclang1-X.Y.symbols.in b/debian/libclang1-X.Y.symbols.in index 875c2ce0..e6fcc4ef 100644 --- a/debian/libclang1-X.Y.symbols.in +++ b/debian/libclang1-X.Y.symbols.in @@ -1,4 +1,4 @@ -libclang.so.1 libclang1-3.4 #MINVER# +libclang.so.1 libclang1-@LLVM_VERSION@ #MINVER# clang_BlockCommandComment_getArgText@Base 3.2 clang_BlockCommandComment_getCommandName@Base 3.2 clang_BlockCommandComment_getNumArgs@Base 3.2 @@ -7,7 +7,7 @@ libclang.so.1 libclang1-3.4 #MINVER# clang_CXCursorSet_insert@Base 3.2 clang_CXIndex_getGlobalOptions@Base 3.2 clang_CXIndex_setGlobalOptions@Base 3.2 - clang_CXXMethod_isPureVirtual@Base 1:3.4 + clang_CXXMethod_isPureVirtual@Base 1:@LLVM_VERSION@ clang_CXXMethod_isStatic@Base 3.2 clang_CXXMethod_isVirtual@Base 3.2 clang_Comment_getChild@Base 3.2 @@ -16,7 +16,7 @@ libclang.so.1 libclang1-3.4 #MINVER# clang_Comment_isWhitespace@Base 3.2 clang_CompilationDatabase_dispose@Base 3.2 clang_CompilationDatabase_fromDirectory@Base 3.2 - clang_CompilationDatabase_getAllCompileCommands@Base 1:3.4 + clang_CompilationDatabase_getAllCompileCommands@Base 1:@LLVM_VERSION@ clang_CompilationDatabase_getCompileCommands@Base 3.2 clang_CompileCommand_getArg@Base 3.2 clang_CompileCommand_getDirectory@Base 3.2 @@ -29,19 +29,19 @@ libclang.so.1 libclang1-3.4 #MINVER# clang_Cursor_getCommentRange@Base 3.2 clang_Cursor_getModule@Base 3.2 clang_Cursor_getNumArguments@Base 3.2 - clang_Cursor_getObjCDeclQualifiers@Base 1:3.4 - clang_Cursor_getObjCPropertyAttributes@Base 1:3.4 + clang_Cursor_getObjCDeclQualifiers@Base 1:@LLVM_VERSION@ + clang_Cursor_getObjCPropertyAttributes@Base 1:@LLVM_VERSION@ clang_Cursor_getObjCSelectorIndex@Base 3.2 clang_Cursor_getParsedComment@Base 3.2 clang_Cursor_getRawCommentText@Base 3.2 clang_Cursor_getReceiverType@Base 3.2 clang_Cursor_getSpellingNameRange@Base 3.2 clang_Cursor_getTranslationUnit@Base 3.2 - clang_Cursor_isBitField@Base 1:3.4 + clang_Cursor_isBitField@Base 1:@LLVM_VERSION@ clang_Cursor_isDynamicCall@Base 3.2 clang_Cursor_isNull@Base 3.2 - clang_Cursor_isObjCOptional@Base 1:3.4 - clang_Cursor_isVariadic@Base 1:3.4 + clang_Cursor_isObjCOptional@Base 1:@LLVM_VERSION@ + clang_Cursor_isVariadic@Base 1:@LLVM_VERSION@ clang_FullComment_getAsHTML@Base 3.2 clang_FullComment_getAsXML@Base 3.2 clang_HTMLStartTagComment_isSelfClosing@Base 3.2 @@ -57,9 +57,9 @@ libclang.so.1 libclang1-3.4 #MINVER# clang_InlineCommandComment_getNumArgs@Base 3.2 clang_InlineCommandComment_getRenderKind@Base 3.2 clang_InlineContentComment_hasTrailingNewline@Base 3.2 - clang_Location_isFromMainFile@Base 1:3.4 - clang_Location_isInSystemHeader@Base 1:3.4 - clang_Module_getASTFile@Base 1:3.4 + clang_Location_isFromMainFile@Base 1:@LLVM_VERSION@ + clang_Location_isInSystemHeader@Base 1:@LLVM_VERSION@ + clang_Module_getASTFile@Base 1:@LLVM_VERSION@ clang_Module_getFullName@Base 3.2 clang_Module_getName@Base 3.2 clang_Module_getNumTopLevelHeaders@Base 3.2 @@ -76,11 +76,11 @@ libclang.so.1 libclang1-3.4 #MINVER# clang_TParamCommandComment_getParamName@Base 3.2 clang_TParamCommandComment_isParamPositionValid@Base 3.2 clang_TextComment_getText@Base 3.2 - clang_Type_getAlignOf@Base 1:3.4 - clang_Type_getCXXRefQualifier@Base 1:3.4 - clang_Type_getClassType@Base 1:3.4 - clang_Type_getOffsetOf@Base 1:3.4 - clang_Type_getSizeOf@Base 1:3.4 + clang_Type_getAlignOf@Base 1:@LLVM_VERSION@ + clang_Type_getCXXRefQualifier@Base 1:@LLVM_VERSION@ + clang_Type_getClassType@Base 1:@LLVM_VERSION@ + clang_Type_getOffsetOf@Base 1:@LLVM_VERSION@ + clang_Type_getSizeOf@Base 1:@LLVM_VERSION@ clang_VerbatimBlockLineComment_getText@Base 3.2 clang_VerbatimLineComment_getText@Base 3.2 clang_annotateTokens@Base 3.2 @@ -123,8 +123,8 @@ libclang.so.1 libclang1-3.4 #MINVER# clang_equalRanges@Base 3.2 clang_equalTypes@Base 3.2 clang_executeOnThread@Base 3.2 - clang_findIncludesInFile@Base 1:3.4 - clang_findIncludesInFileWithBlock@Base 1:3.4 + clang_findIncludesInFile@Base 1:@LLVM_VERSION@ + clang_findIncludesInFileWithBlock@Base 1:@LLVM_VERSION@ clang_findReferencesInFile@Base 3.2 clang_findReferencesInFileWithBlock@Base 3.2 clang_formatDiagnostic@Base 3.2 @@ -188,12 +188,12 @@ libclang.so.1 libclang1-3.4 #MINVER# clang_getEnumConstantDeclValue@Base 3.2 clang_getEnumDeclIntegerType@Base 3.2 clang_getExpansionLocation@Base 3.2 - clang_getFieldDeclBitWidth@Base 1:3.4 + clang_getFieldDeclBitWidth@Base 1:@LLVM_VERSION@ clang_getFile@Base 3.2 - clang_getFileLocation@Base 1:3.4 + clang_getFileLocation@Base 1:@LLVM_VERSION@ clang_getFileName@Base 3.2 clang_getFileTime@Base 3.2 - clang_getFileUniqueID@Base 1:3.4 + clang_getFileUniqueID@Base 1:@LLVM_VERSION@ clang_getFunctionTypeCallingConv@Base 3.2 clang_getIBOutletCollectionType@Base 3.2 clang_getIncludedFile@Base 3.2 @@ -232,7 +232,7 @@ libclang.so.1 libclang1-3.4 #MINVER# clang_getTranslationUnitSpelling@Base 3.2 clang_getTypeDeclaration@Base 3.2 clang_getTypeKindSpelling@Base 3.2 - clang_getTypeSpelling@Base 1:3.4 + clang_getTypeSpelling@Base 1:@LLVM_VERSION@ clang_getTypedefDeclUnderlyingType@Base 3.2 clang_hashCursor@Base 3.2 clang_indexLoc_getCXSourceLocation@Base 3.2 diff --git a/debian/libllvm-X.Y-ocaml-dev.META.in b/debian/libllvm-X.Y-ocaml-dev.META.in index c8fc9ad0..366820d9 100644 --- a/debian/libllvm-X.Y-ocaml-dev.META.in +++ b/debian/libllvm-X.Y-ocaml-dev.META.in @@ -1,7 +1,7 @@ description = "Low Level Virtual Machine bindings" -version = "3.4" +version = "@LLVM_VERSION@" -directory = "+llvm-3.4" +directory = "+llvm-@LLVM_VERSION@" archive(byte) = "llvm.cma" archive(native) = "llvm.cmxa" @@ -9,8 +9,8 @@ linkopts = "-cclib -lstdc++ -cclib -lllvm" package "executionengine" ( - requires = "llvm-3_4" - version = "3.4" + requires = "llvm-@LLVM_VERSION@" + version = "@LLVM_VERSION@" archive(native) = "llvm_executionengine.cmxa" archive(byte) = "llvm_executionengine.cma" linkopts = "-cclib -lllvm_executionengine" @@ -18,8 +18,8 @@ package "executionengine" package "target" ( - requires = "llvm-3_4" - version = "3.4" + requires = "llvm-@LLVM_VERSION@" + version = "@LLVM_VERSION@" archive(native) = "llvm_target.cmxa" archive(byte) = "llvm_target.cma" linkopts = "-cclib -lllvm_target" @@ -27,8 +27,8 @@ package "target" package "scalar_opts" ( - requires = "llvm-3_4 llvm-3_4.target" - version = "3.4" + requires = "llvm-@LLVM_VERSION@ llvm-@LLVM_VERSION@.target" + version = "@LLVM_VERSION@" archive(native) = "llvm_scalar_opts.cmxa" archive(byte) = "llvm_scalar_opts.cma" linkopts = "-cclib -lllvm_scalar_opts" @@ -36,8 +36,8 @@ package "scalar_opts" package "analysis" ( - requires = "llvm-3_4" - version = "3.4" + requires = "llvm-@LLVM_VERSION@" + version = "@LLVM_VERSION@" archive(native) = "llvm_analysis.cmxa" archive(byte) = "llvm_analysis.cma" linkopts = "-cclib -lllvm_analysis" @@ -45,8 +45,8 @@ package "analysis" package "bitwriter" ( - requires = "llvm-3_4" - version = "3.4" + requires = "llvm-@LLVM_VERSION@" + version = "@LLVM_VERSION@" archive(native) = "llvm_bitwriter.cmxa" archive(byte) = "llvm_bitwriter.cma" linkopts = "-cclib -lllvm_bitwriter" @@ -54,8 +54,8 @@ package "bitwriter" package "bitreader" ( - requires = "llvm-3_4 llvm-3_4.bitwriter" - version = "3.4" + requires = "llvm-@LLVM_VERSION@ llvm-@LLVM_VERSION@.bitwriter" + version = "@LLVM_VERSION@" archive(native) = "llvm_bitreader.cmxa" archive(byte) = "llvm_bitreader.cma" linkopts = "-cclib -lllvm_bitreader" diff --git a/debian/libllvm-X.Y-ocaml-dev.doc-base.in b/debian/libllvm-X.Y-ocaml-dev.doc-base.in index 01042fd1..a5dc5fad 100644 --- a/debian/libllvm-X.Y-ocaml-dev.doc-base.in +++ b/debian/libllvm-X.Y-ocaml-dev.doc-base.in @@ -1,8 +1,8 @@ -Document: libllvm-3.4-ocaml-dev-ocamldoc-api-reference +Document: libllvm-@LLVM_VERSION@-ocaml-dev-ocamldoc-api-reference Title: Llvm OCamldoc API Reference Abstract: API reference manual for libllvm-ocaml-dev (generated via OCamldoc) Section: Programming/OCaml Format: HTML -Index: /usr/share/doc/libllvm-3.4-ocaml-dev/html/index.html -Files: /usr/share/doc/libllvm-3.4-ocaml-dev/html/* +Index: /usr/share/doc/libllvm-@LLVM_VERSION@-ocaml-dev/html/index.html +Files: /usr/share/doc/libllvm-@LLVM_VERSION@-ocaml-dev/html/* diff --git a/debian/libllvm-X.Y-ocaml-dev.install.in b/debian/libllvm-X.Y-ocaml-dev.install.in index 18bf7e4b..e04a63eb 100644 --- a/debian/libllvm-X.Y-ocaml-dev.install.in +++ b/debian/libllvm-X.Y-ocaml-dev.install.in @@ -1,2 +1,2 @@ -@OCAML_STDLIB_DIR@/llvm-3.4 @OCAML_STDLIB_DIR@/ -usr/lib/llvm-3.4/docs/llvm/ocamldoc/html usr/share/doc/libllvm-3.4-ocaml-dev/ +@OCAML_STDLIB_DIR@/llvm-@LLVM_VERSION@ @OCAML_STDLIB_DIR@/ +usr/lib/llvm-@LLVM_VERSION@/docs/llvm/ocamldoc/html usr/share/doc/libllvm-@LLVM_VERSION@-ocaml-dev/ diff --git a/debian/libllvm-X.Y-ocaml-dev.lintian-overrides.in b/debian/libllvm-X.Y-ocaml-dev.lintian-overrides.in index afa70d5c..5d25d442 100644 --- a/debian/libllvm-X.Y-ocaml-dev.lintian-overrides.in +++ b/debian/libllvm-X.Y-ocaml-dev.lintian-overrides.in @@ -1,2 +1,2 @@ # It is in the section ocaml which is fine. -libllvm-3.4-ocaml-dev: wrong-section-according-to-package-name libllvm-3.4-ocaml-dev => libdevel +libllvm-@LLVM_VERSION@-ocaml-dev: wrong-section-according-to-package-name libllvm-@LLVM_VERSION@-ocaml-dev => libdevel diff --git a/debian/libllvmX.Y.install.in b/debian/libllvmX.Y.install.in index 29368d96..f8d968f8 100644 --- a/debian/libllvmX.Y.install.in +++ b/debian/libllvmX.Y.install.in @@ -1 +1 @@ -usr/lib/llvm-3.4/lib/libLLVM-3.4.so.1 /usr/lib/@DEB_HOST_MULTIARCH@/ +usr/lib/llvm-@LLVM_VERSION@/lib/libLLVM-@LLVM_VERSION@.so.1 /usr/lib/@DEB_HOST_MULTIARCH@/ diff --git a/debian/libllvmX.Y.lintian-overrides.in b/debian/libllvmX.Y.lintian-overrides.in index 2ae98305..49f7ef24 100644 --- a/debian/libllvmX.Y.lintian-overrides.in +++ b/debian/libllvmX.Y.lintian-overrides.in @@ -1,2 +1,2 @@ # That is normal. Upstream does not match the debian convention -libllvm3.4: package-name-doesnt-match-sonames libLLVM-3.4-1 +libllvm@LLVM_VERSION@: package-name-doesnt-match-sonames libLLVM-@LLVM_VERSION@-1 diff --git a/debian/lldb-X.Y-dev.install.in b/debian/lldb-X.Y-dev.install.in index fb86ad4a..96c96b31 100644 --- a/debian/lldb-X.Y-dev.install.in +++ b/debian/lldb-X.Y-dev.install.in @@ -1,4 +1,4 @@ -/usr/lib/llvm-3.4/include/lldb -/usr/lib/llvm-3.4/lib/liblldb*a +/usr/lib/llvm-@LLVM_VERSION@/include/lldb +/usr/lib/llvm-@LLVM_VERSION@/lib/liblldb*a diff --git a/debian/lldb-X.Y.install.in b/debian/lldb-X.Y.install.in index 42f0dae9..1316fbe5 100644 --- a/debian/lldb-X.Y.install.in +++ b/debian/lldb-X.Y.install.in @@ -1,6 +1,6 @@ -usr/bin/lldb-3.4 -usr/bin/lldb-platform-3.4 -usr/lib/llvm-3.4/bin/lldb -usr/lib/llvm-3.4/bin/lldb-platform -usr/lib/llvm-3.4/lib/liblldb.so.1 /usr/lib/@DEB_HOST_MULTIARCH@/ +usr/bin/lldb-@LLVM_VERSION@ +usr/bin/lldb-platform-@LLVM_VERSION@ +usr/lib/llvm-@LLVM_VERSION@/bin/lldb +usr/lib/llvm-@LLVM_VERSION@/bin/lldb-platform +usr/lib/llvm-@LLVM_VERSION@/lib/liblldb.so.1 /usr/lib/@DEB_HOST_MULTIARCH@/ build-llvm/Release/lib/python2.7/site-packages/lldb/ /usr/lib/python2.7/dist-packages/ diff --git a/debian/lldb-X.Y.links.in b/debian/lldb-X.Y.links.in index 2b2359d5..5783897a 100644 --- a/debian/lldb-X.Y.links.in +++ b/debian/lldb-X.Y.links.in @@ -1,12 +1,12 @@ usr/lib/@DEB_HOST_MULTIARCH@/liblldb.so.1 usr/lib/@DEB_HOST_MULTIARCH@/liblldb.so usr/lib/@DEB_HOST_MULTIARCH@/liblldb.so.1 usr/lib/@DEB_HOST_MULTIARCH@/liblldb.so.1 usr/lib/@DEB_HOST_MULTIARCH@/liblldb.so usr/lib/python2.7/dist-packages/lldb/_lldb.so -usr/lib/@DEB_HOST_MULTIARCH@/liblldb.so.1 usr/lib/llvm-3.4/lib/liblldb.so.1 +usr/lib/@DEB_HOST_MULTIARCH@/liblldb.so.1 usr/lib/llvm-@LLVM_VERSION@/lib/liblldb.so.1 -usr/bin/lldb-3.4 usr/bin/lldb -usr/bin/lldb-platform-3.4 usr/bin/lldb-platform -usr/bin/lldb-gdbserver-3.4 usr/bin/lldb-gdbserver +usr/bin/lldb-@LLVM_VERSION@ usr/bin/lldb +usr/bin/lldb-platform-@LLVM_VERSION@ usr/bin/lldb-platform +usr/bin/lldb-gdbserver-@LLVM_VERSION@ usr/bin/lldb-gdbserver -usr/lib/@DEB_HOST_MULTIARCH@/libLLVM-3.4.2.so.1 usr/lib/python2.7/dist-packages/lldb/libLLVM-3.4.2.so.1 -usr/lib/@DEB_HOST_MULTIARCH@/libLLVM-3.4.2.so.1 usr/lib/python2.7/dist-packages/lldb/libLLVM-3.4.so.1 +usr/lib/@DEB_HOST_MULTIARCH@/libLLVM-@LLVM_VERSION_FULL@.so.1 usr/lib/python2.7/dist-packages/lldb/libLLVM-@LLVM_VERSION_FULL@.so.1 +usr/lib/@DEB_HOST_MULTIARCH@/libLLVM-@LLVM_VERSION_FULL@.so.1 usr/lib/python2.7/dist-packages/lldb/libLLVM-@LLVM_VERSION@.so.1 diff --git a/debian/lldb-X.Y.lintian-overrides.in b/debian/lldb-X.Y.lintian-overrides.in index ee479bdd..b4a7c0bc 100644 --- a/debian/lldb-X.Y.lintian-overrides.in +++ b/debian/lldb-X.Y.lintian-overrides.in @@ -1,5 +1,5 @@ # That is normal. The lib is not (yet?) shipped as a new package -lldb-3.4: package-name-doesnt-match-sonames liblldb -lldb-3.4: manpage-has-useless-whatis-entry usr/share/man/man1/lldb-3.4.1.gz +lldb-@LLVM_VERSION@: package-name-doesnt-match-sonames liblldb +lldb-@LLVM_VERSION@: manpage-has-useless-whatis-entry usr/share/man/man1/lldb-@LLVM_VERSION@.1.gz # For now, override this warning. We might create a -dev at some point -lldb-3.4: non-dev-pkg-with-shlib-symlink usr/lib/*/liblldb.so.1 usr/lib/*/liblldb.so \ No newline at end of file +lldb-@LLVM_VERSION@: non-dev-pkg-with-shlib-symlink usr/lib/*/liblldb.so.1 usr/lib/*/liblldb.so \ No newline at end of file diff --git a/debian/lldb-X.Y.manpages.in b/debian/lldb-X.Y.manpages.in index 456a421b..22dbbbcb 100644 --- a/debian/lldb-X.Y.manpages.in +++ b/debian/lldb-X.Y.manpages.in @@ -1,2 +1,2 @@ -debian/man/lldb-3.4.1 +debian/man/lldb-@LLVM_VERSION@.1 diff --git a/debian/llvm-X.Y-dev.dirs.in b/debian/llvm-X.Y-dev.dirs.in index 5dac3aa4..3b3b5862 100644 --- a/debian/llvm-X.Y-dev.dirs.in +++ b/debian/llvm-X.Y-dev.dirs.in @@ -1,5 +1,5 @@ -/usr/lib/llvm-3.4/lib -/usr/lib/llvm-3.4/build -/usr/lib/llvm-3.4/include -usr/share/doc/llvm-3.4-dev -usr/share/emacs/site-lisp/llvm-3.4 +/usr/lib/llvm-@LLVM_VERSION@/lib +/usr/lib/llvm-@LLVM_VERSION@/build +/usr/lib/llvm-@LLVM_VERSION@/include +usr/share/doc/llvm-@LLVM_VERSION@-dev +usr/share/emacs/site-lisp/llvm-@LLVM_VERSION@ diff --git a/debian/llvm-X.Y-dev.install.in b/debian/llvm-X.Y-dev.install.in index f2d33cd2..6ae258e1 100644 --- a/debian/llvm-X.Y-dev.install.in +++ b/debian/llvm-X.Y-dev.install.in @@ -1,22 +1,22 @@ -usr/lib/llvm-3.4/lib/libLLVM*.a -usr/lib/llvm-3.4/lib/libllvm*.a -usr/lib/llvm-3.4/lib/LLVM*.so -usr/lib/llvm-3.4/lib/libLTO.* -usr/lib/llvm-3.4/lib/BugpointPasses.so -usr/lib/llvm-3.4/include/llvm/ usr/include/llvm-3.4/ -usr/lib/llvm-3.4/include/llvm-c/ usr/include/llvm-c-3.4/ -cmake/modules/*.cmake usr/share/llvm-3.4/cmake/ +usr/lib/llvm-@LLVM_VERSION@/lib/libLLVM*.a +usr/lib/llvm-@LLVM_VERSION@/lib/libllvm*.a +usr/lib/llvm-@LLVM_VERSION@/lib/LLVM*.so +usr/lib/llvm-@LLVM_VERSION@/lib/libLTO.* +usr/lib/llvm-@LLVM_VERSION@/lib/BugpointPasses.so +usr/lib/llvm-@LLVM_VERSION@/include/llvm/ usr/include/llvm-@LLVM_VERSION@/ +usr/lib/llvm-@LLVM_VERSION@/include/llvm-c/ usr/include/llvm-c-@LLVM_VERSION@/ +cmake/modules/*.cmake usr/share/llvm-@LLVM_VERSION@/cmake/ -build-llvm/Makefile.common /usr/lib/llvm-3.4/build/ -build-llvm/Makefile.config /usr/lib/llvm-3.4/build/ -build-llvm/config.status /usr/lib/llvm-3.4/build/ -Makefile.rules /usr/lib/llvm-3.4/build/ -configure /usr/lib/llvm-3.4/build/ -autoconf/ /usr/lib/llvm-3.4/build/ +build-llvm/Makefile.common /usr/lib/llvm-@LLVM_VERSION@/build/ +build-llvm/Makefile.config /usr/lib/llvm-@LLVM_VERSION@/build/ +build-llvm/config.status /usr/lib/llvm-@LLVM_VERSION@/build/ +Makefile.rules /usr/lib/llvm-@LLVM_VERSION@/build/ +configure /usr/lib/llvm-@LLVM_VERSION@/build/ +autoconf/ /usr/lib/llvm-@LLVM_VERSION@/build/ -utils/vim/llvm-3.4.vim usr/share/vim/addons/syntax/ -utils/vim/tablegen-3.4.vim usr/share/vim/addons/syntax/ +utils/vim/llvm-@LLVM_VERSION@.vim usr/share/vim/addons/syntax/ +utils/vim/tablegen-@LLVM_VERSION@.vim usr/share/vim/addons/syntax/ -utils/emacs/emacs.el usr/share/emacs/site-lisp/llvm-3.4/ -utils/emacs/llvm-mode.el usr/share/emacs/site-lisp/llvm-3.4/ -utils/emacs/tablegen-mode.el usr/share/emacs/site-lisp/llvm-3.4/ +utils/emacs/emacs.el usr/share/emacs/site-lisp/llvm-@LLVM_VERSION@/ +utils/emacs/llvm-mode.el usr/share/emacs/site-lisp/llvm-@LLVM_VERSION@/ +utils/emacs/tablegen-mode.el usr/share/emacs/site-lisp/llvm-@LLVM_VERSION@/ diff --git a/debian/llvm-X.Y-dev.links.in b/debian/llvm-X.Y-dev.links.in index caf6b87b..f437d55d 100644 --- a/debian/llvm-X.Y-dev.links.in +++ b/debian/llvm-X.Y-dev.links.in @@ -1,12 +1,12 @@ -usr/lib/@DEB_HOST_MULTIARCH@/libLLVM-3.4.so.1 usr/lib/llvm-3.4/lib/libLLVM-3.4.so -usr/lib/@DEB_HOST_MULTIARCH@/libLLVM-3.4.so.1 usr/lib/llvm-3.4/lib/libLLVM-3.4.2.so.1 -usr/lib/@DEB_HOST_MULTIARCH@/libLLVM-3.4.so.1 usr/lib/llvm-3.4/lib/libLLVM-3.4.2.so -usr/lib/@DEB_HOST_MULTIARCH@/libLLVM-3.4.so.1 usr/lib/@DEB_HOST_MULTIARCH@/libLLVM-3.4.2.so.1 -usr/include/llvm-c-3.4/llvm-c usr/lib/llvm-3.4/include/llvm-c -usr/include/llvm-3.4/llvm usr/lib/llvm-3.4/include/llvm -usr/include/llvm-c-3.4/llvm-c usr/lib/llvm-3.4/build/include/llvm-c -usr/include/llvm-3.4/llvm usr/lib/llvm-3.4/build/include/llvm -usr/lib/llvm-3.4/include/ usr/lib/llvm-3.4/build/include -usr/lib/llvm-3.4/ usr/lib/llvm-3.4/build/Release -usr/lib/llvm-3.4/ usr/lib/llvm-3.4/build/Debug+Asserts +usr/lib/@DEB_HOST_MULTIARCH@/libLLVM-@LLVM_VERSION@.so.1 usr/lib/llvm-@LLVM_VERSION@/lib/libLLVM-@LLVM_VERSION@.so +usr/lib/@DEB_HOST_MULTIARCH@/libLLVM-@LLVM_VERSION@.so.1 usr/lib/llvm-@LLVM_VERSION@/lib/libLLVM-@LLVM_VERSION_FULL@.so.1 +usr/lib/@DEB_HOST_MULTIARCH@/libLLVM-@LLVM_VERSION@.so.1 usr/lib/llvm-@LLVM_VERSION@/lib/libLLVM-@LLVM_VERSION_FULL@.so +usr/lib/@DEB_HOST_MULTIARCH@/libLLVM-@LLVM_VERSION@.so.1 usr/lib/@DEB_HOST_MULTIARCH@/libLLVM-@LLVM_VERSION_FULL@.so.1 +usr/include/llvm-c-@LLVM_VERSION@/llvm-c usr/lib/llvm-@LLVM_VERSION@/include/llvm-c +usr/include/llvm-@LLVM_VERSION@/llvm usr/lib/llvm-@LLVM_VERSION@/include/llvm +usr/include/llvm-c-@LLVM_VERSION@/llvm-c usr/lib/llvm-@LLVM_VERSION@/build/include/llvm-c +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@/ usr/lib/llvm-@LLVM_VERSION@/build/Release +usr/lib/llvm-@LLVM_VERSION@/ usr/lib/llvm-@LLVM_VERSION@/build/Debug+Asserts diff --git a/debian/llvm-X.Y-doc.dirs.in b/debian/llvm-X.Y-doc.dirs.in index 5e1c9848..5379e8ec 100644 --- a/debian/llvm-X.Y-doc.dirs.in +++ b/debian/llvm-X.Y-doc.dirs.in @@ -1 +1 @@ -usr/share/doc/llvm-3.4-doc +usr/share/doc/llvm-@LLVM_VERSION@-doc diff --git a/debian/llvm-X.Y-doc.install.in b/debian/llvm-X.Y-doc.install.in index ddcb75fd..11d5d9fd 100644 --- a/debian/llvm-X.Y-doc.install.in +++ b/debian/llvm-X.Y-doc.install.in @@ -1,7 +1,7 @@ -docs/_build/html usr/share/doc/llvm-3.4-doc/ -usr/lib/llvm-3.4/docs/llvm/html.tar.gz -usr/lib/llvm-3.4/docs/llvm/ocamldoc.tar.gz -usr/lib/llvm-3.4/docs/llvm/html/Dummy.html -usr/lib/llvm-3.4/docs/llvm/html/doxygen.css -usr/lib/llvm-3.4/docs/llvm/html/LibASTMatchersReference.html +docs/_build/html usr/share/doc/llvm-@LLVM_VERSION@-doc/ +usr/lib/llvm-@LLVM_VERSION@/docs/llvm/html.tar.gz +usr/lib/llvm-@LLVM_VERSION@/docs/llvm/ocamldoc.tar.gz +usr/lib/llvm-@LLVM_VERSION@/docs/llvm/html/Dummy.html +usr/lib/llvm-@LLVM_VERSION@/docs/llvm/html/doxygen.css +usr/lib/llvm-@LLVM_VERSION@/docs/llvm/html/LibASTMatchersReference.html diff --git a/debian/llvm-X.Y-examples.dirs.in b/debian/llvm-X.Y-examples.dirs.in index 3e131339..a8b75c66 100644 --- a/debian/llvm-X.Y-examples.dirs.in +++ b/debian/llvm-X.Y-examples.dirs.in @@ -1 +1 @@ -usr/share/doc/llvm-3.4-examples +usr/share/doc/llvm-@LLVM_VERSION@-examples diff --git a/debian/llvm-X.Y-examples.links.in b/debian/llvm-X.Y-examples.links.in index 1496d2ee..a8d74aa2 100644 --- a/debian/llvm-X.Y-examples.links.in +++ b/debian/llvm-X.Y-examples.links.in @@ -1,3 +1,3 @@ -/usr/lib/llvm-3.4/build/Makefile.common usr/share/doc/llvm-3.4-examples/Makefile.common -/usr/lib/llvm-3.4/build/Makefile.config usr/share/doc/llvm-3.4-examples/Makefile.config -/usr/lib/llvm-3.4/build/Makefile.rules usr/share/doc/llvm-3.4-examples/Makefile.rules +/usr/lib/llvm-@LLVM_VERSION@/build/Makefile.common usr/share/doc/llvm-@LLVM_VERSION@-examples/Makefile.common +/usr/lib/llvm-@LLVM_VERSION@/build/Makefile.config usr/share/doc/llvm-@LLVM_VERSION@-examples/Makefile.config +/usr/lib/llvm-@LLVM_VERSION@/build/Makefile.rules usr/share/doc/llvm-@LLVM_VERSION@-examples/Makefile.rules diff --git a/debian/llvm-X.Y-runtime.install.in b/debian/llvm-X.Y-runtime.install.in index 7f21e53b..8072a312 100644 --- a/debian/llvm-X.Y-runtime.install.in +++ b/debian/llvm-X.Y-runtime.install.in @@ -1,7 +1,7 @@ -usr/lib/llvm-3.4/bin/lli -usr/lib/llvm-3.4/bin/lli-child-target +usr/lib/llvm-@LLVM_VERSION@/bin/lli +usr/lib/llvm-@LLVM_VERSION@/bin/lli-child-target -usr/bin/lli-3.4 -usr/bin/lli-child-target-3.4 +usr/bin/lli-@LLVM_VERSION@ +usr/bin/lli-child-target-@LLVM_VERSION@ -debian/llvm-3.4-runtime.binfmt usr/share/binfmts/ +debian/llvm-@LLVM_VERSION@-runtime.binfmt usr/share/binfmts/ diff --git a/debian/llvm-X.Y-runtime.postinst.in b/debian/llvm-X.Y-runtime.postinst.in index 9fbcd722..68300326 100644 --- a/debian/llvm-X.Y-runtime.postinst.in +++ b/debian/llvm-X.Y-runtime.postinst.in @@ -2,7 +2,7 @@ if test "$1" = "configure"; then if test -x /usr/sbin/update-binfmts; then - update-binfmts --import llvm-3.4-runtime.binfmt || true + update-binfmts --import llvm-@LLVM_VERSION@-runtime.binfmt || true fi fi diff --git a/debian/llvm-X.Y-tools.dirs.in b/debian/llvm-X.Y-tools.dirs.in index b1f7820e..ee339823 100644 --- a/debian/llvm-X.Y-tools.dirs.in +++ b/debian/llvm-X.Y-tools.dirs.in @@ -1,3 +1,3 @@ -/usr/lib/llvm-3.4/build/unittests -/usr/lib/llvm-3.4/build/utils/lit/ +/usr/lib/llvm-@LLVM_VERSION@/build/unittests +/usr/lib/llvm-@LLVM_VERSION@/build/utils/lit/ diff --git a/debian/llvm-X.Y-tools.install.in b/debian/llvm-X.Y-tools.install.in index f7293dc0..3b9b96c6 100644 --- a/debian/llvm-X.Y-tools.install.in +++ b/debian/llvm-X.Y-tools.install.in @@ -1,13 +1,13 @@ -usr/lib/llvm-3.4/bin/count -usr/lib/llvm-3.4/bin/FileCheck -usr/lib/llvm-3.4/bin/not +usr/lib/llvm-@LLVM_VERSION@/bin/count +usr/lib/llvm-@LLVM_VERSION@/bin/FileCheck +usr/lib/llvm-@LLVM_VERSION@/bin/not -unittests/Makefile.unittest /usr/lib/llvm-3.4/build/unittests/ +unittests/Makefile.unittest /usr/lib/llvm-@LLVM_VERSION@/build/unittests/ -utils/lit/* /usr/lib/llvm-3.4/build/utils/lit/ +utils/lit/* /usr/lib/llvm-@LLVM_VERSION@/build/utils/lit/ -usr/bin/count-3.4 -usr/bin/FileCheck-3.4 -usr/bin/not-3.4 +usr/bin/count-@LLVM_VERSION@ +usr/bin/FileCheck-@LLVM_VERSION@ +usr/bin/not-@LLVM_VERSION@ diff --git a/debian/llvm-X.Y.dirs.in b/debian/llvm-X.Y.dirs.in index f9db0728..56a9655f 100644 --- a/debian/llvm-X.Y.dirs.in +++ b/debian/llvm-X.Y.dirs.in @@ -1,3 +1,3 @@ -/usr/lib/llvm-3.4/bin +/usr/lib/llvm-@LLVM_VERSION@/bin usr/share/man/man1 -usr/share/doc/llvm-3.4 +usr/share/doc/llvm-@LLVM_VERSION@ diff --git a/debian/llvm-X.Y.install.in b/debian/llvm-X.Y.install.in index d40669a3..68b5cbe3 100644 --- a/debian/llvm-X.Y.install.in +++ b/debian/llvm-X.Y.install.in @@ -1,8 +1,8 @@ -usr/lib/llvm-3.4/bin/llvm-* -usr/lib/llvm-3.4/bin/opt* -usr/lib/llvm-3.4/bin/macho-dump* -usr/lib/llvm-3.4/bin/bugpoint* -usr/lib/llvm-3.4/bin/llc* +usr/lib/llvm-@LLVM_VERSION@/bin/llvm-* +usr/lib/llvm-@LLVM_VERSION@/bin/opt* +usr/lib/llvm-@LLVM_VERSION@/bin/macho-dump* +usr/lib/llvm-@LLVM_VERSION@/bin/bugpoint* +usr/lib/llvm-@LLVM_VERSION@/bin/llc* usr/bin/llvm-* usr/bin/opt* usr/bin/macho-dump* diff --git a/debian/llvm-X.Y.lintian-overrides.in b/debian/llvm-X.Y.lintian-overrides.in index b57d03bb..ac3f7567 100644 --- a/debian/llvm-X.Y.lintian-overrides.in +++ b/debian/llvm-X.Y.lintian-overrides.in @@ -1,9 +1,9 @@ # I know but well... -llvm-3.4: manpage-has-useless-whatis-entry usr/share/man/man1/llvm-dwarfdump-3.4.1.gz -llvm-3.4: manpage-has-useless-whatis-entry usr/share/man/man1/llvm-mc-3.4.1.gz -llvm-3.4: manpage-has-useless-whatis-entry usr/share/man/man1/llvm-mcmarkup-3.4.1.gz -llvm-3.4: manpage-has-useless-whatis-entry usr/share/man/man1/llvm-objdump-3.4.1.gz -llvm-3.4: manpage-has-useless-whatis-entry usr/share/man/man1/llvm-rtdyld-3.4.1.gz -llvm-3.4: manpage-has-useless-whatis-entry usr/share/man/man1/llvm-size-3.4.1.gz -llvm-3.4: manpage-has-useless-whatis-entry usr/share/man/man1/llvm-tblgen-3.4.1.gz -llvm-3.4: manpage-has-useless-whatis-entry usr/share/man/man1/macho-dump-3.4.1.gz +llvm-@LLVM_VERSION@: manpage-has-useless-whatis-entry usr/share/man/man1/llvm-dwarfdump-@LLVM_VERSION@.1.gz +llvm-@LLVM_VERSION@: manpage-has-useless-whatis-entry usr/share/man/man1/llvm-mc-@LLVM_VERSION@.1.gz +llvm-@LLVM_VERSION@: manpage-has-useless-whatis-entry usr/share/man/man1/llvm-mcmarkup-@LLVM_VERSION@.1.gz +llvm-@LLVM_VERSION@: manpage-has-useless-whatis-entry usr/share/man/man1/llvm-objdump-@LLVM_VERSION@.1.gz +llvm-@LLVM_VERSION@: manpage-has-useless-whatis-entry usr/share/man/man1/llvm-rtdyld-@LLVM_VERSION@.1.gz +llvm-@LLVM_VERSION@: manpage-has-useless-whatis-entry usr/share/man/man1/llvm-size-@LLVM_VERSION@.1.gz +llvm-@LLVM_VERSION@: manpage-has-useless-whatis-entry usr/share/man/man1/llvm-tblgen-@LLVM_VERSION@.1.gz +llvm-@LLVM_VERSION@: manpage-has-useless-whatis-entry usr/share/man/man1/macho-dump-@LLVM_VERSION@.1.gz diff --git a/debian/llvm-X.Y.manpages.in b/debian/llvm-X.Y.manpages.in index 111d594b..b74242d7 100644 --- a/debian/llvm-X.Y.manpages.in +++ b/debian/llvm-X.Y.manpages.in @@ -1,10 +1,10 @@ docs/_build/man/* -debian/man/llvm-dwarfdump-3.4.1 -debian/man/llvm-mc-3.4.1 -debian/man/llvm-mcmarkup-3.4.1 -debian/man/llvm-objdump-3.4.1 -debian/man/llvm-rtdyld-3.4.1 -debian/man/llvm-size-3.4.1 -debian/man/llvm-tblgen-3.4.1 -debian/man/macho-dump-3.4.1 +debian/man/llvm-dwarfdump-@LLVM_VERSION@.1 +debian/man/llvm-mc-@LLVM_VERSION@.1 +debian/man/llvm-mcmarkup-@LLVM_VERSION@.1 +debian/man/llvm-objdump-@LLVM_VERSION@.1 +debian/man/llvm-rtdyld-@LLVM_VERSION@.1 +debian/man/llvm-size-@LLVM_VERSION@.1 +debian/man/llvm-tblgen-@LLVM_VERSION@.1 +debian/man/macho-dump-@LLVM_VERSION@.1 diff --git a/debian/rules b/debian/rules index e4bfc538..64cfda99 100755 --- a/debian/rules +++ b/debian/rules @@ -137,6 +137,7 @@ preconfigure: echo "$$f => $$f2"; \ sed -e 's|@DEB_HOST_MULTIARCH@|$(DEB_HOST_MULTIARCH)|g' \ -e "s|@OCAML_STDLIB_DIR@|$(OCAML_STDLIB_DIR)|g" \ + -e "s|@LLVM_VERSION_FULL@|$(LLVM_VERSION_FULL)|g" \ -e "s|@LLVM_VERSION@|$(LLVM_VERSION)|g" $$f > $$f2; \ done From 2570f4ac53a44d9059ff15f3ced3cfe1a3214fad Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Thu, 31 Jul 2014 06:28:19 +0000 Subject: [PATCH 04/41] SVN branched. Update the Vcs- flags. --- debian/changelog | 6 ++++++ debian/control | 4 ++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index d7dc82d3..0641a0a4 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +llvm-toolchain-3.5 (1:3.5~+rc1-3) UNRELEASED; urgency=medium + + * SVN branched. Update the Vcs- flags. + + -- Sylvestre Ledru Thu, 31 Jul 2014 08:27:50 +0200 + llvm-toolchain-3.5 (1:3.5~+rc1-2) unstable; urgency=medium * Sync with 3.4 svn to retrieve some changes: diff --git a/debian/control b/debian/control index fe63dc54..8ad17d1c 100644 --- a/debian/control +++ b/debian/control @@ -13,8 +13,8 @@ Build-Depends: debhelper (>= 9.0), flex, bison, dejagnu, tcl, expect, Build-Conflicts: oprofile, ocaml, libllvm-3.4-ocaml-dev, libllvm-3.5-ocaml-dev Standards-Version: 3.9.5 Homepage: http://www.llvm.org/ -Vcs-Svn: svn://svn.debian.org/svn/pkg-llvm/llvm-toolchain/branches/snapshot/ -Vcs-Browser: http://svn.debian.org/viewsvn/pkg-llvm/llvm-toolchain/branches/snapshot/ +Vcs-Svn: svn://svn.debian.org/svn/pkg-llvm/llvm-toolchain/branches/3.5/ +Vcs-Browser: http://svn.debian.org/viewsvn/pkg-llvm/llvm-toolchain/branches/3.5/ # ------------- clang ------------- From d3f85241b966c3b85b561a462320fc06437b5325 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Thu, 31 Jul 2014 16:13:37 +0000 Subject: [PATCH 05/41] clang-3.5 Breaks & Replaces clang (<< 1:3.5). Just like 3.4 --- debian/changelog | 5 +++-- debian/control | 4 ++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/debian/changelog b/debian/changelog index 0641a0a4..4c5d1f95 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,9 @@ -llvm-toolchain-3.5 (1:3.5~+rc1-3) UNRELEASED; urgency=medium +llvm-toolchain-3.5 (1:3.5~+rc1-4) UNRELEASED; urgency=medium * SVN branched. Update the Vcs- flags. + * clang-3.5 Breaks & Replaces clang (<< 1:3.5). Just like 3.4 - -- Sylvestre Ledru Thu, 31 Jul 2014 08:27:50 +0200 + -- Sylvestre Ledru Thu, 31 Jul 2014 18:12:59 +0200 llvm-toolchain-3.5 (1:3.5~+rc1-2) unstable; urgency=medium diff --git a/debian/control b/debian/control index 8ad17d1c..b5d4ab90 100644 --- a/debian/control +++ b/debian/control @@ -26,8 +26,8 @@ Depends: ${shlibs:Depends}, ${misc:Depends}, ${dep:devlibs}, Provides: c-compiler, objc-compiler, c++-compiler Recommends: llvm-3.5-dev, python Suggests: gnustep, gnustep-devel, clang-3.5-doc -Replaces: clang, clang-3.1, clang-3.2, clang-3.3, clang-3.4, compiler-rt -Breaks: clang, clang-3.1, clang-3.2, clang-3.3, clang-3.4, compiler-rt +Replaces: clang (<< 1:3.5), clang-3.1, clang-3.2, clang-3.3, clang-3.4, compiler-rt +Breaks: clang (<< 1:3.5), clang-3.1, clang-3.2, clang-3.3, clang-3.4, compiler-rt Description: C, C++ and Objective-C compiler (LLVM based) Clang project is a C, C++, Objective C and Objective C++ front-end for the LLVM compiler. Its goal is to offer a replacement to the GNU Compiler From 18983eb4b442bfc67701a6ca65809dd80634fd02 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Sat, 2 Aug 2014 11:45:17 +0000 Subject: [PATCH 06/41] * Co installation of clang (Closes: #736057) - scan-build => scan-build-3.4 - scan-view => scan-view-3.4 - asan_symbolize => asan_symbolize-3.4 * Remove of pollycc --- debian/NEWS | 5 +++++ debian/changelog | 10 ++++++++++ debian/clang-X.Y.install.in | 5 ++--- debian/clang-X.Y.links.in | 16 ++-------------- debian/control | 6 ++++-- debian/rules | 6 +++++- 6 files changed, 28 insertions(+), 20 deletions(-) create mode 100644 debian/NEWS diff --git a/debian/NEWS b/debian/NEWS new file mode 100644 index 00000000..ea95087d --- /dev/null +++ b/debian/NEWS @@ -0,0 +1,5 @@ +llvm-toolchain-3.4 (1:3.4.2-7~exp1) experimental; urgency=medium + + * clang is now co-instalable. Available on version 3.4, 3.5 and 3.6 + + -- Sylvestre Ledru Sat, 02 Aug 2014 12:57:41 +0200 diff --git a/debian/changelog b/debian/changelog index c8f5d728..ab428681 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,13 @@ +llvm-toolchain-3.4 (1:3.4.2-7~exp1) experimental; urgency=medium + + * Co installation of clang (Closes: #736057) + - scan-build => scan-build-3.4 + - scan-view => scan-view-3.4 + - asan_symbolize => asan_symbolize-3.4 + * Remove of pollycc + + -- Sylvestre Ledru Sat, 02 Aug 2014 13:12:09 +0200 + llvm-toolchain-3.4 (1:3.4.2-6) unstable; urgency=medium * If the version of gcc is too old, force the usage of gcc 4.8 diff --git a/debian/clang-X.Y.install.in b/debian/clang-X.Y.install.in index 07476e5e..50c6ed1a 100644 --- a/debian/clang-X.Y.install.in +++ b/debian/clang-X.Y.install.in @@ -8,10 +8,9 @@ usr/lib/llvm-@LLVM_VERSION@/bin/clang-tidy usr/lib/llvm-@LLVM_VERSION@/bin/pp-trace usr/bin/c-index-test* -tools/clang/tools/scan-build /usr/share/clang/ -tools/clang/tools/scan-view /usr/share/clang/ +tools/clang/tools/scan-build-@LLVM_VERSION@ usr/share/clang/ +tools/clang/tools/scan-view-@LLVM_VERSION@ usr/share/clang/ #usr/share/man/man1/clang.1 usr/share/man/man1/ -debian/pollycc /usr/bin/ usr/bin/clang-@LLVM_VERSION@ usr/bin/clang++-@LLVM_VERSION@ diff --git a/debian/clang-X.Y.links.in b/debian/clang-X.Y.links.in index 1451dc25..d191a5a1 100644 --- a/debian/clang-X.Y.links.in +++ b/debian/clang-X.Y.links.in @@ -1,14 +1,2 @@ -usr/share/man/man1/clang-@LLVM_VERSION@.1.gz usr/share/man/man1/llvm-clang.1.gz -usr/share/man/man1/clang-@LLVM_VERSION@.1.gz usr/share/man/man1/clang++.1.gz -/usr/share/clang/scan-build/scan-build /usr/bin/scan-build -/usr/share/clang/scan-view/scan-view /usr/bin/scan-view -/usr/bin/clang /usr/bin/llvm-clang - -usr/bin/clang-@LLVM_VERSION@ usr/bin/clang -usr/bin/clang++-@LLVM_VERSION@ usr/bin/clang++ -usr/bin/clang-check-@LLVM_VERSION@ usr/bin/clang-check -usr/bin/clang-tblgen-@LLVM_VERSION@ usr/bin/clang-tblgen -usr/bin/c-index-test-@LLVM_VERSION@ usr/bin/c-index-test -usr/bin/clang-apply-replacements-@LLVM_VERSION@ usr/bin/clang-apply-replacements -usr/bin/clang-tidy-@LLVM_VERSION@ usr/bin/clang-tidy -usr/bin/pp-trace-@LLVM_VERSION@ usr/bin/pp-trace +usr/share/clang/scan-build-@LLVM_VERSION@/scan-build usr/bin/scan-build-@LLVM_VERSION@ +usr/share/clang/scan-view-@LLVM_VERSION@/scan-view usr/bin/scan-view-@LLVM_VERSION@ diff --git a/debian/control b/debian/control index e0eae770..ff304158 100644 --- a/debian/control +++ b/debian/control @@ -26,9 +26,11 @@ Depends: ${shlibs:Depends}, ${misc:Depends}, ${dep:devlibs}, Provides: c-compiler, objc-compiler, c++-compiler Recommends: llvm-3.4-dev, python Suggests: gnustep, gnustep-devel, clang-3.4-doc -Replaces: clang (<< 1:3.4), clang-3.1, clang-3.2, clang-3.3, compiler-rt, +Replaces: clang-3.1, clang-3.2, clang-3.3, compiler-rt, + clang-3.4 (<< 1:3.4.2-7~exp1), clang-3.5 (<< 1:3.5~+rc1-3~exp1), llvm-3.4 (<< 1:3.4~svn194058) -Breaks: clang (<< 1:3.4), clang-3.1, clang-3.2, clang-3.3, compiler-rt, +Breaks: clang-3.1, clang-3.2, clang-3.3, compiler-rt, + clang-3.4 (<< 1:3.4.2-7~exp1), clang-3.5 (<< 1:3.5~+rc1-3~exp1), llvm-3.4 (<< 1:3.4~svn194058) Description: C, C++ and Objective-C compiler (LLVM based) Clang project is a C, C++, Objective C and Objective C++ front-end diff --git a/debian/rules b/debian/rules index 64cfda99..abdd653f 100755 --- a/debian/rules +++ b/debian/rules @@ -292,7 +292,7 @@ override_dh_auto_install: fi mkdir -p $(CURDIR)/debian/clang-$(LLVM_VERSION)/usr/bin/ - cp compiler-rt/lib/asan/scripts/asan_symbolize.py $(CURDIR)/debian/clang-$(LLVM_VERSION)/usr/bin/asan_symbolize + cp compiler-rt/lib/asan/scripts/asan_symbolize.py $(CURDIR)/debian/clang-$(LLVM_VERSION)/usr/bin/asan_symbolize-$(LLVM_VERSION) # Create this fake directory to make the install libclang-common-dev happy # under the unsupported archs of compiler-rt @@ -321,6 +321,10 @@ override_dh_auto_install: cp -f $(CURDIR)/clang/tools/clang-format/clang-format.py clang/tools/clang-format/clang-format-$(LLVM_VERSION).py + cp -fR $(CURDIR)/clang/tools/scan-build clang/tools/scan-build-$(LLVM_VERSION) + + cp -fR $(CURDIR)/clang/tools/scan-view clang/tools/scan-view-$(LLVM_VERSION) + # Remove some license files rm -f $(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/include/llvm/Support/LICENSE.TXT \ $(CURDIR)/debian/llvm-$(LLVM_VERSION)-dev/usr/lib/llvm-$(LLVM_VERSION)/build/autoconf/LICENSE.TXT From 50d2a7c887e15f419c2ae391f87e7b32c1d2e7ec Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Sat, 2 Aug 2014 11:45:38 +0000 Subject: [PATCH 07/41] * Co installation of clang (Closes: #736057) - scan-build => scan-build-3.5 - scan-view => scan-view-3.5 - asan_symbolize => asan_symbolize-3.5 * Remove of pollycc --- debian/NEWS | 5 +++++ debian/changelog | 8 ++++++-- debian/clang-X.Y.install.in | 5 ++--- debian/clang-X.Y.links.in | 16 ++-------------- debian/control | 6 ++++-- debian/rules | 6 +++++- 6 files changed, 24 insertions(+), 22 deletions(-) create mode 100644 debian/NEWS diff --git a/debian/NEWS b/debian/NEWS new file mode 100644 index 00000000..5975ba38 --- /dev/null +++ b/debian/NEWS @@ -0,0 +1,5 @@ +llvm-toolchain-3.5 (1:3.5~+rc1-3~exp1) experimental; urgency=medium + + * clang is now co-instalable. Available on version 3.4, 3.5 and 3.6 + + -- Sylvestre Ledru Sat, 02 Aug 2014 12:57:41 +0200 diff --git a/debian/changelog b/debian/changelog index 4c5d1f95..da252c39 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,7 +1,11 @@ -llvm-toolchain-3.5 (1:3.5~+rc1-4) UNRELEASED; urgency=medium +llvm-toolchain-3.5 (1:3.5~+rc1-3~exp1) experimental; urgency=medium * SVN branched. Update the Vcs- flags. - * clang-3.5 Breaks & Replaces clang (<< 1:3.5). Just like 3.4 + * Co installation of clang (Closes: #736057) + - scan-build => scan-build-3.5 + - scan-view => scan-view-3.5 + - asan_symbolize => asan_symbolize-3.5 + * Remove of pollycc -- Sylvestre Ledru Thu, 31 Jul 2014 18:12:59 +0200 diff --git a/debian/clang-X.Y.install.in b/debian/clang-X.Y.install.in index 3c9bce7e..8e8d04b4 100644 --- a/debian/clang-X.Y.install.in +++ b/debian/clang-X.Y.install.in @@ -9,10 +9,9 @@ usr/lib/llvm-@LLVM_VERSION@/bin/pp-trace usr/lib/llvm-@LLVM_VERSION@/bin/clang-query usr/bin/c-index-test* -tools/clang/tools/scan-build /usr/share/clang/ -tools/clang/tools/scan-view /usr/share/clang/ +tools/clang/tools/scan-build-@LLVM_VERSION@ usr/share/clang/ +tools/clang/tools/scan-view-@LLVM_VERSION@ usr/share/clang/ #usr/share/man/man1/clang.1 usr/share/man/man1/ -debian/pollycc /usr/bin/ usr/bin/clang-@LLVM_VERSION@ usr/bin/clang++-@LLVM_VERSION@ diff --git a/debian/clang-X.Y.links.in b/debian/clang-X.Y.links.in index 2599ba37..da8de049 100644 --- a/debian/clang-X.Y.links.in +++ b/debian/clang-X.Y.links.in @@ -1,15 +1,3 @@ -usr/share/man/man1/clang-@LLVM_VERSION@.1.gz usr/share/man/man1/llvm-clang.1.gz -usr/share/man/man1/clang-@LLVM_VERSION@.1.gz usr/share/man/man1/clang++.1.gz -/usr/share/clang/scan-build/scan-build /usr/bin/scan-build -/usr/share/clang/scan-view/scan-view /usr/bin/scan-view -/usr/bin/clang /usr/bin/llvm-clang +usr/share/clang/scan-build-@LLVM_VERSION@/scan-build usr/bin/scan-build-@LLVM_VERSION@ +usr/share/clang/scan-view-@LLVM_VERSION@/scan-view usr/bin/scan-view-@LLVM_VERSION@ -usr/bin/clang-@LLVM_VERSION@ usr/bin/clang -usr/bin/clang++-@LLVM_VERSION@ usr/bin/clang++ -usr/bin/clang-check-@LLVM_VERSION@ usr/bin/clang-check -usr/bin/clang-tblgen-@LLVM_VERSION@ usr/bin/clang-tblgen -usr/bin/c-index-test-@LLVM_VERSION@ usr/bin/c-index-test -usr/bin/clang-apply-replacements-@LLVM_VERSION@ usr/bin/clang-apply-replacements -usr/bin/clang-tidy-@LLVM_VERSION@ usr/bin/clang-tidy -usr/bin/pp-trace-@LLVM_VERSION@ usr/bin/pp-trace -usr/bin/clang-query-@LLVM_VERSION@ usr/bin/clang-query diff --git a/debian/control b/debian/control index b5d4ab90..de198cc5 100644 --- a/debian/control +++ b/debian/control @@ -26,8 +26,10 @@ Depends: ${shlibs:Depends}, ${misc:Depends}, ${dep:devlibs}, Provides: c-compiler, objc-compiler, c++-compiler Recommends: llvm-3.5-dev, python Suggests: gnustep, gnustep-devel, clang-3.5-doc -Replaces: clang (<< 1:3.5), clang-3.1, clang-3.2, clang-3.3, clang-3.4, compiler-rt -Breaks: clang (<< 1:3.5), clang-3.1, clang-3.2, clang-3.3, clang-3.4, compiler-rt +Replaces: clang-3.1, clang-3.2, clang-3.3, + clang-3.4 (<< 1:3.4.2-7~exp1), clang-3.5 (<< 1:3.5~+rc1-3~exp1), compiler-rt +Breaks: clang-3.1, clang-3.2, clang-3.3, + clang-3.4 (<< 1:3.4.2-7~exp1), clang-3.5 (<< 1:3.5~+rc1-3~exp1), compiler-rt Description: C, C++ and Objective-C compiler (LLVM based) Clang project is a C, C++, Objective C and Objective C++ front-end for the LLVM compiler. Its goal is to offer a replacement to the GNU Compiler diff --git a/debian/rules b/debian/rules index 5a2a373c..4cc187ed 100755 --- a/debian/rules +++ b/debian/rules @@ -290,7 +290,7 @@ override_dh_auto_install: fi mkdir -p $(CURDIR)/debian/clang-$(LLVM_VERSION)/usr/bin/ - cp compiler-rt/lib/asan/scripts/asan_symbolize.py $(CURDIR)/debian/clang-$(LLVM_VERSION)/usr/bin/asan_symbolize + cp compiler-rt/lib/asan/scripts/asan_symbolize.py $(CURDIR)/debian/clang-$(LLVM_VERSION)/usr/bin/asan_symbolize-$(LLVM_VERSION) # Create this fake directory to make the install libclang-common-dev happy # under the unsupported archs of compiler-rt @@ -320,6 +320,10 @@ override_dh_auto_install: cp -f $(CURDIR)/clang/tools/clang-format/clang-format.py clang/tools/clang-format/clang-format-$(LLVM_VERSION).py + cp -fR $(CURDIR)/clang/tools/scan-build clang/tools/scan-build-$(LLVM_VERSION) + + cp -fR $(CURDIR)/clang/tools/scan-view clang/tools/scan-view-$(LLVM_VERSION) + # Remove some license files rm -f $(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/include/llvm/Support/LICENSE.TXT \ $(CURDIR)/debian/llvm-$(LLVM_VERSION)-dev/usr/lib/llvm-$(LLVM_VERSION)/build/autoconf/LICENSE.TXT From e0fb7b1ca563814ee5f4e8f11e3f619347f8486c Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Sat, 2 Aug 2014 11:55:09 +0000 Subject: [PATCH 08/41] update the manpage duplication --- debian/clang-X.Y.install.in | 1 - debian/clang-X.Y.manpages.in | 11 +++++------ debian/rules | 11 ++++++----- 3 files changed, 11 insertions(+), 12 deletions(-) diff --git a/debian/clang-X.Y.install.in b/debian/clang-X.Y.install.in index 50c6ed1a..d9b16344 100644 --- a/debian/clang-X.Y.install.in +++ b/debian/clang-X.Y.install.in @@ -10,7 +10,6 @@ usr/lib/llvm-@LLVM_VERSION@/bin/pp-trace usr/bin/c-index-test* tools/clang/tools/scan-build-@LLVM_VERSION@ usr/share/clang/ tools/clang/tools/scan-view-@LLVM_VERSION@ usr/share/clang/ -#usr/share/man/man1/clang.1 usr/share/man/man1/ usr/bin/clang-@LLVM_VERSION@ usr/bin/clang++-@LLVM_VERSION@ diff --git a/debian/clang-X.Y.manpages.in b/debian/clang-X.Y.manpages.in index d1b6df0e..a07b5ee3 100644 --- a/debian/clang-X.Y.manpages.in +++ b/debian/clang-X.Y.manpages.in @@ -1,6 +1,5 @@ -build-llvm/tools/clang/docs/tools/clang.1 -clang/tools/scan-build/scan-build.1 -debian/man/clang-check.1 -debian/man/clang-tblgen.1 -debian/man/scan-view.1 - +build-llvm/tools/clang/docs/tools/clang-@LLVM_VERSION@.1 +clang/tools/scan-build/scan-build-@LLVM_VERSION@.1 +debian/man/clang-check-@LLVM_VERSION@.1 +debian/man/clang-tblgen-@LLVM_VERSION@.1 +debian/man/scan-view-@LLVM_VERSION@.1 diff --git a/debian/rules b/debian/rules index abdd653f..8ee7ca93 100755 --- a/debian/rules +++ b/debian/rules @@ -252,11 +252,11 @@ build_doc: cd $$d && rm -f underscore.js && ln -s /usr/share/javascript/underscore/underscore.js; \ done - help2man --version-string=$(LLVM_VERSION) clang/tools/scan-view/scan-view > debian/man/scan-view.1 + help2man --version-string=$(LLVM_VERSION) clang/tools/scan-view/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 for f in clang clang-tblgen clang-check; do \ - help2man --version-string=$(LLVM_VERSION) $(TARGET_BUILD)/Release/bin/$$f > debian/man/$$f.1; \ + help2man --version-string=$(LLVM_VERSION) $(TARGET_BUILD)/Release/bin/$$f > debian/man/$$f-$(LLVM_VERSION).1; \ done for f in llvm-dwarfdump llvm-mc llvm-mcmarkup llvm-objdump llvm-rtdyld llvm-size llvm-tblgen macho-dump lldb clang-format clang-modernize; do \ @@ -310,9 +310,10 @@ override_dh_auto_install: done # Rename some stuff with the version name - # WILL DO when we can install several clang versions together - #mv $(CURDIR)/$(TARGET_BUILD)/tools/clang/docs/tools/clang.1 $(CURDIR)/$(TARGET_BUILD)/tools/clang/docs/tools/clang-$(LLVM_VERSION).1 - + cp $(CURDIR)/$(TARGET_BUILD)/tools/clang/docs/tools/clang.1 $(CURDIR)/$(TARGET_BUILD)/tools/clang/docs/tools/clang-$(LLVM_VERSION).1 + + cp $(CURDIR)/clang/tools/scan-build/scan-build.1 $(CURDIR)/clang/tools/scan-build/scan-build-$(LLVM_VERSION).1 + cp -f $(CURDIR)/utils/vim/llvm.vim $(CURDIR)/utils/vim/llvm-$(LLVM_VERSION).vim cp -f $(CURDIR)/utils/vim/tablegen.vim $(CURDIR)/utils/vim/tablegen-$(LLVM_VERSION).vim From 309119d8e4248459dc9103e35feff9a86d2bece8 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Sat, 2 Aug 2014 12:00:18 +0000 Subject: [PATCH 09/41] remove artefact --- debian/libllvm3.4.links.in | 2 -- 1 file changed, 2 deletions(-) delete mode 100644 debian/libllvm3.4.links.in diff --git a/debian/libllvm3.4.links.in b/debian/libllvm3.4.links.in deleted file mode 100644 index 9a00059a..00000000 --- a/debian/libllvm3.4.links.in +++ /dev/null @@ -1,2 +0,0 @@ -usr/lib/llvm-3.4/lib/libLLVM-3.4.2.so.1 /usr/lib/@DEB_HOST_MULTIARCH@/libLLVM-3.4.so.1 - From dd448f74d58d5e9cc79dfd4496765a259af1bb8f Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Sat, 2 Aug 2014 12:13:58 +0000 Subject: [PATCH 10/41] update the manpage duplication --- debian/clang-X.Y.manpages.in | 11 +++++------ debian/rules | 18 +++++++++--------- 2 files changed, 14 insertions(+), 15 deletions(-) diff --git a/debian/clang-X.Y.manpages.in b/debian/clang-X.Y.manpages.in index d1b6df0e..a07b5ee3 100644 --- a/debian/clang-X.Y.manpages.in +++ b/debian/clang-X.Y.manpages.in @@ -1,6 +1,5 @@ -build-llvm/tools/clang/docs/tools/clang.1 -clang/tools/scan-build/scan-build.1 -debian/man/clang-check.1 -debian/man/clang-tblgen.1 -debian/man/scan-view.1 - +build-llvm/tools/clang/docs/tools/clang-@LLVM_VERSION@.1 +clang/tools/scan-build/scan-build-@LLVM_VERSION@.1 +debian/man/clang-check-@LLVM_VERSION@.1 +debian/man/clang-tblgen-@LLVM_VERSION@.1 +debian/man/scan-view-@LLVM_VERSION@.1 diff --git a/debian/rules b/debian/rules index 4cc187ed..5fadc1aa 100755 --- a/debian/rules +++ b/debian/rules @@ -250,11 +250,11 @@ build_doc: cd $$d && rm -f underscore.js && ln -s /usr/share/javascript/underscore/underscore.js; \ done - help2man --version-string=$(LLVM_VERSION) clang/tools/scan-view/scan-view > debian/man/scan-view.1 + help2man --version-string=$(LLVM_VERSION) clang/tools/scan-view/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 for f in clang clang-tblgen clang-check; do \ - help2man --version-string=$(LLVM_VERSION) $(TARGET_BUILD)/Release/bin/$$f > debian/man/$$f.1; \ + help2man --version-string=$(LLVM_VERSION) $(TARGET_BUILD)/Release/bin/$$f > debian/man/$$f-$(LLVM_VERSION).1; \ done for f in llvm-dwarfdump llvm-mc llvm-mcmarkup llvm-objdump llvm-rtdyld llvm-size llvm-tblgen macho-dump lldb clang-format clang-modernize; do \ @@ -309,9 +309,10 @@ override_dh_auto_install: done # Rename some stuff with the version name - # WILL DO when we can install several clang versions together - #mv $(CURDIR)/$(TARGET_BUILD)/tools/clang/docs/tools/clang.1 $(CURDIR)/$(TARGET_BUILD)/tools/clang/docs/tools/clang-$(LLVM_VERSION).1 - + cp $(CURDIR)/$(TARGET_BUILD)/tools/clang/docs/tools/clang.1 $(CURDIR)/$(TARGET_BUILD)/tools/clang/docs/tools/clang-$(LLVM_VERSION).1 + + cp $(CURDIR)/clang/tools/scan-build/scan-build.1 $(CURDIR)/clang/tools/scan-build/scan-build-$(LLVM_VERSION).1 + cp -f $(CURDIR)/utils/vim/llvm.vim $(CURDIR)/utils/vim/llvm-$(LLVM_VERSION).vim cp -f $(CURDIR)/utils/vim/tablegen.vim $(CURDIR)/utils/vim/tablegen-$(LLVM_VERSION).vim @@ -351,16 +352,12 @@ override_dh_installman: rm -f $(CURDIR)/debian/llvm-$(LLVM_VERSION)/usr/share/man/man1/lli* -.PHONY: override_dh_strip override_dh_strip: dh_strip -p libclang$(SONAME_EXT)-$(LLVM_VERSION) --dbg-package=libclang$(SONAME_EXT)-$(LLVM_VERSION)-dbg dh_strip -p libllvm$(LLVM_VERSION) --dbg-package=libllvm$(LLVM_VERSION)-dbg dh_strip -a -#override_dh_shlibdeps: -# LD_LIBRARY_PATH=$$LD_LIBRARY_PATH:$(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/lib/ dh_shlibdeps - override_dh_install: dh_install --fail-missing @@ -455,3 +452,6 @@ override_dh_auto_clean: rm -f $(CURDIR)/utils/vim/llvm-$(LLVM_VERSION).vim $(CURDIR)/utils/vim/tablegen-$(LLVM_VERSION).vim rm -f $(CURDIR)/clang/tools/clang-format/clang-format-diff-$(LLVM_VERSION) rm -f $(CURDIR)/clang/tools/clang-format/clang-format-$(LLVM_VERSION).py + + +.PHONY: override_dh_strip preconfigure From 483fc895c976142b8c55be7feb9396ab0cb55d80 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Sat, 2 Aug 2014 13:11:36 +0000 Subject: [PATCH 11/41] fix the NEWS file --- debian/NEWS | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/NEWS b/debian/NEWS index ea95087d..cded96b5 100644 --- a/debian/NEWS +++ b/debian/NEWS @@ -1,5 +1,5 @@ llvm-toolchain-3.4 (1:3.4.2-7~exp1) experimental; urgency=medium - * clang is now co-instalable. Available on version 3.4, 3.5 and 3.6 + * clang is now co-instalable. Available on version 3.4, 3.5 and 3.6 -- Sylvestre Ledru Sat, 02 Aug 2014 12:57:41 +0200 From 08002b4111dac090273f158597c50c08e34e5693 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Sat, 2 Aug 2014 13:11:36 +0000 Subject: [PATCH 12/41] fix the NEWS file --- debian/NEWS | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/NEWS b/debian/NEWS index 5975ba38..94962804 100644 --- a/debian/NEWS +++ b/debian/NEWS @@ -1,5 +1,5 @@ llvm-toolchain-3.5 (1:3.5~+rc1-3~exp1) experimental; urgency=medium - * clang is now co-instalable. Available on version 3.4, 3.5 and 3.6 + * clang is now co-instalable. Available on version 3.4, 3.5 and 3.6 -- Sylvestre Ledru Sat, 02 Aug 2014 12:57:41 +0200 From 82303be101e45bc5d6298cef187e4b1f86a45417 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Sat, 2 Aug 2014 13:35:23 +0000 Subject: [PATCH 13/41] clang alternatives are managed by llvm-defaults --- debian/changelog | 1 + debian/clang-X.Y.postinst.in | 31 ------------------------------- debian/clang-X.Y.prerm.in | 14 -------------- 3 files changed, 1 insertion(+), 45 deletions(-) delete mode 100644 debian/clang-X.Y.postinst.in delete mode 100644 debian/clang-X.Y.prerm.in diff --git a/debian/changelog b/debian/changelog index ab428681..5644a6b1 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,6 +5,7 @@ llvm-toolchain-3.4 (1:3.4.2-7~exp1) experimental; urgency=medium - scan-view => scan-view-3.4 - asan_symbolize => asan_symbolize-3.4 * Remove of pollycc + * clang alternatives are managed by llvm-defaults -- Sylvestre Ledru Sat, 02 Aug 2014 13:12:09 +0200 diff --git a/debian/clang-X.Y.postinst.in b/debian/clang-X.Y.postinst.in deleted file mode 100644 index 64ae9fa6..00000000 --- a/debian/clang-X.Y.postinst.in +++ /dev/null @@ -1,31 +0,0 @@ -#! /bin/sh -e - -prio=10 - -update-alternatives --quiet \ - --install /usr/bin/c++ \ - c++ \ - /usr/bin/clang++ \ - $prio - -update-alternatives --quiet \ - --install /usr/bin/cc \ - cc \ - /usr/bin/clang \ - $prio - -update-alternatives --quiet \ - --install /usr/bin/c89 \ - c89 \ - /usr/bin/clang \ - $prio - -update-alternatives --quiet \ - --install /usr/bin/c99 \ - c99 \ - /usr/bin/clang \ - $prio - -#DEBHELPER# - -exit 0 diff --git a/debian/clang-X.Y.prerm.in b/debian/clang-X.Y.prerm.in deleted file mode 100644 index 46ceec82..00000000 --- a/debian/clang-X.Y.prerm.in +++ /dev/null @@ -1,14 +0,0 @@ -#!/bin/sh - -set -e - -if [ "$1" = "remove" ] || [ "$1" = "deconfigure" ]; then - update-alternatives --quiet --remove cc /usr/bin/clang - update-alternatives --quiet --remove c89 /usr/bin/clang - update-alternatives --quiet --remove c99 /usr/bin/clang - update-alternatives --quiet --remove c++ /usr/bin/clang++ -fi - -#DEBHELPER# - -exit 0 From c1fe6243d6dad6dc6f64798bd2ca7fa1b4ba48cc Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Sat, 2 Aug 2014 13:35:36 +0000 Subject: [PATCH 14/41] clang alternatives are managed by llvm-defaults --- debian/changelog | 1 + debian/clang-X.Y.postinst.in | 31 ------------------------------- debian/clang-X.Y.prerm.in | 14 -------------- 3 files changed, 1 insertion(+), 45 deletions(-) delete mode 100644 debian/clang-X.Y.postinst.in delete mode 100644 debian/clang-X.Y.prerm.in diff --git a/debian/changelog b/debian/changelog index da252c39..4e50b8f8 100644 --- a/debian/changelog +++ b/debian/changelog @@ -6,6 +6,7 @@ llvm-toolchain-3.5 (1:3.5~+rc1-3~exp1) experimental; urgency=medium - scan-view => scan-view-3.5 - asan_symbolize => asan_symbolize-3.5 * Remove of pollycc + * clang alternatives are managed by llvm-defaults -- Sylvestre Ledru Thu, 31 Jul 2014 18:12:59 +0200 diff --git a/debian/clang-X.Y.postinst.in b/debian/clang-X.Y.postinst.in deleted file mode 100644 index 64ae9fa6..00000000 --- a/debian/clang-X.Y.postinst.in +++ /dev/null @@ -1,31 +0,0 @@ -#! /bin/sh -e - -prio=10 - -update-alternatives --quiet \ - --install /usr/bin/c++ \ - c++ \ - /usr/bin/clang++ \ - $prio - -update-alternatives --quiet \ - --install /usr/bin/cc \ - cc \ - /usr/bin/clang \ - $prio - -update-alternatives --quiet \ - --install /usr/bin/c89 \ - c89 \ - /usr/bin/clang \ - $prio - -update-alternatives --quiet \ - --install /usr/bin/c99 \ - c99 \ - /usr/bin/clang \ - $prio - -#DEBHELPER# - -exit 0 diff --git a/debian/clang-X.Y.prerm.in b/debian/clang-X.Y.prerm.in deleted file mode 100644 index 46ceec82..00000000 --- a/debian/clang-X.Y.prerm.in +++ /dev/null @@ -1,14 +0,0 @@ -#!/bin/sh - -set -e - -if [ "$1" = "remove" ] || [ "$1" = "deconfigure" ]; then - update-alternatives --quiet --remove cc /usr/bin/clang - update-alternatives --quiet --remove c89 /usr/bin/clang - update-alternatives --quiet --remove c99 /usr/bin/clang - update-alternatives --quiet --remove c++ /usr/bin/clang++ -fi - -#DEBHELPER# - -exit 0 From 8c5664f979c3c2b6c5d0565b87abf555a300dbdc Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Mon, 4 Aug 2014 11:36:00 +0000 Subject: [PATCH 15/41] Enable compressed debug sections (Closes: #757002) --- debian/changelog | 6 ++++++ debian/control | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 4e50b8f8..95efb4b9 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +llvm-toolchain-3.5 (1:3.5~+rc1-3~exp2) UNRELEASED; urgency=medium + + * Enable compressed debug sections (Closes: #757002) + + -- Sylvestre Ledru Mon, 04 Aug 2014 13:35:35 +0200 + llvm-toolchain-3.5 (1:3.5~+rc1-3~exp1) experimental; urgency=medium * SVN branched. Update the Vcs- flags. diff --git a/debian/control b/debian/control index de198cc5..1ddab9aa 100644 --- a/debian/control +++ b/debian/control @@ -9,7 +9,7 @@ Build-Depends: debhelper (>= 9.0), flex, bison, dejagnu, tcl, expect, lsb-release, patchutils, diffstat, xz-utils, chrpath, python-dev, libedit-dev, swig, python-sphinx, ocaml-nox, binutils-dev, libcloog-isl-dev, libisl-dev (>= 0.11.1), libjsoncpp-dev, - lcov, procps, help2man, dh-ocaml + lcov, procps, help2man, dh-ocaml, zlib1g-dev Build-Conflicts: oprofile, ocaml, libllvm-3.4-ocaml-dev, libllvm-3.5-ocaml-dev Standards-Version: 3.9.5 Homepage: http://www.llvm.org/ From 1e02437e05743ae25215501f00f6c4d9582a20e4 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Tue, 5 Aug 2014 12:58:01 +0000 Subject: [PATCH 16/41] * try to bring back lldb on mips & mipsel * Force scan-build to use the same version of clang --- debian/changelog | 7 +++++++ debian/control | 4 ++-- debian/patches/scan-build-clang-path.diff | 10 +++++----- debian/rules | 2 +- 4 files changed, 15 insertions(+), 8 deletions(-) diff --git a/debian/changelog b/debian/changelog index 5644a6b1..e6f32127 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +llvm-toolchain-3.4 (1:3.4.2-7~exp2) UNRELEASED; urgency=medium + + * try to bring back lldb on mips & mipsel + * Force scan-build to use the same version of clang + + -- Sylvestre Ledru Tue, 05 Aug 2014 14:40:05 +0200 + llvm-toolchain-3.4 (1:3.4.2-7~exp1) experimental; urgency=medium * Co installation of clang (Closes: #736057) diff --git a/debian/control b/debian/control index ff304158..0370dbb5 100644 --- a/debian/control +++ b/debian/control @@ -383,8 +383,8 @@ Description: Modular compiler and toolchain technologies, examples # ------------- lldb ------------- Package: lldb-3.4 -Architecture: amd64 armel armhf i386 kfreebsd-amd64 kfreebsd-i386 s390 s390x sparc alpha hppa m68k powerpcspe ppc64 sh4 sparc64 x32 powerpc -# ia64 mips mipsel hurd have been removed +Architecture: amd64 armel armhf i386 kfreebsd-amd64 kfreebsd-i386 s390 s390x sparc alpha hppa m68k powerpcspe ppc64 sh4 sparc64 x32 powerpc mips mipsel +# ia64 hurd have been removed Depends: ${shlibs:Depends}, ${misc:Depends}, libllvm3.4 (= ${binary:Version}), python, llvm-3.4-dev Pre-Depends: ${misc:Pre-Depends} Replaces: lldb-3.2, lldb-3.3, lldb-3.5 diff --git a/debian/patches/scan-build-clang-path.diff b/debian/patches/scan-build-clang-path.diff index 677af454..695179e7 100644 --- a/debian/patches/scan-build-clang-path.diff +++ b/debian/patches/scan-build-clang-path.diff @@ -1,13 +1,13 @@ -Index: llvm-toolchain-snapshot_3.4~svn192346/clang/tools/scan-build/scan-build +Index: llvm-toolchain-3.4-3.4.2/clang/tools/scan-build/scan-build =================================================================== ---- llvm-toolchain-snapshot_3.4~svn192346.orig/clang/tools/scan-build/scan-build 2013-10-10 13:38:20.858082707 +0200 -+++ llvm-toolchain-snapshot_3.4~svn192346/clang/tools/scan-build/scan-build 2013-10-10 13:38:20.854082707 +0200 -@@ -1547,7 +1547,7 @@ +--- llvm-toolchain-3.4-3.4.2.orig/clang/tools/scan-build/scan-build ++++ llvm-toolchain-3.4-3.4.2/clang/tools/scan-build/scan-build +@@ -1547,7 +1547,7 @@ if (!@ARGV and !$RequestDisplayHelp) { # Find 'clang' if (!defined $AnalyzerDiscoveryMethod) { - $Clang = Cwd::realpath("$RealBin/bin/clang"); -+ $Clang = Cwd::realpath("/usr/bin/clang"); ++ $Clang = Cwd::realpath("/usr/lib/llvm-3.4/bin/clang"); if (!defined $Clang || ! -x $Clang) { $Clang = Cwd::realpath("$RealBin/clang"); } diff --git a/debian/rules b/debian/rules index 8ee7ca93..3b4368db 100755 --- a/debian/rules +++ b/debian/rules @@ -117,7 +117,7 @@ endif LLDB_ENABLE=yes -LLDB_DISABLE_ARCHS := arm64 hurd-i386 mips mipsel ia64 +LLDB_DISABLE_ARCHS := arm64 hurd-i386 ia64 # hurd has threading issues # mips* fails with "undefined references to `__atomic_load_8'" ifeq (,$(filter-out $(LLDB_DISABLE_ARCHS), $(DEB_HOST_ARCH))) From 921f63019622908d9b534a372089b344418e056e Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Tue, 5 Aug 2014 12:58:05 +0000 Subject: [PATCH 17/41] Force scan-build to use the same version of clang --- debian/changelog | 1 + debian/patches/scan-build-clang-path.diff | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 95efb4b9..8f858bef 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,7 @@ llvm-toolchain-3.5 (1:3.5~+rc1-3~exp2) UNRELEASED; urgency=medium * Enable compressed debug sections (Closes: #757002) + * Force scan-build to use the same version of clang -- Sylvestre Ledru Mon, 04 Aug 2014 13:35:35 +0200 diff --git a/debian/patches/scan-build-clang-path.diff b/debian/patches/scan-build-clang-path.diff index 35178f94..1610770b 100644 --- a/debian/patches/scan-build-clang-path.diff +++ b/debian/patches/scan-build-clang-path.diff @@ -7,7 +7,7 @@ Index: llvm-toolchain-snapshot_3.5~svn199197/clang/tools/scan-build/scan-build # Find 'clang' if (!defined $AnalyzerDiscoveryMethod) { - $Clang = Cwd::realpath("$RealBin/bin/clang"); -+ $Clang = Cwd::realpath("/usr/bin/clang"); ++ $Clang = Cwd::realpath("/usr/lib/llvm-3.5/bin/clang"); if (!defined $Clang || ! -x $Clang) { $Clang = Cwd::realpath("$RealBin/clang"); } From 3f318449759167266776f722beca07d08dd7b500 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Tue, 5 Aug 2014 15:29:01 +0000 Subject: [PATCH 18/41] also allows --force-bad-version --allow-lower-version when dealing with branches --- 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 a36580ec..150f2dd6 100755 --- a/debian/orig-tar.sh +++ b/debian/orig-tar.sh @@ -130,7 +130,7 @@ if test -z "$DISTRIBUTION"; then DISTRIBUTION="experimental" fi -if test -n "$RCRELEASE"; then +if test -n "$RCRELEASE" -o -n "$BRANCH"; then EXTRA_DCH_FLAGS="--force-bad-version --allow-lower-version" fi From d5d07ceed8d0d6056ac306248bbbd9ed385bad7b Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Tue, 5 Aug 2014 15:42:23 +0000 Subject: [PATCH 19/41] improve the version management --- debian/orig-tar.sh | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/debian/orig-tar.sh b/debian/orig-tar.sh index 150f2dd6..9a2c033e 100755 --- a/debian/orig-tar.sh +++ b/debian/orig-tar.sh @@ -77,7 +77,11 @@ if test -n "$RCRELEASE"; then FULL_VERSION="llvm-toolchain-"$MAJOR_VERSION"_"$VERSION else VERSION=$CURRENT_VERSION"~svn"$REVISION - FULL_VERSION="llvm-toolchain-snapshot_"$VERSION + if grep -q release_ $BRANCH; then + FULL_VERSION="llvm-toolchain-"$MAJOR_VERSION"_"$VERSION + else + FULL_VERSION="llvm-toolchain-snapshot_"$VERSION + fi fi # LLVM From 718d170d18834a5b76ffa8919844ee1ce794912e Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Tue, 5 Aug 2014 15:57:30 +0000 Subject: [PATCH 20/41] fix the check --- 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 9a2c033e..4ebeed69 100755 --- a/debian/orig-tar.sh +++ b/debian/orig-tar.sh @@ -77,7 +77,7 @@ if test -n "$RCRELEASE"; then FULL_VERSION="llvm-toolchain-"$MAJOR_VERSION"_"$VERSION else VERSION=$CURRENT_VERSION"~svn"$REVISION - if grep -q release_ $BRANCH; then + if echo $BRANCH|grep -q release_; then FULL_VERSION="llvm-toolchain-"$MAJOR_VERSION"_"$VERSION else FULL_VERSION="llvm-toolchain-snapshot_"$VERSION From a3b4964a1a651eec2a3093e3b8c98258edce5c12 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Tue, 5 Aug 2014 16:04:45 +0000 Subject: [PATCH 21/41] remove obsolete or merged patches --- .../lldb-__linux__-ftbfs-powerpc.patch | 54 ------------------- debian/patches/series | 3 -- 2 files changed, 57 deletions(-) delete mode 100644 debian/patches/lldb-__linux__-ftbfs-powerpc.patch diff --git a/debian/patches/lldb-__linux__-ftbfs-powerpc.patch b/debian/patches/lldb-__linux__-ftbfs-powerpc.patch deleted file mode 100644 index 67f9493f..00000000 --- a/debian/patches/lldb-__linux__-ftbfs-powerpc.patch +++ /dev/null @@ -1,54 +0,0 @@ -diff --git llvm-toolchain-snapshot_3.5~svn201241.orig/lldb/tools/lldb-mi/MICmnLogMediumFile.cpp llvm-toolchain-snapshot_3.5~svn201241/lldb/tools/lldb-mi/MICmnLogMediumFile.cpp -index a14ad04..382db07 100644 ---- llvm-toolchain-snapshot_3.5~svn201241.orig/tools/lldb-mi/MICmnLogMediumFile.cpp -+++ llvm-toolchain-snapshot_3.5~svn201241/lldb/tools/lldb-mi/MICmnLogMediumFile.cpp -@@ -28,7 +28,7 @@ - - #if defined( _MSC_VER ) - #include "MIUtilSystemWindows.h" --#elif defined( __FreeBSD__ ) || defined( __linux ) -+#elif defined( __FreeBSD__ ) || defined( __linux__ ) - #include "MIUtilSystemLinux.h" - #elif defined( __APPLE__ ) - #include "MIUtilSystemOsx.h" -diff --git llvm-toolchain-snapshot_3.5~svn201241.orig/lldb//tools/lldb-mi/MIUtilSystemLinux.cpp llvm-toolchain-snapshot_3.5~svn201241/lldb//tools/lldb-mi/MIUtilSystemLinux.cpp -index de14317..9c4deb4 100644 ---- llvm-toolchain-snapshot_3.5~svn201241.orig/lldb/tools/lldb-mi/MIUtilSystemLinux.cpp -+++ llvm-toolchain-snapshot_3.5~svn201241/lldb/tools/lldb-mi/MIUtilSystemLinux.cpp -@@ -22,7 +22,7 @@ - // Include compiler configuration - #include "MICmnConfig.h" - --#if defined( __FreeBSD__ ) || defined( __linux ) -+#if defined( __FreeBSD__ ) || defined( __linux__ ) - - // In-house headers: - #include "MIUtilSystemLinux.h" -@@ -119,4 +119,4 @@ bool CMIUtilSystemLinux::GetLogFilesPath( CMIUtilString & vrwFileNamePath ) cons - return MIstatus::success; - } - --#endif // #if defined( __linux ) -+#endif // #if defined( __linux__ ) -diff --git llvm-toolchain-snapshot_3.5~svn201241/lldb/tools/lldb-mi/MIUtilSystemLinux.h llvm-toolchain-snapshot_3.5~svn201241/lldb//tools/lldb-mi/MIUtilSystemLinux.h -index c79bcfd..0d9062a 100644 ---- llvm-toolchain-snapshot_3.5~svn201241.orig/lldb/tools/lldb-mi/MIUtilSystemLinux.h -+++ llvm-toolchain-snapshot_3.5~svn201241/lldb/tools/lldb-mi/MIUtilSystemLinux.h -@@ -24,7 +24,7 @@ - // Include compiler configuration - #include "MICmnConfig.h" - --#if defined( __FreeBSD__ ) || defined( __linux ) -+#if defined( __FreeBSD__ ) || defined( __linux__ ) - - // In-house headers: - #include "MIUtilString.h" -@@ -57,4 +57,4 @@ public: - - typedef CMIUtilSystemLinux CMIUtilSystem; - --#endif // #if defined( __linux ) -+#endif // #if defined( __linux__ ) --- -2.0.1 - diff --git a/debian/patches/series b/debian/patches/series index cc6e1231..926f5fb3 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -9,7 +9,6 @@ 0021-shared-lib-debian.patch 0023-link-libopagent.patch 0044-soname.diff -0047-version-name.diff scan-build-clang-path.diff 0050-powerpcspe-fp.diff declare_clear_cache.diff @@ -34,11 +33,9 @@ silent-more-tests.diff disable-display-PASS-UNSUPPORTED-XFAIL.diff lldb-link-atomic.diff fix-llvm-config-obj-src-root.patch -suffixsvn.diff compiler-rt-path.diff lldb-soname.diff force-link-pass.o.diff follow-parallel-var.diff lldb-kfreebsd.diff hurd-EIEIO-undef.diff -lldb-__linux__-ftbfs-powerpc.patch From ec45d4f8f040f8cb6b62e524d9db2011c49a61fd Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Wed, 6 Aug 2014 09:43:32 +0000 Subject: [PATCH 22/41] Bring back scan-build-search-path.diff (Closes: #757219) --- debian/changelog | 1 + debian/patches/scan-build-clang-path.diff | 39 +++++++++++++++++++++++ 2 files changed, 40 insertions(+) diff --git a/debian/changelog b/debian/changelog index 8f858bef..e1fbfcb0 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,7 @@ llvm-toolchain-3.5 (1:3.5~+rc1-3~exp2) UNRELEASED; urgency=medium * Enable compressed debug sections (Closes: #757002) * Force scan-build to use the same version of clang + * Bring back scan-build-search-path.diff (Closes: #757219) -- Sylvestre Ledru Mon, 04 Aug 2014 13:35:35 +0200 diff --git a/debian/patches/scan-build-clang-path.diff b/debian/patches/scan-build-clang-path.diff index 1610770b..8c951e0d 100644 --- a/debian/patches/scan-build-clang-path.diff +++ b/debian/patches/scan-build-clang-path.diff @@ -11,3 +11,42 @@ Index: llvm-toolchain-snapshot_3.5~svn199197/clang/tools/scan-build/scan-build if (!defined $Clang || ! -x $Clang) { $Clang = Cwd::realpath("$RealBin/clang"); } +diff -Naur llvm-toolchain-3.5-3.5~+rc1.orig/clang/tools/scan-build/ccc-analyzer llvm-toolchain-3.5-3.5~+rc1/clang/tools/scan-build/ccc-analyzer +--- llvm-toolchain-3.5-3.5~+rc1.orig/clang/tools/scan-build/ccc-analyzer 2014-08-06 10:29:51.990552103 +0200 ++++ llvm-toolchain-3.5-3.5~+rc1/clang/tools/scan-build/ccc-analyzer 2014-08-06 10:35:05.016567533 +0200 +@@ -25,6 +25,17 @@ + # Compiler command setup. + ##===----------------------------------------------------------------------===## + ++# Search in the PATH if the compiler exists ++sub SearchInPath { ++ my $file = shift; ++ foreach my $dir (split (':', $ENV{PATH})) { ++ if (-x "$dir/$file") { ++ return 1; ++ } ++ } ++ return 0; ++} ++ + my $Compiler; + my $Clang; + my $DefaultCCompiler; +@@ -41,7 +52,7 @@ + + if ($FindBin::Script =~ /c\+\+-analyzer/) { + $Compiler = $ENV{'CCC_CXX'}; +- if (!defined $Compiler || ! -x $Compiler) { $Compiler = $DefaultCXXCompiler; } ++ if (!defined $Compiler || (! -x $Compiler && ! SearchInPath($Compiler))) { $Compiler = $DefaultCXXCompiler; } + + $Clang = $ENV{'CLANG_CXX'}; + if (!defined $Clang || ! -x $Clang) { $Clang = 'clang++'; } +@@ -50,7 +61,7 @@ + } + else { + $Compiler = $ENV{'CCC_CC'}; +- if (!defined $Compiler || ! -x $Compiler) { $Compiler = $DefaultCCompiler; } ++ if (!defined $Compiler || (! -x $Compiler && ! SearchInPath($Compiler))) { $Compiler = $DefaultCCompiler; } + + $Clang = $ENV{'CLANG'}; + if (!defined $Clang || ! -x $Clang) { $Clang = 'clang'; } From 998018f0ecf1da242e5ea377cc26b9526f958fd3 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Thu, 7 Aug 2014 14:23:05 +0000 Subject: [PATCH 23/41] New snapshot release --- debian/changelog | 3 ++- debian/patches/disable-powerpc-test.diff | 10 ++++++++++ debian/patches/fix-lldb-3.5-rc2.diff | 18 ++++++++++++++++++ debian/patches/series | 2 ++ 4 files changed, 32 insertions(+), 1 deletion(-) create mode 100644 debian/patches/disable-powerpc-test.diff create mode 100644 debian/patches/fix-lldb-3.5-rc2.diff diff --git a/debian/changelog b/debian/changelog index e1fbfcb0..46529a5f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,5 +1,6 @@ -llvm-toolchain-3.5 (1:3.5~+rc1-3~exp2) UNRELEASED; urgency=medium +llvm-toolchain-3.5 (1:3.5~+rc2-1~exp1) unstable; urgency=medium + * New snapshot release * Enable compressed debug sections (Closes: #757002) * Force scan-build to use the same version of clang * Bring back scan-build-search-path.diff (Closes: #757219) diff --git a/debian/patches/disable-powerpc-test.diff b/debian/patches/disable-powerpc-test.diff new file mode 100644 index 00000000..9f4cee8b --- /dev/null +++ b/debian/patches/disable-powerpc-test.diff @@ -0,0 +1,10 @@ +Index: llvm-toolchain-3.5-3.5~+rc2/test/CodeGen/PowerPC/unal-altivec.ll +=================================================================== +--- llvm-toolchain-3.5-3.5~+rc2.orig/test/CodeGen/PowerPC/unal-altivec.ll ++++ llvm-toolchain-3.5-3.5~+rc2/test/CodeGen/PowerPC/unal-altivec.ll +@@ -1,4 +1,5 @@ + ; RUN: llc < %s -mcpu=g5 | FileCheck %s ++; XFAIL: * + target datalayout = "E-p:64:64:64-i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:64:64-f32:32:32-f64:64:64-f128:128:128-v128:128:128-n32:64" + target triple = "powerpc64-unknown-linux-gnu" + diff --git a/debian/patches/fix-lldb-3.5-rc2.diff b/debian/patches/fix-lldb-3.5-rc2.diff new file mode 100644 index 00000000..1551e755 --- /dev/null +++ b/debian/patches/fix-lldb-3.5-rc2.diff @@ -0,0 +1,18 @@ +Index: llvm-toolchain-snapshot_3.5~svn211089/lldb/source/Expression/ClangExpressionParser.cpp +=================================================================== +--- llvm-toolchain-snapshot_3.5~svn211089.orig/lldb/source/Expression/ClangExpressionParser.cpp (révision 215101) ++++ llvm-toolchain-snapshot_3.5~svn211089/lldb/source/Expression/ClangExpressionParser.cpp (copie de travail) +@@ -231,9 +231,11 @@ + + // Disable some warnings. + m_compiler->getDiagnostics().setSeverityForGroup( +- "unused-value", clang::diag::Severity::Ignored, SourceLocation()); ++ diag::Flavor::Remark, "unused-value", clang::diag::Severity::Ignored, ++ SourceLocation()); + m_compiler->getDiagnostics().setSeverityForGroup( +- "odr", clang::diag::Severity::Ignored, SourceLocation()); ++ diag::Flavor::Remark, "odr", clang::diag::Severity::Ignored, ++ SourceLocation()); + + // Inform the target of the language options + // diff --git a/debian/patches/series b/debian/patches/series index 926f5fb3..30e6ad20 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -39,3 +39,5 @@ force-link-pass.o.diff follow-parallel-var.diff lldb-kfreebsd.diff hurd-EIEIO-undef.diff +disable-powerpc-test.diff +fix-lldb-3.5-rc2.diff From 2f8531a58ed91f19c41995973d0ad88e431900a1 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Thu, 7 Aug 2014 20:17:29 +0000 Subject: [PATCH 24/41] disable for the snapshot --- debian/patches/series | 1 - 1 file changed, 1 deletion(-) diff --git a/debian/patches/series b/debian/patches/series index 30e6ad20..4851d1f8 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -40,4 +40,3 @@ follow-parallel-var.diff lldb-kfreebsd.diff hurd-EIEIO-undef.diff disable-powerpc-test.diff -fix-lldb-3.5-rc2.diff From fe6bbb0fd38afecd44ba87f0a9a06e163764a605 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Fri, 8 Aug 2014 10:57:06 +0000 Subject: [PATCH 25/41] update patches --- debian/changelog | 8 ++++++++ debian/patches/hurd-EIEIO-undef.diff | 22 ++++++++++----------- debian/patches/kfreebsd-lldb-gdbserver.diff | 13 ++++++++++++ debian/patches/series | 2 ++ 4 files changed, 34 insertions(+), 11 deletions(-) create mode 100644 debian/patches/kfreebsd-lldb-gdbserver.diff diff --git a/debian/changelog b/debian/changelog index 46529a5f..55bc9a54 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +llvm-toolchain-3.5 (1:3.5~+rc2-1) unstable; urgency=medium + + * Fix the version + * try to build lldb-gdbserver under kfreebsd (kfreebsd-lldb-gdbserver.diff) + * Second try to fix build under HURD (hurd-EIEIO-undef.diff) + + -- Sylvestre Ledru Fri, 08 Aug 2014 10:42:13 +0200 + llvm-toolchain-3.5 (1:3.5~+rc2-1~exp1) unstable; urgency=medium * New snapshot release diff --git a/debian/patches/hurd-EIEIO-undef.diff b/debian/patches/hurd-EIEIO-undef.diff index 02f409e8..a7c30e53 100644 --- a/debian/patches/hurd-EIEIO-undef.diff +++ b/debian/patches/hurd-EIEIO-undef.diff @@ -1,14 +1,14 @@ -Index: llvm-toolchain-3.4-3.4.2/utils/TableGen/InstrInfoEmitter.cpp +Index: llvm-toolchain-snapshot-3.6~svn215188/utils/TableGen/CodeEmitterGen.cpp =================================================================== ---- llvm-toolchain-3.4-3.4.2.orig/utils/TableGen/InstrInfoEmitter.cpp -+++ llvm-toolchain-3.4-3.4.2/utils/TableGen/InstrInfoEmitter.cpp -@@ -569,6 +569,9 @@ void InstrInfoEmitter::emitEnums(raw_ost - OS << "\n#ifdef GET_INSTRINFO_ENUM\n"; - OS << "#undef GET_INSTRINFO_ENUM\n"; +--- llvm-toolchain-snapshot-3.6~svn215188.orig/utils/TableGen/CodeEmitterGen.cpp ++++ llvm-toolchain-snapshot-3.6~svn215188/utils/TableGen/CodeEmitterGen.cpp +@@ -241,6 +241,9 @@ void CodeEmitterGen::run(raw_ostream &o) + const std::vector &NumberedInstructions = + Target.getInstructionsByEnumValue(); -+ OS << "// Undef for HURD\n"; -+ OS << "#ifdef EIEIO\n#undef EIEIO\n#endif\n"; ++ o << "// Undef for HURD\n"; ++ o << "#ifdef EIEIO\n#undef EIEIO\n#endif\n"; + - OS << "namespace llvm {\n\n"; - - CodeGenTarget Target(Records); + // Emit function declaration + o << "uint64_t " << Target.getName(); + if (MCEmitter) diff --git a/debian/patches/kfreebsd-lldb-gdbserver.diff b/debian/patches/kfreebsd-lldb-gdbserver.diff new file mode 100644 index 00000000..6b10091c --- /dev/null +++ b/debian/patches/kfreebsd-lldb-gdbserver.diff @@ -0,0 +1,13 @@ +Index: llvm-toolchain-3.5-3.5~+rc2/lldb/tools/Makefile +=================================================================== +--- llvm-toolchain-3.5-3.5~+rc2.orig/lldb/tools/Makefile ++++ llvm-toolchain-3.5-3.5~+rc2/lldb/tools/Makefile +@@ -13,7 +13,7 @@ include $(LLDB_LEVEL)/../../Makefile.con + DIRS := + + # enable lldb-gdbserver for supported platforms +-ifneq (,$(strip $(filter $(HOST_OS), FreeBSD Linux))) ++ifneq (,$(strip $(filter $(HOST_OS), FreeBSD Linux GNU/kFreeBSD))) + DIRS += lldb-gdbserver + endif + diff --git a/debian/patches/series b/debian/patches/series index 4851d1f8..8ffd02ae 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -40,3 +40,5 @@ follow-parallel-var.diff lldb-kfreebsd.diff hurd-EIEIO-undef.diff disable-powerpc-test.diff +kfreebsd-lldb-gdbserver.diff +fix-lldb-3.5-rc2.diff From c8c0acf799364f3c9d78d4e8971dcf4f64c87eb3 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Fri, 8 Aug 2014 11:14:31 +0000 Subject: [PATCH 26/41] Disable for the nightly --- debian/patches/series | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/patches/series b/debian/patches/series index 8ffd02ae..92da0a95 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -41,4 +41,4 @@ lldb-kfreebsd.diff hurd-EIEIO-undef.diff disable-powerpc-test.diff kfreebsd-lldb-gdbserver.diff -fix-lldb-3.5-rc2.diff +#fix-lldb-3.5-rc2.diff From 01d0bca07b3dbc3b2b8597b32a96edb070f23309 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Fri, 8 Aug 2014 17:27:35 +0000 Subject: [PATCH 27/41] * Upload in unstable * Try to bring back lldb on mips & mipsel * Try to fix hurd (hurd-EIEIO-undef.diff) --- debian/changelog | 8 +++++--- debian/patches/hurd-EIEIO-undef.diff | 22 +++++++++++----------- 2 files changed, 16 insertions(+), 14 deletions(-) diff --git a/debian/changelog b/debian/changelog index e6f32127..dd83aa21 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,7 +1,9 @@ -llvm-toolchain-3.4 (1:3.4.2-7~exp2) UNRELEASED; urgency=medium +llvm-toolchain-3.4 (1:3.4.2-7) unstable; urgency=medium - * try to bring back lldb on mips & mipsel + * Upload in unstable + * Try to bring back lldb on mips & mipsel * Force scan-build to use the same version of clang + * Try to fix hurd (hurd-EIEIO-undef.diff) -- Sylvestre Ledru Tue, 05 Aug 2014 14:40:05 +0200 @@ -26,7 +28,7 @@ llvm-toolchain-3.4 (1:3.4.2-6) unstable; urgency=medium * hurd-EIEIO-undef.diff: try to undef an errno.h to fix the ftbfs * clang-X suggests clang-X-doc (Closes: #755922) * Manage all files using .in mecanism. It will simplify the upgrade of - version + file names + version + file names -- Sylvestre Ledru Wed, 23 Jul 2014 13:02:56 +0200 diff --git a/debian/patches/hurd-EIEIO-undef.diff b/debian/patches/hurd-EIEIO-undef.diff index 02f409e8..f328829e 100644 --- a/debian/patches/hurd-EIEIO-undef.diff +++ b/debian/patches/hurd-EIEIO-undef.diff @@ -1,14 +1,14 @@ -Index: llvm-toolchain-3.4-3.4.2/utils/TableGen/InstrInfoEmitter.cpp +Index: llvm-toolchain-3.4-3.4.2/utils/TableGen/CodeEmitterGen.cpp =================================================================== ---- llvm-toolchain-3.4-3.4.2.orig/utils/TableGen/InstrInfoEmitter.cpp -+++ llvm-toolchain-3.4-3.4.2/utils/TableGen/InstrInfoEmitter.cpp -@@ -569,6 +569,9 @@ void InstrInfoEmitter::emitEnums(raw_ost - OS << "\n#ifdef GET_INSTRINFO_ENUM\n"; - OS << "#undef GET_INSTRINFO_ENUM\n"; +--- llvm-toolchain-3.4-3.4.2.orig/utils/TableGen/CodeEmitterGen.cpp ++++ llvm-toolchain-3.4-3.4.2/utils/TableGen/CodeEmitterGen.cpp +@@ -244,6 +244,9 @@ void CodeEmitterGen::run(raw_ostream &o) + const std::vector &NumberedInstructions = + Target.getInstructionsByEnumValue(); -+ OS << "// Undef for HURD\n"; -+ OS << "#ifdef EIEIO\n#undef EIEIO\n#endif\n"; ++ o << "// Undef for HURD\n"; ++ o << "#ifdef EIEIO\n#undef EIEIO\n#endif\n"; + - OS << "namespace llvm {\n\n"; - - CodeGenTarget Target(Records); + // Emit function declaration + o << "uint64_t " << Target.getName(); + if (MCEmitter) From 119542a56bd05222c3d1b94003f854f37411d94c Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Sat, 9 Aug 2014 20:37:10 +0000 Subject: [PATCH 28/41] Cherry-pick to commit from upstream (revisions 214906 214907) to improve the gcc compat --- debian/changelog | 7 + debian/patches/gcc-compat-1.diff | 276 +++++++++++++++++++++++++++++++ debian/patches/gcc-compat-2.diff | 84 ++++++++++ debian/patches/series | 2 + 4 files changed, 369 insertions(+) create mode 100644 debian/patches/gcc-compat-1.diff create mode 100644 debian/patches/gcc-compat-2.diff diff --git a/debian/changelog b/debian/changelog index 55bc9a54..46d66e35 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +llvm-toolchain-3.5 (1:3.5~+rc2-2) UNRELEASED; urgency=medium + + * Cherry-pick to commit from upstream (revisions 214906 214907) + to improve the gcc compat + + -- Sylvestre Ledru Sat, 09 Aug 2014 22:36:06 +0200 + llvm-toolchain-3.5 (1:3.5~+rc2-1) unstable; urgency=medium * Fix the version diff --git a/debian/patches/gcc-compat-1.diff b/debian/patches/gcc-compat-1.diff new file mode 100644 index 00000000..d143a1d5 --- /dev/null +++ b/debian/patches/gcc-compat-1.diff @@ -0,0 +1,276 @@ +Index: llvm-toolchain-snapshot_3.5~svn193603/clang/test/Driver/clang_f_opts.c +=================================================================== +--- llvm-toolchain-snapshot_3.5~svn193603.orig/clang/test/Driver/clang_f_opts.c (révision 214905) ++++ llvm-toolchain-snapshot_3.5~svn193603/clang/test/Driver/clang_f_opts.c (révision 214906) +@@ -166,6 +166,47 @@ + // RUN: -fstrength-reduce -fno-strength-reduce \ + // RUN: -finline-limit=1000 \ + // RUN: -finline-limit \ ++// RUN: -flto=1 \ ++// RUN: -falign-labels \ ++// RUN: -falign-labels=100 \ ++// RUN: -falign-loops \ ++// RUN: -falign-loops=100 \ ++// RUN: -falign-jumps \ ++// RUN: -falign-jumps=100 \ ++// RUN: -fexcess-precision=100 \ ++// RUN: -fbranch-count-reg \ ++// RUN: -fcaller-saves \ ++// RUN: -fno-default-inline -fdefault-inline \ ++// RUN: -fgcse-after-reload \ ++// RUN: -fgcse-las \ ++// RUN: -fgcse-sm \ ++// RUN: -fipa-cp \ ++// RUN: -finline-functions-called-once \ ++// RUN: -fmodulo-sched \ ++// RUN: -fmodulo-sched-allow-regmoves \ ++// RUN: -fpeel-loops \ ++// RUN: -frename-registers \ ++// RUN: -fschedule-insns2 \ ++// RUN: -fsingle-precision-constant \ ++// RUN: -ftree_loop_im \ ++// RUN: -ftree_loop_ivcanon \ ++// RUN: -ftree_loop_linear \ ++// RUN: -funsafe-loop-optimizations \ ++// RUN: -fuse-linker-plugin \ ++// RUN: -fvect-cost-model \ ++// RUN: -fvariable-expansion-in-unroller \ ++// RUN: -fweb \ ++// RUN: -fwhole-program \ ++// RUN: -fno-tree-dce -ftree-dce \ ++// RUN: -fno-tree-ter -ftree-ter \ ++// RUN: -fno-tree-vrp -ftree-vrp \ ++// RUN: -fno-delete-null-pointer-checks -fdelete-null-pointer-checks \ ++// RUN: -fno-inline-small-functions -finline-small-functions \ ++// RUN: -fno-fat-lto-objects -ffat-lto-objects \ ++// RUN: -fno-merge-constants -fmerge-constants \ ++// RUN: -fno-caller-saves -fcaller-saves \ ++// RUN: -fno-reorder-blocks -freorder-blocks \ ++// RUN: -fno-schedule-insns2 -fschedule-insns2 \ + // RUN: %s 2>&1 | FileCheck --check-prefix=IGNORE %s + // IGNORE-NOT: error: unknown argument + +@@ -197,6 +238,46 @@ + // RUN: -ftracer \ + // RUN: -funroll-all-loops \ + // RUN: -funswitch-loops \ ++// RUN: -flto=1 \ ++// RUN: -falign-labels \ ++// RUN: -falign-labels=100 \ ++// RUN: -falign-loops \ ++// RUN: -falign-loops=100 \ ++// RUN: -falign-jumps \ ++// RUN: -falign-jumps=100 \ ++// RUN: -fexcess-precision=100 \ ++// RUN: -fbranch-count-reg \ ++// RUN: -fcaller-saves \ ++// RUN: -fno-default-inline \ ++// RUN: -fgcse-after-reload \ ++// RUN: -fgcse-las \ ++// RUN: -fgcse-sm \ ++// RUN: -fipa-cp \ ++// RUN: -finline-functions-called-once \ ++// RUN: -fmodulo-sched \ ++// RUN: -fmodulo-sched-allow-regmoves \ ++// RUN: -fpeel-loops \ ++// RUN: -frename-registers \ ++// RUN: -fschedule-insns2 \ ++// RUN: -fsingle-precision-constant \ ++// RUN: -ftree_loop_im \ ++// RUN: -ftree_loop_ivcanon \ ++// RUN: -ftree_loop_linear \ ++// RUN: -funsafe-loop-optimizations \ ++// RUN: -fuse-linker-plugin \ ++// RUN: -fvect-cost-model \ ++// RUN: -fvariable-expansion-in-unroller \ ++// RUN: -fweb \ ++// RUN: -fwhole-program \ ++// RUN: -fcaller-saves \ ++// RUN: -freorder-blocks \ ++// RUN: -fdelete-null-pointer-checks \ ++// RUN: -ffat-lto-objects \ ++// RUN: -fmerge-constants \ ++// RUN: -finline-small-functions \ ++// RUN: -ftree-dce \ ++// RUN: -ftree-ter \ ++// RUN: -ftree-vrp \ + // RUN: %s 2>&1 | FileCheck --check-prefix=CHECK-WARNING %s + // CHECK-WARNING-DAG: optimization flag '-finline-limit=1000' is not supported + // CHECK-WARNING-DAG: optimization flag '-finline-limit' is not supported +@@ -224,6 +305,46 @@ + // CHECK-WARNING-DAG: optimization flag '-ftracer' is not supported + // CHECK-WARNING-DAG: optimization flag '-funroll-all-loops' is not supported + // CHECK-WARNING-DAG: optimization flag '-funswitch-loops' is not supported ++// CHECK-WARNING-DAG: optimization flag '-flto=1' is not supported ++// CHECK-WARNING-DAG: optimization flag '-falign-labels' is not supported ++// CHECK-WARNING-DAG: optimization flag '-falign-labels=100' is not supported ++// CHECK-WARNING-DAG: optimization flag '-falign-loops' is not supported ++// CHECK-WARNING-DAG: optimization flag '-falign-loops=100' is not supported ++// CHECK-WARNING-DAG: optimization flag '-falign-jumps' is not supported ++// CHECK-WARNING-DAG: optimization flag '-falign-jumps=100' is not supported ++// CHECK-WARNING-DAG: optimization flag '-fexcess-precision=100' is not supported ++// CHECK-WARNING-DAG: optimization flag '-fbranch-count-reg' is not supported ++// CHECK-WARNING-DAG: optimization flag '-fcaller-saves' is not supported ++// CHECK-WARNING-DAG: optimization flag '-fno-default-inline' is not supported ++// CHECK-WARNING-DAG: optimization flag '-fgcse-after-reload' is not supported ++// CHECK-WARNING-DAG: optimization flag '-fgcse-las' is not supported ++// CHECK-WARNING-DAG: optimization flag '-fgcse-sm' is not supported ++// CHECK-WARNING-DAG: optimization flag '-fipa-cp' is not supported ++// CHECK-WARNING-DAG: optimization flag '-finline-functions-called-once' is not supported ++// CHECK-WARNING-DAG: optimization flag '-fmodulo-sched' is not supported ++// CHECK-WARNING-DAG: optimization flag '-fmodulo-sched-allow-regmoves' is not supported ++// CHECK-WARNING-DAG: optimization flag '-fpeel-loops' is not supported ++// CHECK-WARNING-DAG: optimization flag '-frename-registers' is not supported ++// CHECK-WARNING-DAG: optimization flag '-fschedule-insns2' is not supported ++// CHECK-WARNING-DAG: optimization flag '-fsingle-precision-constant' is not supported ++// CHECK-WARNING-DAG: optimization flag '-ftree_loop_im' is not supported ++// CHECK-WARNING-DAG: optimization flag '-ftree_loop_ivcanon' is not supported ++// CHECK-WARNING-DAG: optimization flag '-ftree_loop_linear' is not supported ++// CHECK-WARNING-DAG: optimization flag '-funsafe-loop-optimizations' is not supported ++// CHECK-WARNING-DAG: optimization flag '-fuse-linker-plugin' is not supported ++// CHECK-WARNING-DAG: optimization flag '-fvect-cost-model' is not supported ++// CHECK-WARNING-DAG: optimization flag '-fvariable-expansion-in-unroller' is not supported ++// CHECK-WARNING-DAG: optimization flag '-fweb' is not supported ++// CHECK-WARNING-DAG: optimization flag '-fwhole-program' is not supported ++// CHECK-WARNING-DAG: optimization flag '-fcaller-saves' is not supported ++// CHECK-WARNING-DAG: optimization flag '-freorder-blocks' is not supported ++// CHECK-WARNING-DAG: optimization flag '-fdelete-null-pointer-checks' is not supported ++// CHECK-WARNING-DAG: optimization flag '-ffat-lto-objects' is not supported ++// CHECK-WARNING-DAG: optimization flag '-fmerge-constants' is not supported ++// CHECK-WARNING-DAG: optimization flag '-finline-small-functions' is not supported ++// CHECK-WARNING-DAG: optimization flag '-ftree-dce' is not supported ++// CHECK-WARNING-DAG: optimization flag '-ftree-ter' is not supported ++// CHECK-WARNING-DAG: optimization flag '-ftree-vrp' is not supported + + // Test that we mute the warning on these + // RUN: %clang -### -finline-limit=1000 -Wno-invalid-command-line-argument \ +Index: llvm-toolchain-snapshot_3.5~svn193603/clang/include/clang/Driver/Options.td +=================================================================== +--- llvm-toolchain-snapshot_3.5~svn193603.orig/clang/include/clang/Driver/Options.td (révision 214905) ++++ llvm-toolchain-snapshot_3.5~svn193603/clang/include/clang/Driver/Options.td (révision 214906) +@@ -478,6 +478,8 @@ + def ferror_limit_EQ : Joined<["-"], "ferror-limit=">, Group, Flags<[CoreOption]>; + def fexceptions : Flag<["-"], "fexceptions">, Group, Flags<[CC1Option]>, + HelpText<"Enable support for exception handling">; ++def fexcess_precision_EQ : Joined<["-"], "fexcess-precision=">, ++ Group; + def : Flag<["-"], "fexpensive-optimizations">, Group; + def : Flag<["-"], "fno-expensive-optimizations">, Group; + def fextdirs_EQ : Joined<["-"], "fextdirs=">, Group; +@@ -579,6 +581,7 @@ + def flat__namespace : Flag<["-"], "flat_namespace">; + def flax_vector_conversions : Flag<["-"], "flax-vector-conversions">, Group; + def flimited_precision_EQ : Joined<["-"], "flimited-precision=">, Group; ++def flto_EQ : Joined<["-"], "flto=">, Group; + def flto : Flag<["-"], "flto">, Group; + def fno_lto : Flag<["-"], "fno-lto">, Group; + def fmacro_backtrace_limit_EQ : Joined<["-"], "fmacro-backtrace-limit=">, +@@ -818,7 +821,6 @@ + def : Flag<["-"], "fsched-interblock">, Group; + def fshort_enums : Flag<["-"], "fshort-enums">, Group, Flags<[CC1Option]>, + HelpText<"Allocate to an enum type only as many bytes as it needs for the declared range of possible values">; +-def : Flag<["-"], "freorder-blocks">, Group; + def fshort_wchar : Flag<["-"], "fshort-wchar">, Group, Flags<[CC1Option]>, + HelpText<"Force wchar_t to be a short unsigned int">; + def fno_short_wchar : Flag<["-"], "fno-short-wchar">, Group, Flags<[CC1Option]>, +@@ -913,8 +915,7 @@ + def fuse_cxa_atexit : Flag<["-"], "fuse-cxa-atexit">, Group; + def fuse_init_array : Flag<["-"], "fuse-init-array">, Group, Flags<[CC1Option]>, + HelpText<"Use .init_array instead of .ctors">; +-def fno_var_tracking : Flag<["-"], "fno-var-tracking">, +- Group; ++def fno_var_tracking : Flag<["-"], "fno-var-tracking">, Group; + def fverbose_asm : Flag<["-"], "fverbose-asm">, Group; + def fvisibility_EQ : Joined<["-"], "fvisibility=">, Group, + HelpText<"Set the default symbol visibility for all global declarations">; +@@ -1608,22 +1609,49 @@ + + defm align_functions : BooleanFFlag<"align-functions">, Group; + def falign_functions_EQ : Joined<["-"], "falign-functions=">, Group; ++defm align_labels : BooleanFFlag<"align-labels">, Group; ++def falign_labels_EQ : Joined<["-"], "falign-labels=">, Group; ++defm align_loops : BooleanFFlag<"align-loops">, Group; ++def falign_loops_EQ : Joined<["-"], "falign-loops=">, Group; ++defm align_jumps : BooleanFFlag<"align-jumps">, Group; ++def falign_jumps_EQ : Joined<["-"], "falign-jumps=">, Group; + + // FIXME: This option should be supported and wired up to our diognostics, but + // ignore it for now to avoid breaking builds that use it. + def fdiagnostics_show_location_EQ : Joined<["-"], "fdiagnostics-show-location=">, Group; + ++defm caller_saves : BooleanFFlag<"caller-saves">, Group; ++defm reorder_blocks : BooleanFFlag<"reorder-blocks">, Group; + defm eliminate_unused_debug_types : BooleanFFlag<"eliminate-unused-debug-types">, Group; ++defm branch_count_reg : BooleanFFlag<"branch-count-reg">, Group; ++defm default_inline : BooleanFFlag<"default-inline">, Group; ++defm delete_null_pointer_checks : BooleanFFlag<"delete-null-pointer-checks">, ++ Group; ++defm fat_lto_objects : BooleanFFlag<"fat-lto-objects">, Group; + defm float_store : BooleanFFlag<"float-store">, Group; + defm function_attribute_list : BooleanFFlag<"function-attribute-list">, Group; + defm gcse : BooleanFFlag<"gcse">, Group; ++defm gcse_after_reload: BooleanFFlag<"gcse-after-reload">, Group; ++defm gcse_las: BooleanFFlag<"gcse-las">, Group; ++defm gcse_sm: BooleanFFlag<"gcse-sm">, Group; + defm gnu : BooleanFFlag<"gnu">, Group; + defm ident : BooleanFFlag<"ident">, Group; + defm implicit_templates : BooleanFFlag<"implicit-templates">, Group; ++defm merge_constants : BooleanFFlag<"merge-constants">, Group; ++defm modulo_sched : BooleanFFlag<"modulo-sched">, Group; ++defm modulo_sched_allow_regmoves : BooleanFFlag<"modulo-sched-allow-regmoves">, ++ Group; ++defm inline_functions_called_once : BooleanFFlag<"inline-functions-called-once">, ++ Group; + def finline_limit_EQ : Joined<["-"], "finline-limit=">, Group; + defm finline_limit : BooleanFFlag<"inline-limit">, Group; ++defm inline_small_functions : BooleanFFlag<"inline-small-functions">, ++ Group; ++defm ipa_cp : BooleanFFlag<"ipa-cp">, ++ Group; + defm ivopts : BooleanFFlag<"ivopts">, Group; + defm non_call_exceptions : BooleanFFlag<"non-call-exceptions">, Group; ++defm peel_loops : BooleanFFlag<"peel-loops">, Group; + defm permissive : BooleanFFlag<"permissive">, Group; + defm prefetch_loop_arrays : BooleanFFlag<"prefetch-loop-arrays">, Group; + defm printf : BooleanFFlag<"printf">, Group; +@@ -1633,22 +1661,39 @@ + defm profile_reusedist : BooleanFFlag<"profile-reusedist">, Group; + defm profile_values : BooleanFFlag<"profile-values">, Group; + defm regs_graph : BooleanFFlag<"regs-graph">, Group; ++defm rename_registers : BooleanFFlag<"rename-registers">, Group; + defm ripa : BooleanFFlag<"ripa">, Group; + defm rounding_math : BooleanFFlag<"rounding-math">, Group; + defm schedule_insns : BooleanFFlag<"schedule-insns">, Group; ++defm schedule_insns2 : BooleanFFlag<"schedule-insns2">, Group; + defm see : BooleanFFlag<"see">, Group; + defm signaling_nans : BooleanFFlag<"signaling-nans">, Group; ++defm single_precision_constant : BooleanFFlag<"single-precision-constant">, ++ Group; + defm spec_constr_count : BooleanFFlag<"spec-constr-count">, Group; + defm strength_reduce : + BooleanFFlag<"strength-reduce">, Group; + defm tls_model : BooleanFFlag<"tls-model">, Group; + defm tracer : BooleanFFlag<"tracer">, Group; ++defm tree_dce : BooleanFFlag<"tree-dce">, Group; ++defm tree_loop_im : BooleanFFlag<"tree_loop_im">, Group; ++defm tree_loop_ivcanon : BooleanFFlag<"tree_loop_ivcanon">, Group; ++defm tree_loop_linear : BooleanFFlag<"tree_loop_linear">, Group; + defm tree_salias : BooleanFFlag<"tree-salias">, Group; ++defm tree_ter : BooleanFFlag<"tree-ter">, Group; + defm tree_vectorizer_verbose : BooleanFFlag<"tree-vectorizer-verbose">, Group; ++defm tree_vrp : BooleanFFlag<"tree-vrp">, Group; + defm unroll_all_loops : BooleanFFlag<"unroll-all-loops">, Group; ++defm unsafe_loop_optimizations : BooleanFFlag<"unsafe-loop-optimizations">, ++ Group; + defm unswitch_loops : BooleanFFlag<"unswitch-loops">, Group; ++defm use_linker_plugin : BooleanFFlag<"use-linker-plugin">, Group; ++defm vect_cost_model : BooleanFFlag<"vect-cost-model">, Group; ++defm variable_expansion_in_unroller : BooleanFFlag<"variable-expansion-in-unroller">, ++ Group; ++defm web : BooleanFFlag<"web">, Group; ++defm whole_program : BooleanFFlag<"whole-program">, Group; + +- + // gfortran options that we recognize in the driver and pass along when + // invoking GCC to compile Fortran code. + def gfortran_Group : OptionGroup<"gfortran Group">; diff --git a/debian/patches/gcc-compat-2.diff b/debian/patches/gcc-compat-2.diff new file mode 100644 index 00000000..0a70c3bd --- /dev/null +++ b/debian/patches/gcc-compat-2.diff @@ -0,0 +1,84 @@ +Index: llvm-toolchain-snapshot_3.5~svn193603/clang/test/Driver/clang_f_opts.c +=================================================================== +--- llvm-toolchain-snapshot_3.5~svn193603.orig/clang/test/Driver/clang_f_opts.c (révision 214906) ++++ llvm-toolchain-snapshot_3.5~svn193603/clang/test/Driver/clang_f_opts.c (révision 214907) +@@ -207,6 +207,16 @@ + // RUN: -fno-caller-saves -fcaller-saves \ + // RUN: -fno-reorder-blocks -freorder-blocks \ + // RUN: -fno-schedule-insns2 -fschedule-insns2 \ ++// RUN: -fno-stack-check \ ++// RUN: -fno-check-new -fcheck-new \ ++// RUN: -ffriend-injection \ ++// RUN: -fno-implement-inlines -fimplement-inlines \ ++// RUN: -fstack-check \ ++// RUN: -fexec-charset=UTF-8 \ ++// RUN: -fforce-addr \ ++// RUN: -malign-functions=100 \ ++// RUN: -malign-loops=100 \ ++// RUN: -malign-jumps=100 \ + // RUN: %s 2>&1 | FileCheck --check-prefix=IGNORE %s + // IGNORE-NOT: error: unknown argument + +Index: llvm-toolchain-snapshot_3.5~svn193603/clang/include/clang/Driver/Options.td +=================================================================== +--- llvm-toolchain-snapshot_3.5~svn193603.orig/clang/include/clang/Driver/Options.td (révision 214906) ++++ llvm-toolchain-snapshot_3.5~svn193603/clang/include/clang/Driver/Options.td (révision 214907) +@@ -476,6 +476,7 @@ + HelpText<"Emit all declarations, even if unused">; + def fencoding_EQ : Joined<["-"], "fencoding=">, Group; + def ferror_limit_EQ : Joined<["-"], "ferror-limit=">, Group, Flags<[CoreOption]>; ++def fexec_charset_EQ : Joined<["-"], "fexec-charset=">, Group; + def fexceptions : Flag<["-"], "fexceptions">, Group, Flags<[CC1Option]>, + HelpText<"Enable support for exception handling">; + def fexcess_precision_EQ : Joined<["-"], "fexcess-precision=">, +@@ -797,6 +798,7 @@ + def force__cpusubtype__ALL : Flag<["-"], "force_cpusubtype_ALL">; + def force__flat__namespace : Flag<["-"], "force_flat_namespace">; + def force__load : Separate<["-"], "force_load">; ++def force_addr : Joined<["-"], "fforce-addr">, Group; + def foutput_class_dir_EQ : Joined<["-"], "foutput-class-dir=">, Group; + def fpack_struct : Flag<["-"], "fpack-struct">, Group; + def fno_pack_struct : Flag<["-"], "fno-pack-struct">, Group; +@@ -1039,6 +1041,10 @@ + def m64 : Flag<["-"], "m64">, Group, Flags<[DriverOption, CoreOption]>; + def mx32 : Flag<["-"], "mx32">, Group, Flags<[DriverOption, CoreOption]>; + def mabi_EQ : Joined<["-"], "mabi=">, Group; ++def malign_functions_EQ : Joined<["-"], "malign-functions=">, Group; ++def malign_loops_EQ : Joined<["-"], "malign-loops=">, Group; ++def malign_jumps_EQ : Joined<["-"], "malign-jumps=">, Group; ++def mfancy_math_387 : Flag<["-"], "mfancy-math-387">, Group; + def march_EQ : Joined<["-"], "march=">, Group; + def masm_EQ : Joined<["-"], "masm=">, Group, Flags<[DriverOption]>; + def mcmodel_EQ : Joined<["-"], "mcmodel=">, Group; +@@ -1620,6 +1626,7 @@ + // ignore it for now to avoid breaking builds that use it. + def fdiagnostics_show_location_EQ : Joined<["-"], "fdiagnostics-show-location=">, Group; + ++defm fcheck_new : BooleanFFlag<"check-new">, Group; + defm caller_saves : BooleanFFlag<"caller-saves">, Group; + defm reorder_blocks : BooleanFFlag<"reorder-blocks">, Group; + defm eliminate_unused_debug_types : BooleanFFlag<"eliminate-unused-debug-types">, Group; +@@ -1629,6 +1636,7 @@ + Group; + defm fat_lto_objects : BooleanFFlag<"fat-lto-objects">, Group; + defm float_store : BooleanFFlag<"float-store">, Group; ++defm friend_injection : BooleanFFlag<"friend-injection">, Group; + defm function_attribute_list : BooleanFFlag<"function-attribute-list">, Group; + defm gcse : BooleanFFlag<"gcse">, Group; + defm gcse_after_reload: BooleanFFlag<"gcse-after-reload">, Group; +@@ -1637,6 +1645,7 @@ + defm gnu : BooleanFFlag<"gnu">, Group; + defm ident : BooleanFFlag<"ident">, Group; + defm implicit_templates : BooleanFFlag<"implicit-templates">, Group; ++defm implement_inlines : BooleanFFlag<"implement-inlines">, Group; + defm merge_constants : BooleanFFlag<"merge-constants">, Group; + defm modulo_sched : BooleanFFlag<"modulo-sched">, Group; + defm modulo_sched_allow_regmoves : BooleanFFlag<"modulo-sched-allow-regmoves">, +@@ -1671,6 +1680,7 @@ + defm single_precision_constant : BooleanFFlag<"single-precision-constant">, + Group; + defm spec_constr_count : BooleanFFlag<"spec-constr-count">, Group; ++defm stack_check : BooleanFFlag<"stack-check">, Group; + defm strength_reduce : + BooleanFFlag<"strength-reduce">, Group; + defm tls_model : BooleanFFlag<"tls-model">, Group; diff --git a/debian/patches/series b/debian/patches/series index 92da0a95..ea37bbf8 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -42,3 +42,5 @@ hurd-EIEIO-undef.diff disable-powerpc-test.diff kfreebsd-lldb-gdbserver.diff #fix-lldb-3.5-rc2.diff +gcc-compat-1.diff +gcc-compat-2.diff From 72ecdab7f9e82aadb650c33829c9c26d85af6f28 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Tue, 12 Aug 2014 06:32:20 +0000 Subject: [PATCH 29/41] Remove scan-build-clang-path.diff (applied upstream) --- debian/changelog | 1 + debian/patches/series | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 46d66e35..951ee000 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,7 @@ llvm-toolchain-3.5 (1:3.5~+rc2-2) UNRELEASED; urgency=medium * Cherry-pick to commit from upstream (revisions 214906 214907) to improve the gcc compat + * Remove scan-build-clang-path.diff (applied upstream) -- Sylvestre Ledru Sat, 09 Aug 2014 22:36:06 +0200 diff --git a/debian/patches/series b/debian/patches/series index ea37bbf8..562ce13f 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -9,7 +9,7 @@ 0021-shared-lib-debian.patch 0023-link-libopagent.patch 0044-soname.diff -scan-build-clang-path.diff +#scan-build-clang-path.diff 0050-powerpcspe-fp.diff declare_clear_cache.diff 31-powerpcspe.diff From 98f5f3fb76efb2510548c8f7074652de820e4276 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Sat, 16 Aug 2014 20:39:25 +0000 Subject: [PATCH 30/41] Try to bring back lldb-3.4-dev on mips & mipsel (oups) --- debian/changelog | 6 ++++++ debian/control | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index dd83aa21..c4b308f8 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +llvm-toolchain-3.4 (1:3.4.2-8) unstable; urgency=medium + + * Try to bring back lldb-3.4-dev on mips & mipsel (oups) + + -- Sylvestre Ledru Sat, 16 Aug 2014 22:39:13 +0200 + llvm-toolchain-3.4 (1:3.4.2-7) unstable; urgency=medium * Upload in unstable diff --git a/debian/control b/debian/control index 0370dbb5..f84f77a9 100644 --- a/debian/control +++ b/debian/control @@ -395,7 +395,7 @@ Description: Next generation, high-performance debugger Project, such as the Clang expression parser and LLVM disassembler. Package: lldb-3.4-dev -Architecture: amd64 armel armhf i386 kfreebsd-amd64 kfreebsd-i386 s390 s390x sparc alpha hppa m68k powerpcspe ppc64 sh4 sparc64 x32 powerpc +Architecture: amd64 armel armhf i386 kfreebsd-amd64 kfreebsd-i386 s390 s390x sparc alpha hppa m68k powerpcspe ppc64 sh4 sparc64 x32 powerpc mips mipsel # ia64 mips mipsel hurd have been removed Depends: ${shlibs:Depends}, ${misc:Depends}, lldb-3.4 (= ${binary:Version}) Pre-Depends: ${misc:Pre-Depends} From 85ac97be761283baed2f45db90d180af977082d6 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Sat, 16 Aug 2014 20:40:57 +0000 Subject: [PATCH 31/41] Just like in 3.4, bring back lldb & lldb-dev under mips & mipsel --- debian/changelog | 1 + debian/control | 4 ++-- debian/rules | 6 +++--- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/debian/changelog b/debian/changelog index 951ee000..7844e9af 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,7 @@ llvm-toolchain-3.5 (1:3.5~+rc2-2) UNRELEASED; urgency=medium * Cherry-pick to commit from upstream (revisions 214906 214907) to improve the gcc compat * Remove scan-build-clang-path.diff (applied upstream) + * Just like in 3.4, bring back lldb & lldb-dev under mips & mipsel -- Sylvestre Ledru Sat, 09 Aug 2014 22:36:06 +0200 diff --git a/debian/control b/debian/control index 1ddab9aa..b75f49bb 100644 --- a/debian/control +++ b/debian/control @@ -378,7 +378,7 @@ Description: Modular compiler and toolchain technologies, examples # ------------- lldb ------------- Package: lldb-3.5 -Architecture: amd64 armel armhf i386 kfreebsd-amd64 kfreebsd-i386 s390 s390x sparc alpha hppa m68k powerpcspe ppc64 sh4 sparc64 x32 powerpc +Architecture: amd64 armel armhf i386 kfreebsd-amd64 kfreebsd-i386 s390 s390x sparc alpha hppa m68k powerpcspe ppc64 sh4 sparc64 x32 powerpc mips mipsel # ia64 mips mipsel hurd have been removed Depends: ${shlibs:Depends}, ${misc:Depends}, libllvm3.5 (= ${binary:Version}), python, llvm-3.5-dev Pre-Depends: ${misc:Pre-Depends} @@ -390,7 +390,7 @@ Description: Next generation, high-performance debugger Project, such as the Clang expression parser and LLVM disassembler. Package: lldb-3.5-dev -Architecture: amd64 armel armhf i386 kfreebsd-amd64 kfreebsd-i386 s390 s390x sparc alpha hppa m68k powerpcspe ppc64 sh4 sparc64 x32 powerpc +Architecture: amd64 armel armhf i386 kfreebsd-amd64 kfreebsd-i386 s390 s390x sparc alpha hppa m68k powerpcspe ppc64 sh4 sparc64 x32 powerpc mips mipsel # ia64 mips mipsel hurd have been removed Depends: ${shlibs:Depends}, ${misc:Depends}, lldb-3.5 (= ${binary:Version}) Pre-Depends: ${misc:Pre-Depends} diff --git a/debian/rules b/debian/rules index 5fadc1aa..d7ccd140 100755 --- a/debian/rules +++ b/debian/rules @@ -116,7 +116,7 @@ endif LLDB_ENABLE=yes -LLDB_DISABLE_ARCHS := arm64 hurd-i386 mips mipsel ia64 ppc64el +LLDB_DISABLE_ARCHS := arm64 hurd-i386 ia64 ppc64el # hurd has threading issues # mips* fails with "undefined references to `__atomic_load_8'" ifeq (,$(filter-out $(LLDB_DISABLE_ARCHS), $(DEB_HOST_ARCH))) @@ -310,9 +310,9 @@ override_dh_auto_install: # Rename some stuff with the version name cp $(CURDIR)/$(TARGET_BUILD)/tools/clang/docs/tools/clang.1 $(CURDIR)/$(TARGET_BUILD)/tools/clang/docs/tools/clang-$(LLVM_VERSION).1 - + cp $(CURDIR)/clang/tools/scan-build/scan-build.1 $(CURDIR)/clang/tools/scan-build/scan-build-$(LLVM_VERSION).1 - + cp -f $(CURDIR)/utils/vim/llvm.vim $(CURDIR)/utils/vim/llvm-$(LLVM_VERSION).vim cp -f $(CURDIR)/utils/vim/tablegen.vim $(CURDIR)/utils/vim/tablegen-$(LLVM_VERSION).vim From aa16a75a06a5262d8c9d3713c2204873ad07f6d7 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Sat, 16 Aug 2014 20:43:26 +0000 Subject: [PATCH 32/41] add the bug number --- debian/changelog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index c4b308f8..64b932b3 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,6 @@ llvm-toolchain-3.4 (1:3.4.2-8) unstable; urgency=medium - * Try to bring back lldb-3.4-dev on mips & mipsel (oups) + * Try to bring back lldb-3.4-dev on mips & mipsel (Closes: #758314) -- Sylvestre Ledru Sat, 16 Aug 2014 22:39:13 +0200 From a7e92be66aeb77bbbe6a15bceae8ef44c63cf66c Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Thu, 21 Aug 2014 06:04:32 +0000 Subject: [PATCH 33/41] New snapshot release --- debian/changelog | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 7844e9af..1725dca3 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,11 +1,12 @@ -llvm-toolchain-3.5 (1:3.5~+rc2-2) UNRELEASED; urgency=medium +llvm-toolchain-3.5 (1:3.5~+rc3-1) unstable; urgency=medium + * New snapshot release * Cherry-pick to commit from upstream (revisions 214906 214907) to improve the gcc compat * Remove scan-build-clang-path.diff (applied upstream) * Just like in 3.4, bring back lldb & lldb-dev under mips & mipsel - -- Sylvestre Ledru Sat, 09 Aug 2014 22:36:06 +0200 + -- Sylvestre Ledru Wed, 20 Aug 2014 23:43:06 +0200 llvm-toolchain-3.5 (1:3.5~+rc2-1) unstable; urgency=medium From 379114da54e399714861976f254bf3d9a5b85c22 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Tue, 26 Aug 2014 09:06:42 +0000 Subject: [PATCH 34/41] minor fixes --- debian/rules | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/debian/rules b/debian/rules index 3b4368db..5daa619b 100755 --- a/debian/rules +++ b/debian/rules @@ -311,9 +311,9 @@ override_dh_auto_install: # Rename some stuff with the version name cp $(CURDIR)/$(TARGET_BUILD)/tools/clang/docs/tools/clang.1 $(CURDIR)/$(TARGET_BUILD)/tools/clang/docs/tools/clang-$(LLVM_VERSION).1 - + cp $(CURDIR)/clang/tools/scan-build/scan-build.1 $(CURDIR)/clang/tools/scan-build/scan-build-$(LLVM_VERSION).1 - + cp -f $(CURDIR)/utils/vim/llvm.vim $(CURDIR)/utils/vim/llvm-$(LLVM_VERSION).vim cp -f $(CURDIR)/utils/vim/tablegen.vim $(CURDIR)/utils/vim/tablegen-$(LLVM_VERSION).vim @@ -363,9 +363,6 @@ override_dh_strip: dh_strip -a -override_dh_install: - dh_install --fail-missing - override_dh_installdeb: # Managed by the package dh_installdeb -a @@ -378,8 +375,6 @@ override_dh_installdeb: find $(CURDIR)/debian/llvm-$(LLVM_VERSION)-tools/usr/lib/llvm-$(LLVM_VERSION)/ -name '*.pyc' | xargs -r rm -f - - ifeq (,$(filter nocheck, $(DEB_BUILD_OPTIONS))) # List of the archs we know we have 100 % tests working ARCH_LLVM_TEST_OK := amd64 i386 From e20b0f7bd0ff2ad4d7fb043ee83077eec95df50f Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Thu, 28 Aug 2014 06:28:40 +0000 Subject: [PATCH 35/41] New snapshot release --- debian/changelog | 6 ++++++ debian/patches/series | 4 ++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 1725dca3..3f34ae03 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +llvm-toolchain-3.5 (1:3.5~+rc4-1) unstable; urgency=medium + + * New snapshot release + + -- Sylvestre Ledru Wed, 27 Aug 2014 23:09:59 +0200 + llvm-toolchain-3.5 (1:3.5~+rc3-1) unstable; urgency=medium * New snapshot release diff --git a/debian/patches/series b/debian/patches/series index 562ce13f..d96d7063 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -19,14 +19,14 @@ disable-execinfo-usage.diff unwind-chain-inclusion.diff hurd-pathmax.diff use-deb-json.diff -libstdc++-header-i386.diff +#libstdc++-header-i386.diff atomic_library_1.diff atomic_library_2.diff python-clangpath.diff removeduplicatedeclaration.diff fix-clang-path-and-build.diff silent-MCJIIT-tests.diff -include-target.diff +#include-target.diff force-gcc-header-obj.diff do-not-fail-on-unexpected-pass.diff silent-more-tests.diff From d13452ba59293f5c97352623f8a83033bcd4c838 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Mon, 1 Sep 2014 11:49:31 +0000 Subject: [PATCH 36/41] * libclang-3.4.so should be used instead libclang.so. Update the soname to match the new lib name (Closes: #759538) * Rename liblldb.so to liblldb-3.4.so + update of the soname. * python-clang-3.4 description updated * liblldb-3.4 and python-lldb-3.4 added * lldb-3.4-dev renamed to liblldb-3.4-dev to match the previous changes * Manpages for llvm-ranlib, clang-apply-replacements, pp-trace and clang-tidy added * clang-3.4 should depends on binutils (for ld, at least) (Closes: #751030) --- debian/TODO | 12 ---- debian/changelog | 15 +++++ debian/clang-X.Y.manpages.in | 3 + debian/clang-format-X.Y.manpages.in | 2 +- debian/control | 56 +++++++++++++++-- debian/libclang-X.Y-dev.install.in | 1 + debian/libclang-X.Y-dev.links.in | 1 - debian/libclang1-X.Y.lintian-overrides.in | 5 +- debian/libclang1-X.Y.symbols.in | 44 ++++++------- ....install.in => liblldb-X.Y-dev.install.in} | 0 debian/liblldb-X.Y.install.in | 2 + debian/liblldb-X.Y.links.in | 4 ++ debian/liblldb-X.Y.lintian-overrides.in | 4 ++ debian/lldb-X.Y.install.in | 2 - debian/lldb-X.Y.links.in | 12 ---- debian/lldb-X.Y.lintian-overrides.in | 4 -- debian/llvm-X.Y.manpages.in | 1 + debian/patches/18-soname.patch | 12 ++-- debian/patches/lldb-libname.diff | 13 ++++ debian/patches/series | 1 + debian/python-lldb-X.Y.install.in | 2 + debian/python-lldb-X.Y.links.in | 3 + debian/rules | 62 ++++++++++--------- 23 files changed, 165 insertions(+), 96 deletions(-) rename debian/{lldb-X.Y-dev.install.in => liblldb-X.Y-dev.install.in} (100%) create mode 100644 debian/liblldb-X.Y.install.in create mode 100644 debian/liblldb-X.Y.links.in create mode 100644 debian/liblldb-X.Y.lintian-overrides.in delete mode 100644 debian/lldb-X.Y.links.in create mode 100644 debian/patches/lldb-libname.diff create mode 100644 debian/python-lldb-X.Y.install.in create mode 100644 debian/python-lldb-X.Y.links.in diff --git a/debian/TODO b/debian/TODO index 7fcc5878..0ce53dbd 100644 --- a/debian/TODO +++ b/debian/TODO @@ -1,18 +1,6 @@ * add the support of libclang in llvm default (for now, it is called libclang1-3.3.so) -* add a symbol file for libclang.so in llvm default - -* check if we should use alternatives - -* remove of clang & llvm 3.2 - -* look at the bugs of llvm 3.2 - * move the header at the right place in libclang-dev * bootstrap of clang with itself - -* update of the soname - -* man page for clang-format diff --git a/debian/changelog b/debian/changelog index 64b932b3..208334a0 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,18 @@ +llvm-toolchain-3.4 (1:3.4.2-9~exp1) experimental; urgency=medium + + * libclang-3.4.so should be used instead libclang.so. Update the soname + to match the new lib name (Closes: #759538) + * Rename liblldb.so to liblldb-3.4.so + update of the soname. + * python-clang-3.4 description updated + * liblldb-3.4 and python-lldb-3.4 added + * lldb-3.4-dev renamed to liblldb-3.4-dev to match the previous changes + * Manpages for llvm-ranlib, clang-apply-replacements, pp-trace and clang-tidy + added + * clang-3.4 should depends on binutils (for ld, at least) + (Closes: #751030) + + -- Sylvestre Ledru Sat, 30 Aug 2014 18:09:20 +0200 + llvm-toolchain-3.4 (1:3.4.2-8) unstable; urgency=medium * Try to bring back lldb-3.4-dev on mips & mipsel (Closes: #758314) diff --git a/debian/clang-X.Y.manpages.in b/debian/clang-X.Y.manpages.in index a07b5ee3..c414065e 100644 --- a/debian/clang-X.Y.manpages.in +++ b/debian/clang-X.Y.manpages.in @@ -3,3 +3,6 @@ clang/tools/scan-build/scan-build-@LLVM_VERSION@.1 debian/man/clang-check-@LLVM_VERSION@.1 debian/man/clang-tblgen-@LLVM_VERSION@.1 debian/man/scan-view-@LLVM_VERSION@.1 +debian/man/clang-tidy-@LLVM_VERSION@.1 +debian/man/clang-apply-replacements-@LLVM_VERSION@.1 +debian/man/pp-trace-@LLVM_VERSION@.1 diff --git a/debian/clang-format-X.Y.manpages.in b/debian/clang-format-X.Y.manpages.in index a073eda3..486b909d 100644 --- a/debian/clang-format-X.Y.manpages.in +++ b/debian/clang-format-X.Y.manpages.in @@ -1,2 +1,2 @@ debian/man/clang-format-diff-@LLVM_VERSION@.1 - +debian/man/clang-format-@LLVM_VERSION@.1 diff --git a/debian/control b/debian/control index f84f77a9..204bdd03 100644 --- a/debian/control +++ b/debian/control @@ -22,7 +22,7 @@ Package: clang-3.4 Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, ${dep:devlibs}, libclang-common-3.4-dev (= ${binary:Version}), - libclang1-3.4 (= ${binary:Version}), libc6-dev + libclang1-3.4 (= ${binary:Version}), libc6-dev, binutils Provides: c-compiler, objc-compiler, c++-compiler Recommends: llvm-3.4-dev, python Suggests: gnustep, gnustep-devel, clang-3.4-doc @@ -177,6 +177,13 @@ Depends: ${shlibs:Depends}, ${misc:Depends}, python Replaces: python-clang-3.3, python-clang-3.5 Breaks: python-clang-3.3, python-clang-3.5 Description: Clang Python Bindings + Clang project is a C, C++, Objective C and Objective C++ front-end + for the LLVM compiler. Its goal is to offer a replacement to the GNU Compiler + Collection (GCC). + . + Clang implements all of the ISO C++ 1998 and 2001 standards and also provides + a partial support of C++1y. + . This binding package provides access to the Clang compiler and libraries. @@ -385,19 +392,50 @@ Description: Modular compiler and toolchain technologies, examples Package: lldb-3.4 Architecture: amd64 armel armhf i386 kfreebsd-amd64 kfreebsd-i386 s390 s390x sparc alpha hppa m68k powerpcspe ppc64 sh4 sparc64 x32 powerpc mips mipsel # ia64 hurd have been removed -Depends: ${shlibs:Depends}, ${misc:Depends}, libllvm3.4 (= ${binary:Version}), python, llvm-3.4-dev +Depends: ${shlibs:Depends}, ${misc:Depends}, libllvm3.4 (= ${binary:Version}), python, llvm-3.4-dev, liblldb-3.4, + python-lldb-3.4 Pre-Depends: ${misc:Pre-Depends} -Replaces: lldb-3.2, lldb-3.3, lldb-3.5 -Breaks: lldb-3.2, lldb-3.3, lldb-3.5 Description: Next generation, high-performance debugger LLDB is a next generation, high-performance debugger. It is built as a set of reusable components which highly leverage existing libraries in the larger LLVM Project, such as the Clang expression parser and LLVM disassembler. -Package: lldb-3.4-dev +Package: liblldb-3.4 Architecture: amd64 armel armhf i386 kfreebsd-amd64 kfreebsd-i386 s390 s390x sparc alpha hppa m68k powerpcspe ppc64 sh4 sparc64 x32 powerpc mips mipsel +# ia64 hurd have been removed +Depends: ${shlibs:Depends}, ${misc:Depends}, libllvm3.4 (= ${binary:Version}) +Pre-Depends: ${misc:Pre-Depends} +Section: libs +Replaces: lldb-3.4 (>> 1:3.4.2-9~) +Breaks: lldb-3.4 (>> 1:3.4.2-9~) +Description: Next generation, high-performance debugger, library + LLDB is a next generation, high-performance debugger. It is built as a set of + reusable components which highly leverage existing libraries in the larger LLVM + Project, such as the Clang expression parser and LLVM disassembler. + . + This package contains the LLDB runtime library. + + +Package: python-lldb-3.4 +Section: python +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends}, python +Pre-Depends: ${misc:Pre-Depends} +Description: Next generation, high-performance debugger, python lib + LLDB is a next generation, high-performance debugger. It is built as a set of + reusable components which highly leverage existing libraries in the larger LLVM + Project, such as the Clang expression parser and LLVM disassembler. + . + This binding package provides access to lldb. + + +Package: liblldb-3.4-dev +Section: libdevel +Architecture: amd64 armel armhf i386 kfreebsd-amd64 kfreebsd-i386 s390 s390x sparc alpha hppa m68k powerpcspe ppc64 sh4 sparc64 x32 powerpc mips mipsel # ia64 mips mipsel hurd have been removed Depends: ${shlibs:Depends}, ${misc:Depends}, lldb-3.4 (= ${binary:Version}) +Replaces: lldb-3.4-dev (<< 1:3.4.2-9~) +Breaks: lldb-3.4-dev (<< 1:3.4.2-9~) Pre-Depends: ${misc:Pre-Depends} Description: Next generation, high-performance debugger - Header files LLDB is a next generation, high-performance debugger. It is built as a set of @@ -405,3 +443,11 @@ Description: Next generation, high-performance debugger - Header files Project, such as the Clang expression parser and LLVM disassembler. . This package provides the header files to build extension over lldb. + + +Package: lldb-3.4-dev +Depends: liblldb-3.4-dev, ${misc:Depends} +Architecture: all +Section: oldlibs +Description: transitional dummy package to liblldb-3.4-dev + This is a transitional dummy package. It can safely be removed. diff --git a/debian/libclang-X.Y-dev.install.in b/debian/libclang-X.Y-dev.install.in index eeb39575..d051ccc1 100644 --- a/debian/libclang-X.Y-dev.install.in +++ b/debian/libclang-X.Y-dev.install.in @@ -1,6 +1,7 @@ usr/lib/llvm-@LLVM_VERSION@/include/clang usr/lib/llvm-@LLVM_VERSION@/include/clang-c usr/lib/llvm-@LLVM_VERSION@/lib/libclang*a +usr/lib/llvm-@LLVM_VERSION@/lib/libclang-@LLVM_VERSION@.so usr/lib/llvm-@LLVM_VERSION@/lib/libmodernizeCore.a diff --git a/debian/libclang-X.Y-dev.links.in b/debian/libclang-X.Y-dev.links.in index e5025d27..5edcb499 100644 --- a/debian/libclang-X.Y-dev.links.in +++ b/debian/libclang-X.Y-dev.links.in @@ -1,3 +1,2 @@ usr/lib/@DEB_HOST_MULTIARCH@/libclang-@LLVM_VERSION@.so.1 usr/lib/@DEB_HOST_MULTIARCH@/libclang-@LLVM_VERSION@.so -usr/lib/@DEB_HOST_MULTIARCH@/libclang-@LLVM_VERSION@.so.1 usr/lib/llvm-@LLVM_VERSION@/lib/libclang-@LLVM_VERSION@.so usr/lib/@DEB_HOST_MULTIARCH@/libclang-@LLVM_VERSION@.so.1 usr/lib/llvm-@LLVM_VERSION@/lib/libclang.so diff --git a/debian/libclang1-X.Y.lintian-overrides.in b/debian/libclang1-X.Y.lintian-overrides.in index 096da0c0..74348405 100644 --- a/debian/libclang1-X.Y.lintian-overrides.in +++ b/debian/libclang1-X.Y.lintian-overrides.in @@ -1,2 +1,5 @@ # I know and I am not planning to change that. -libclang1-@LLVM_VERSION@: package-name-doesnt-match-sonames libclang1 \ No newline at end of file +libclang1-@LLVM_VERSION@: package-name-doesnt-match-sonames libclang1 +# Provided as transition +libclang1-@LLVM_VERSION@: dev-pkg-without-shlib-symlink usr/lib/*/libclang-@LLVM_VERSION@.so.1 usr/lib/*/libclang.so + diff --git a/debian/libclang1-X.Y.symbols.in b/debian/libclang1-X.Y.symbols.in index e6fcc4ef..e6e0c248 100644 --- a/debian/libclang1-X.Y.symbols.in +++ b/debian/libclang1-X.Y.symbols.in @@ -1,4 +1,4 @@ -libclang.so.1 libclang1-@LLVM_VERSION@ #MINVER# +libclang-@LLVM_VERSION@.so libclang1-@LLVM_VERSION@ #MINVER# clang_BlockCommandComment_getArgText@Base 3.2 clang_BlockCommandComment_getCommandName@Base 3.2 clang_BlockCommandComment_getNumArgs@Base 3.2 @@ -7,7 +7,7 @@ libclang.so.1 libclang1-@LLVM_VERSION@ #MINVER# clang_CXCursorSet_insert@Base 3.2 clang_CXIndex_getGlobalOptions@Base 3.2 clang_CXIndex_setGlobalOptions@Base 3.2 - clang_CXXMethod_isPureVirtual@Base 1:@LLVM_VERSION@ + clang_CXXMethod_isPureVirtual@Base 3.4 clang_CXXMethod_isStatic@Base 3.2 clang_CXXMethod_isVirtual@Base 3.2 clang_Comment_getChild@Base 3.2 @@ -16,7 +16,7 @@ libclang.so.1 libclang1-@LLVM_VERSION@ #MINVER# clang_Comment_isWhitespace@Base 3.2 clang_CompilationDatabase_dispose@Base 3.2 clang_CompilationDatabase_fromDirectory@Base 3.2 - clang_CompilationDatabase_getAllCompileCommands@Base 1:@LLVM_VERSION@ + clang_CompilationDatabase_getAllCompileCommands@Base 3.4 clang_CompilationDatabase_getCompileCommands@Base 3.2 clang_CompileCommand_getArg@Base 3.2 clang_CompileCommand_getDirectory@Base 3.2 @@ -29,19 +29,19 @@ libclang.so.1 libclang1-@LLVM_VERSION@ #MINVER# clang_Cursor_getCommentRange@Base 3.2 clang_Cursor_getModule@Base 3.2 clang_Cursor_getNumArguments@Base 3.2 - clang_Cursor_getObjCDeclQualifiers@Base 1:@LLVM_VERSION@ - clang_Cursor_getObjCPropertyAttributes@Base 1:@LLVM_VERSION@ + clang_Cursor_getObjCDeclQualifiers@Base 3.4 + clang_Cursor_getObjCPropertyAttributes@Base 3.4 clang_Cursor_getObjCSelectorIndex@Base 3.2 clang_Cursor_getParsedComment@Base 3.2 clang_Cursor_getRawCommentText@Base 3.2 clang_Cursor_getReceiverType@Base 3.2 clang_Cursor_getSpellingNameRange@Base 3.2 clang_Cursor_getTranslationUnit@Base 3.2 - clang_Cursor_isBitField@Base 1:@LLVM_VERSION@ + clang_Cursor_isBitField@Base 3.4 clang_Cursor_isDynamicCall@Base 3.2 clang_Cursor_isNull@Base 3.2 - clang_Cursor_isObjCOptional@Base 1:@LLVM_VERSION@ - clang_Cursor_isVariadic@Base 1:@LLVM_VERSION@ + clang_Cursor_isObjCOptional@Base 3.4 + clang_Cursor_isVariadic@Base 3.4 clang_FullComment_getAsHTML@Base 3.2 clang_FullComment_getAsXML@Base 3.2 clang_HTMLStartTagComment_isSelfClosing@Base 3.2 @@ -57,9 +57,9 @@ libclang.so.1 libclang1-@LLVM_VERSION@ #MINVER# clang_InlineCommandComment_getNumArgs@Base 3.2 clang_InlineCommandComment_getRenderKind@Base 3.2 clang_InlineContentComment_hasTrailingNewline@Base 3.2 - clang_Location_isFromMainFile@Base 1:@LLVM_VERSION@ - clang_Location_isInSystemHeader@Base 1:@LLVM_VERSION@ - clang_Module_getASTFile@Base 1:@LLVM_VERSION@ + clang_Location_isFromMainFile@Base 3.4 + clang_Location_isInSystemHeader@Base 3.4 + clang_Module_getASTFile@Base 3.4 clang_Module_getFullName@Base 3.2 clang_Module_getName@Base 3.2 clang_Module_getNumTopLevelHeaders@Base 3.2 @@ -76,11 +76,11 @@ libclang.so.1 libclang1-@LLVM_VERSION@ #MINVER# clang_TParamCommandComment_getParamName@Base 3.2 clang_TParamCommandComment_isParamPositionValid@Base 3.2 clang_TextComment_getText@Base 3.2 - clang_Type_getAlignOf@Base 1:@LLVM_VERSION@ - clang_Type_getCXXRefQualifier@Base 1:@LLVM_VERSION@ - clang_Type_getClassType@Base 1:@LLVM_VERSION@ - clang_Type_getOffsetOf@Base 1:@LLVM_VERSION@ - clang_Type_getSizeOf@Base 1:@LLVM_VERSION@ + clang_Type_getAlignOf@Base 3.4 + clang_Type_getCXXRefQualifier@Base 3.4 + clang_Type_getClassType@Base 3.4 + clang_Type_getOffsetOf@Base 3.4 + clang_Type_getSizeOf@Base 3.4 clang_VerbatimBlockLineComment_getText@Base 3.2 clang_VerbatimLineComment_getText@Base 3.2 clang_annotateTokens@Base 3.2 @@ -123,8 +123,8 @@ libclang.so.1 libclang1-@LLVM_VERSION@ #MINVER# clang_equalRanges@Base 3.2 clang_equalTypes@Base 3.2 clang_executeOnThread@Base 3.2 - clang_findIncludesInFile@Base 1:@LLVM_VERSION@ - clang_findIncludesInFileWithBlock@Base 1:@LLVM_VERSION@ + clang_findIncludesInFile@Base 3.4 + clang_findIncludesInFileWithBlock@Base 3.4 clang_findReferencesInFile@Base 3.2 clang_findReferencesInFileWithBlock@Base 3.2 clang_formatDiagnostic@Base 3.2 @@ -188,12 +188,12 @@ libclang.so.1 libclang1-@LLVM_VERSION@ #MINVER# clang_getEnumConstantDeclValue@Base 3.2 clang_getEnumDeclIntegerType@Base 3.2 clang_getExpansionLocation@Base 3.2 - clang_getFieldDeclBitWidth@Base 1:@LLVM_VERSION@ + clang_getFieldDeclBitWidth@Base 3.4 clang_getFile@Base 3.2 - clang_getFileLocation@Base 1:@LLVM_VERSION@ + clang_getFileLocation@Base 3.4 clang_getFileName@Base 3.2 clang_getFileTime@Base 3.2 - clang_getFileUniqueID@Base 1:@LLVM_VERSION@ + clang_getFileUniqueID@Base 3.4 clang_getFunctionTypeCallingConv@Base 3.2 clang_getIBOutletCollectionType@Base 3.2 clang_getIncludedFile@Base 3.2 @@ -232,7 +232,7 @@ libclang.so.1 libclang1-@LLVM_VERSION@ #MINVER# clang_getTranslationUnitSpelling@Base 3.2 clang_getTypeDeclaration@Base 3.2 clang_getTypeKindSpelling@Base 3.2 - clang_getTypeSpelling@Base 1:@LLVM_VERSION@ + clang_getTypeSpelling@Base 3.4 clang_getTypedefDeclUnderlyingType@Base 3.2 clang_hashCursor@Base 3.2 clang_indexLoc_getCXSourceLocation@Base 3.2 diff --git a/debian/lldb-X.Y-dev.install.in b/debian/liblldb-X.Y-dev.install.in similarity index 100% rename from debian/lldb-X.Y-dev.install.in rename to debian/liblldb-X.Y-dev.install.in diff --git a/debian/liblldb-X.Y.install.in b/debian/liblldb-X.Y.install.in new file mode 100644 index 00000000..6b58d197 --- /dev/null +++ b/debian/liblldb-X.Y.install.in @@ -0,0 +1,2 @@ +usr/lib/llvm-@LLVM_VERSION@/lib/liblldb.so.1 +usr/lib/llvm-@LLVM_VERSION@/lib/libclang-@LLVM_VERSION@.so.1 /usr/lib/@DEB_HOST_MULTIARCH@/ diff --git a/debian/liblldb-X.Y.links.in b/debian/liblldb-X.Y.links.in new file mode 100644 index 00000000..86c0b504 --- /dev/null +++ b/debian/liblldb-X.Y.links.in @@ -0,0 +1,4 @@ +usr/lib/@DEB_HOST_MULTIARCH@/liblldb-@LLVM_VERSION@.so.1 usr/lib/@DEB_HOST_MULTIARCH@/liblldb-@LLVM_VERSION@.so +usr/lib/@DEB_HOST_MULTIARCH@/liblldb-@LLVM_VERSION@.so.1 usr/lib/@DEB_HOST_MULTIARCH@/liblldb-@LLVM_VERSION@.so.1 +usr/lib/@DEB_HOST_MULTIARCH@/liblldb-@LLVM_VERSION@.so usr/lib/python2.7/dist-packages/lldb-@LLVM_VERSION@/_lldb.so +usr/lib/@DEB_HOST_MULTIARCH@/liblldb-@LLVM_VERSION@.so.1 usr/lib/llvm-@LLVM_VERSION@/lib/liblldb.so.1 diff --git a/debian/liblldb-X.Y.lintian-overrides.in b/debian/liblldb-X.Y.lintian-overrides.in new file mode 100644 index 00000000..b045ee27 --- /dev/null +++ b/debian/liblldb-X.Y.lintian-overrides.in @@ -0,0 +1,4 @@ +# That is normal. The lib is not (yet?) shipped as a new package +liblldb-@LLVM_VERSION@: package-name-doesnt-match-sonames liblldb +# For now, override this warning. We might create a -dev at some point +liblldb-@LLVM_VERSION@: non-dev-pkg-with-shlib-symlink usr/lib/*/liblldb.so.1 usr/lib/*/liblldb.so diff --git a/debian/lldb-X.Y.install.in b/debian/lldb-X.Y.install.in index 1316fbe5..f1f8ec49 100644 --- a/debian/lldb-X.Y.install.in +++ b/debian/lldb-X.Y.install.in @@ -2,5 +2,3 @@ usr/bin/lldb-@LLVM_VERSION@ usr/bin/lldb-platform-@LLVM_VERSION@ usr/lib/llvm-@LLVM_VERSION@/bin/lldb usr/lib/llvm-@LLVM_VERSION@/bin/lldb-platform -usr/lib/llvm-@LLVM_VERSION@/lib/liblldb.so.1 /usr/lib/@DEB_HOST_MULTIARCH@/ -build-llvm/Release/lib/python2.7/site-packages/lldb/ /usr/lib/python2.7/dist-packages/ diff --git a/debian/lldb-X.Y.links.in b/debian/lldb-X.Y.links.in deleted file mode 100644 index 5783897a..00000000 --- a/debian/lldb-X.Y.links.in +++ /dev/null @@ -1,12 +0,0 @@ -usr/lib/@DEB_HOST_MULTIARCH@/liblldb.so.1 usr/lib/@DEB_HOST_MULTIARCH@/liblldb.so -usr/lib/@DEB_HOST_MULTIARCH@/liblldb.so.1 usr/lib/@DEB_HOST_MULTIARCH@/liblldb.so.1 -usr/lib/@DEB_HOST_MULTIARCH@/liblldb.so usr/lib/python2.7/dist-packages/lldb/_lldb.so -usr/lib/@DEB_HOST_MULTIARCH@/liblldb.so.1 usr/lib/llvm-@LLVM_VERSION@/lib/liblldb.so.1 - -usr/bin/lldb-@LLVM_VERSION@ usr/bin/lldb -usr/bin/lldb-platform-@LLVM_VERSION@ usr/bin/lldb-platform -usr/bin/lldb-gdbserver-@LLVM_VERSION@ usr/bin/lldb-gdbserver - -usr/lib/@DEB_HOST_MULTIARCH@/libLLVM-@LLVM_VERSION_FULL@.so.1 usr/lib/python2.7/dist-packages/lldb/libLLVM-@LLVM_VERSION_FULL@.so.1 -usr/lib/@DEB_HOST_MULTIARCH@/libLLVM-@LLVM_VERSION_FULL@.so.1 usr/lib/python2.7/dist-packages/lldb/libLLVM-@LLVM_VERSION@.so.1 - diff --git a/debian/lldb-X.Y.lintian-overrides.in b/debian/lldb-X.Y.lintian-overrides.in index b4a7c0bc..2efccc46 100644 --- a/debian/lldb-X.Y.lintian-overrides.in +++ b/debian/lldb-X.Y.lintian-overrides.in @@ -1,5 +1 @@ -# That is normal. The lib is not (yet?) shipped as a new package -lldb-@LLVM_VERSION@: package-name-doesnt-match-sonames liblldb lldb-@LLVM_VERSION@: manpage-has-useless-whatis-entry usr/share/man/man1/lldb-@LLVM_VERSION@.1.gz -# For now, override this warning. We might create a -dev at some point -lldb-@LLVM_VERSION@: non-dev-pkg-with-shlib-symlink usr/lib/*/liblldb.so.1 usr/lib/*/liblldb.so \ No newline at end of file diff --git a/debian/llvm-X.Y.manpages.in b/debian/llvm-X.Y.manpages.in index b74242d7..693f9ee6 100644 --- a/debian/llvm-X.Y.manpages.in +++ b/debian/llvm-X.Y.manpages.in @@ -7,4 +7,5 @@ debian/man/llvm-rtdyld-@LLVM_VERSION@.1 debian/man/llvm-size-@LLVM_VERSION@.1 debian/man/llvm-tblgen-@LLVM_VERSION@.1 debian/man/macho-dump-@LLVM_VERSION@.1 +debian/man/llvm-ranlib-@LLVM_VERSION@.1 diff --git a/debian/patches/18-soname.patch b/debian/patches/18-soname.patch index 12446c70..ac78f415 100644 --- a/debian/patches/18-soname.patch +++ b/debian/patches/18-soname.patch @@ -1,8 +1,8 @@ -Index: llvm-toolchain-snapshot_3.4~svn193628/clang/tools/libclang/Makefile +Index: llvm-toolchain-3.4-3.4.2/clang/tools/libclang/Makefile =================================================================== ---- llvm-toolchain-snapshot_3.4~svn193628.orig/clang/tools/libclang/Makefile 2013-10-29 18:21:54.358914501 +0100 -+++ llvm-toolchain-snapshot_3.4~svn193628/clang/tools/libclang/Makefile 2013-10-29 18:22:13.622915201 +0100 -@@ -14,6 +14,7 @@ +--- llvm-toolchain-3.4-3.4.2.orig/clang/tools/libclang/Makefile ++++ llvm-toolchain-3.4-3.4.2/clang/tools/libclang/Makefile +@@ -14,6 +14,7 @@ EXPORTED_SYMBOL_FILE = $(PROJ_SRC_DIR)/l LINK_LIBS_IN_SHARED = 1 SHARED_LIBRARY = 1 @@ -10,12 +10,12 @@ Index: llvm-toolchain-snapshot_3.4~svn193628/clang/tools/libclang/Makefile include $(CLANG_LEVEL)/../../Makefile.config LINK_COMPONENTS := $(TARGETS_TO_BUILD) asmparser bitreader support mc option -@@ -30,7 +31,7 @@ +@@ -30,7 +31,7 @@ include $(CLANG_LEVEL)/Makefile # Add soname to the library. ifeq ($(HOST_OS), $(filter $(HOST_OS), Linux FreeBSD GNU GNU/kFreeBSD)) - LLVMLibsOptions += -Wl,-soname,lib$(LIBRARYNAME)$(SHLIBEXT) -+ LLVMLibsOptions += -Wl,-soname,lib$(LIBRARYNAME)$(SHLIBEXT).$(SONAME_MAJOR) ++ LLVMLibsOptions += -Wl,-soname,lib$(LIBRARYNAME)-$(LLVM_VERSION_MAJOR).$(LLVM_VERSION_MINOR)$(SHLIBEXT) endif ##===----------------------------------------------------------------------===## diff --git a/debian/patches/lldb-libname.diff b/debian/patches/lldb-libname.diff new file mode 100644 index 00000000..5ec9149c --- /dev/null +++ b/debian/patches/lldb-libname.diff @@ -0,0 +1,13 @@ +Index: llvm-toolchain-3.4-3.4.2/lldb/lib/Makefile +=================================================================== +--- llvm-toolchain-3.4-3.4.2.orig/lldb/lib/Makefile ++++ llvm-toolchain-3.4-3.4.2/lldb/lib/Makefile +@@ -153,7 +153,7 @@ ifeq ($(HOST_OS), $(filter $(HOST_OS), L + # Link GCC atomic helper library + LLVMLibsOptions += -latomic + endif +- LLVMLibsOptions += -Wl,--soname,lib$(LIBRARYNAME)$(SHLIBEXT).$(SONAME_EXTENSION) ++ LLVMLibsOptions += -Wl,--soname,lib$(LIBRARYNAME)-$(LLVM_VERSION_MAJOR).$(LLVM_VERSION_MINOR)$(SHLIBEXT).$(SONAME_EXTENSION) + endif + + ifeq ($(HOST_OS),FreeBSD) diff --git a/debian/patches/series b/debian/patches/series index 2d629e96..2355bce0 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -43,3 +43,4 @@ follow-parallel-var.diff scan-build-search-path.diff gcc-4.9-i586-linux-gnu.diff hurd-EIEIO-undef.diff +lldb-libname.diff diff --git a/debian/python-lldb-X.Y.install.in b/debian/python-lldb-X.Y.install.in new file mode 100644 index 00000000..a151a473 --- /dev/null +++ b/debian/python-lldb-X.Y.install.in @@ -0,0 +1,2 @@ +build-llvm/Release/lib/python2.7/site-packages/lldb/ /usr/lib/python2.7/dist-packages/ + diff --git a/debian/python-lldb-X.Y.links.in b/debian/python-lldb-X.Y.links.in new file mode 100644 index 00000000..0b700f07 --- /dev/null +++ b/debian/python-lldb-X.Y.links.in @@ -0,0 +1,3 @@ +usr/lib/@DEB_HOST_MULTIARCH@/libLLVM-@LLVM_VERSION_FULL@.so.1 usr/lib/python2.7/dist-packages/lldb/libLLVM-@LLVM_VERSION_FULL@.so.1 +usr/lib/@DEB_HOST_MULTIARCH@/libLLVM-@LLVM_VERSION_FULL@.so.1 usr/lib/python2.7/dist-packages/lldb/libLLVM-@LLVM_VERSION@.so.1 + diff --git a/debian/rules b/debian/rules index 5daa619b..aa202160 100755 --- a/debian/rules +++ b/debian/rules @@ -122,7 +122,7 @@ LLDB_DISABLE_ARCHS := arm64 hurd-i386 ia64 # mips* fails with "undefined references to `__atomic_load_8'" ifeq (,$(filter-out $(LLDB_DISABLE_ARCHS), $(DEB_HOST_ARCH))) # Disable LLDB for this arch. - LLDB_ENABLE=no + LLDB_ENABLE=no endif @@ -156,25 +156,25 @@ override_dh_auto_configure: preconfigure # Remove some old symlinks cd tools/ && \ - if test -h clang; then \ - rm clang; \ - fi; \ - ln -s ../clang .; \ + if test -h clang; then \ + rm clang; \ + fi; \ + ln -s ../clang .; \ readlink clang if test $(POLLY_ENABLE) = yes; then \ - cd tools/ && \ - if test -h polly; then \ - rm polly; \ - fi; \ - ln -s ../polly .; \ + cd tools/ && \ + if test -h polly; then \ + rm polly; \ + fi; \ + ln -s ../polly .; \ fi if test $(LLDB_ENABLE) = yes; then \ - cd tools/ && \ - if test -h lldb; then \ + cd tools/ && \ + if test -h lldb; then \ rm lldb; \ - fi; \ + fi; \ ln -s ../lldb .; \ fi @@ -255,36 +255,31 @@ build_doc: help2man --version-string=$(LLVM_VERSION) clang/tools/scan-view/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 - for f in clang clang-tblgen clang-check; do \ - help2man --version-string=$(LLVM_VERSION) $(TARGET_BUILD)/Release/bin/$$f > debian/man/$$f-$(LLVM_VERSION).1; \ + CMDS="llvm-dwarfdump llvm-mc llvm-mcmarkup llvm-objdump llvm-rtdyld llvm-size llvm-tblgen llvm-ranlib macho-dump lldb clang-format clang-modernize clang clang-tblgen clang-check clang-tidy clang-apply-replacements pp-trace"; \ + for f in $$CMDS; do \ + echo "Generating manpage of $$f"; \ + LD_LIBRARY_PATH=$(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/lib/ help2man --version-string=$(LLVM_VERSION) $(TARGET_BUILD)/Release/bin/$$f > debian/man/$$f-$(LLVM_VERSION).1; \ done - for f in llvm-dwarfdump llvm-mc llvm-mcmarkup llvm-objdump llvm-rtdyld llvm-size llvm-tblgen macho-dump lldb clang-format clang-modernize; do \ - help2man --version-string=$(LLVM_VERSION) $(TARGET_BUILD)/Release/bin/$$f > debian/man/$$f-$(LLVM_VERSION).1; \ - done - - override_dh_auto_install: $(MAKE) -C $(TARGET_BUILD) VERBOSE=1 install DESTDIR=$(DEB_INST)/ chrpath -d $(TARGET_BUILD)/Release/bin/clang chrpath -d `find $(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/bin/ -type f -executable` + chmod -x $(TARGET_BUILD)/tools/polly/Release/lib/libpolly*.a # Add the trailing soname mv $(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/lib/libLLVM-$(LLVM_VERSION).so $(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/lib/libLLVM-$(LLVM_VERSION).so.$(SONAME_EXT) - - if test $(LLDB_ENABLE) = yes; then \ - mv $(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/lib/liblldb.so $(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/lib/liblldb.so.$(SONAME_EXT); \ - fi - cd debian/tmp/usr/lib/llvm-$(LLVM_VERSION)/lib/ && \ - if test ! -f libclang-$(LLVM_VERSION).so.$(SONAME_EXT); then \ - mv libclang.so libclang-$(LLVM_VERSION).so.$(SONAME_EXT) && \ - ln -s libclang-$(LLVM_VERSION).so.$(SONAME_EXT) libclang.so.$(SONAME_EXT); \ + mv libclang.so libclang-$(LLVM_VERSION).so.$(SONAME_EXT) && \ + ln -s libclang-$(LLVM_VERSION).so.$(SONAME_EXT) libclang.so.$(SONAME_EXT); \ + ln -s libclang-$(LLVM_VERSION).so.$(SONAME_EXT) libclang-$(LLVM_VERSION).so; \ + if test $(LLDB_ENABLE) = yes; then \ + mv liblldb.so liblldb-$(LLVM_VERSION).so.$(SONAME_EXT) && \ + ln -s liblldb-$(LLVM_VERSION).so.$(SONAME_EXT) liblldb.so.$(SONAME_EXT); \ fi; \ - rm -f libLLVM-$(LLVM_VERSION_FULL).so; \ - rm -f libclang.so + rm -f libLLVM-$(LLVM_VERSION_FULL).so # Remove artefact (where compiler-rt is built) if test -d $(TARGET_BUILD)/tools/clang/runtime/compiler-rt/clang_linux; then \ @@ -322,8 +317,10 @@ override_dh_auto_install: cp -f $(CURDIR)/clang/tools/clang-format/clang-format.py clang/tools/clang-format/clang-format-$(LLVM_VERSION).py + rm -rf clang/tools/scan-build-$(LLVM_VERSION) cp -fR $(CURDIR)/clang/tools/scan-build clang/tools/scan-build-$(LLVM_VERSION) + rm -rf clang/tools/scan-view-$(LLVM_VERSION) cp -fR $(CURDIR)/clang/tools/scan-view clang/tools/scan-view-$(LLVM_VERSION) # Remove some license files @@ -363,6 +360,9 @@ override_dh_strip: dh_strip -a +override_dh_install: + dh_install --fail-missing + override_dh_installdeb: # Managed by the package dh_installdeb -a @@ -375,6 +375,8 @@ override_dh_installdeb: find $(CURDIR)/debian/llvm-$(LLVM_VERSION)-tools/usr/lib/llvm-$(LLVM_VERSION)/ -name '*.pyc' | xargs -r rm -f + + ifeq (,$(filter nocheck, $(DEB_BUILD_OPTIONS))) # List of the archs we know we have 100 % tests working ARCH_LLVM_TEST_OK := amd64 i386 From 75d1cf3b7a91573145b79062f2a9f128fa3f51d1 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Mon, 1 Sep 2014 11:58:49 +0000 Subject: [PATCH 37/41] fix typo --- debian/control | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/control b/debian/control index 204bdd03..87911db0 100644 --- a/debian/control +++ b/debian/control @@ -406,8 +406,8 @@ Architecture: amd64 armel armhf i386 kfreebsd-amd64 kfreebsd-i386 s390 s390x sp Depends: ${shlibs:Depends}, ${misc:Depends}, libllvm3.4 (= ${binary:Version}) Pre-Depends: ${misc:Pre-Depends} Section: libs -Replaces: lldb-3.4 (>> 1:3.4.2-9~) -Breaks: lldb-3.4 (>> 1:3.4.2-9~) +Replaces: lldb-3.4 (<< 1:3.4.2-9~) +Breaks: lldb-3.4 (<< 1:3.4.2-9~) Description: Next generation, high-performance debugger, library LLDB is a next generation, high-performance debugger. It is built as a set of reusable components which highly leverage existing libraries in the larger LLVM From 64b69380b4c0ce5a37021920185007844a38929a Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Mon, 1 Sep 2014 17:06:54 +0000 Subject: [PATCH 38/41] fix various issues --- debian/changelog | 1 + debian/clang-X.Y.lintian-overrides.in | 7 ++ debian/libclang1-X.Y.lintian-overrides.in | 6 +- debian/liblldb-X.Y.install.in | 2 +- debian/llvm-X.Y-runtime.lintian-overrides.in | 1 + debian/llvm-X.Y.lintian-overrides.in | 1 + debian/patches/lldb-libname.diff | 2 +- debian/patches/remove-dbtree.diff | 74 ++++++++++++++++++++ debian/patches/series | 1 + debian/source.lintian-overrides | 2 + 10 files changed, 92 insertions(+), 5 deletions(-) create mode 100644 debian/llvm-X.Y-runtime.lintian-overrides.in create mode 100644 debian/patches/remove-dbtree.diff create mode 100644 debian/source.lintian-overrides diff --git a/debian/changelog b/debian/changelog index 208334a0..89ae77fc 100644 --- a/debian/changelog +++ b/debian/changelog @@ -10,6 +10,7 @@ llvm-toolchain-3.4 (1:3.4.2-9~exp1) experimental; urgency=medium added * clang-3.4 should depends on binutils (for ld, at least) (Closes: #751030) + * clang/www/analyzer/scripts/dbtree.js removed -- Sylvestre Ledru Sat, 30 Aug 2014 18:09:20 +0200 diff --git a/debian/clang-X.Y.lintian-overrides.in b/debian/clang-X.Y.lintian-overrides.in index 52efa24f..dabecf22 100644 --- a/debian/clang-X.Y.lintian-overrides.in +++ b/debian/clang-X.Y.lintian-overrides.in @@ -2,3 +2,10 @@ clang-@LLVM_VERSION@: manpage-has-useless-whatis-entry usr/share/man/man1/clang-check.1.gz clang-@LLVM_VERSION@: manpage-has-useless-whatis-entry usr/share/man/man1/clang-tblgen.1.gz clang-@LLVM_VERSION@: manpage-has-useless-whatis-entry usr/share/man/man1/scan-view.1.gz +clang-@LLVM_VERSION@: manpage-has-useless-whatis-entry usr/share/man/man1/clang-apply-replacements-@LLVM_VERSION@.1.gz +clang-@LLVM_VERSION@: manpage-has-useless-whatis-entry usr/share/man/man1/clang-check-@LLVM_VERSION@.1.gz +clang-@LLVM_VERSION@: manpage-has-useless-whatis-entry usr/share/man/man1/clang-tblgen-@LLVM_VERSION@.1.gz +clang-@LLVM_VERSION@: manpage-has-useless-whatis-entry usr/share/man/man1/clang-tidy-@LLVM_VERSION@.1.gz +clang-@LLVM_VERSION@: manpage-has-useless-whatis-entry usr/share/man/man1/pp-trace-@LLVM_VERSION@.1.gz +clang-@LLVM_VERSION@: manpage-has-useless-whatis-entry usr/share/man/man1/scan-view-@LLVM_VERSION@.1.gz + diff --git a/debian/libclang1-X.Y.lintian-overrides.in b/debian/libclang1-X.Y.lintian-overrides.in index 74348405..aa7ef217 100644 --- a/debian/libclang1-X.Y.lintian-overrides.in +++ b/debian/libclang1-X.Y.lintian-overrides.in @@ -1,5 +1,5 @@ -# I know and I am not planning to change that. -libclang1-@LLVM_VERSION@: package-name-doesnt-match-sonames libclang1 +# I know and I am not planning to change that yet. +libclang1-@LLVM_VERSION@: package-name-doesnt-match-sonames libclang1-@LLVM_VERSION@ # Provided as transition libclang1-@LLVM_VERSION@: dev-pkg-without-shlib-symlink usr/lib/*/libclang-@LLVM_VERSION@.so.1 usr/lib/*/libclang.so - +libclang1-@LLVM_VERSION@: ldconfig-symlink-missing-for-shlib usr/lib/*/libclang-LLVM_VERSION@.so usr/lib/*/libclang-LLVM_VERSION@.so.1 libclang-LLVM_VERSION@.so diff --git a/debian/liblldb-X.Y.install.in b/debian/liblldb-X.Y.install.in index 6b58d197..74bcb9df 100644 --- a/debian/liblldb-X.Y.install.in +++ b/debian/liblldb-X.Y.install.in @@ -1,2 +1,2 @@ usr/lib/llvm-@LLVM_VERSION@/lib/liblldb.so.1 -usr/lib/llvm-@LLVM_VERSION@/lib/libclang-@LLVM_VERSION@.so.1 /usr/lib/@DEB_HOST_MULTIARCH@/ +usr/lib/llvm-@LLVM_VERSION@/lib/liblldb-@LLVM_VERSION@.so.1 /usr/lib/@DEB_HOST_MULTIARCH@/ diff --git a/debian/llvm-X.Y-runtime.lintian-overrides.in b/debian/llvm-X.Y-runtime.lintian-overrides.in new file mode 100644 index 00000000..e94e7130 --- /dev/null +++ b/debian/llvm-X.Y-runtime.lintian-overrides.in @@ -0,0 +1 @@ +llvm-@LLVM_VERSION@-runtime: binary-without-manpage usr/bin/lli-child-target-@LLVM_VERSION@ diff --git a/debian/llvm-X.Y.lintian-overrides.in b/debian/llvm-X.Y.lintian-overrides.in index ac3f7567..5bfc9240 100644 --- a/debian/llvm-X.Y.lintian-overrides.in +++ b/debian/llvm-X.Y.lintian-overrides.in @@ -7,3 +7,4 @@ llvm-@LLVM_VERSION@: manpage-has-useless-whatis-entry usr/share/man/man1/llvm-rt llvm-@LLVM_VERSION@: manpage-has-useless-whatis-entry usr/share/man/man1/llvm-size-@LLVM_VERSION@.1.gz llvm-@LLVM_VERSION@: manpage-has-useless-whatis-entry usr/share/man/man1/llvm-tblgen-@LLVM_VERSION@.1.gz llvm-@LLVM_VERSION@: manpage-has-useless-whatis-entry usr/share/man/man1/macho-dump-@LLVM_VERSION@.1.gz +llvm-@LLVM_VERSION@: manpage-has-useless-whatis-entry usr/share/man/man1/llvm-ranlib-@LLVM_VERSION@.1.gz diff --git a/debian/patches/lldb-libname.diff b/debian/patches/lldb-libname.diff index 5ec9149c..3d9c3b4f 100644 --- a/debian/patches/lldb-libname.diff +++ b/debian/patches/lldb-libname.diff @@ -7,7 +7,7 @@ Index: llvm-toolchain-3.4-3.4.2/lldb/lib/Makefile LLVMLibsOptions += -latomic endif - LLVMLibsOptions += -Wl,--soname,lib$(LIBRARYNAME)$(SHLIBEXT).$(SONAME_EXTENSION) -+ LLVMLibsOptions += -Wl,--soname,lib$(LIBRARYNAME)-$(LLVM_VERSION_MAJOR).$(LLVM_VERSION_MINOR)$(SHLIBEXT).$(SONAME_EXTENSION) ++ LLVMLibsOptions += -Wl,--soname,lib$(LIBRARYNAME)-$(LLVM_VERSION_MAJOR).$(LLVM_VERSION_MINOR)$(SHLIBEXT) endif ifeq ($(HOST_OS),FreeBSD) diff --git a/debian/patches/remove-dbtree.diff b/debian/patches/remove-dbtree.diff new file mode 100644 index 00000000..6915835b --- /dev/null +++ b/debian/patches/remove-dbtree.diff @@ -0,0 +1,74 @@ +Index: llvm-toolchain-3.4-3.4.2/clang/www/analyzer/content.css +=================================================================== +--- llvm-toolchain-3.4-3.4.2.orig/clang/www/analyzer/content.css ++++ llvm-toolchain-3.4-3.4.2/clang/www/analyzer/content.css +@@ -99,18 +99,3 @@ table.checkers .name { font-weight:bold; + table.checkers .checked { background-color:#81F781; } + table.checkers .commented { color:#909090; } + +-/* Collapsing Trees: http://dbtree.megalingo.com/web/demo/simple-collapsible-tree.cfm */ +-#collapsetree, #collapsetree a:link, #collapsetree li a:link, #collapsetree a:visited, #collapsetree li a:visited{color:#000;text-decoration:none} +-#collapsetree,#collapsetree ul{list-style-type:none; width:auto; margin:0; padding:0} +-#collapsetree ul{padding-left:20px;display:none;overflow:auto} +-#collapsetree li ul{margin:0 auto} +-#collapsetree li{display:block;width:100%;line-height:20px;white-space:nowrap} +-#collapsetree li a{display:block;padding-left:20px;color:#000;text-decoration:none;background:url(images/tree/bullet.gif) center left no-repeat;white-space:nowrap} +-#collapsetree li a:hover{text-decoration:underline;background-color:transparent;color:#000} +-#collapsetree li ul.click{display:block} +-#collapsetree li.click a{background:url(images/tree/bullet.gif) center left no-repeat} +-#collapsetree ul li.click a{background:url(images/tree/bullet.gif) center left no-repeat} +-#collapsetree li a.subMenu,#collapsetree ul li a.subMenu{background:url(images/tree/plus.gif) center left no-repeat} +-#collapsetree li a.click{background:url(images/tree/minus.gif) center left no-repeat} +-#collapsetree ul li a.click{background:url(images/tree/minus.gif) center left no-repeat} +- +Index: llvm-toolchain-3.4-3.4.2/clang/www/analyzer/xcode.html +=================================================================== +--- llvm-toolchain-3.4-3.4.2.orig/clang/www/analyzer/xcode.html ++++ llvm-toolchain-3.4-3.4.2/clang/www/analyzer/xcode.html +@@ -6,7 +6,6 @@ + + + +- + + + +Index: llvm-toolchain-3.4-3.4.2/clang/www/analyzer/potential_checkers.html +=================================================================== +--- llvm-toolchain-3.4-3.4.2.orig/clang/www/analyzer/potential_checkers.html ++++ llvm-toolchain-3.4-3.4.2/clang/www/analyzer/potential_checkers.html +@@ -6,7 +6,6 @@ + + + +- + + + +Index: llvm-toolchain-3.4-3.4.2/clang/www/analyzer/scan-build.html +=================================================================== +--- llvm-toolchain-3.4-3.4.2.orig/clang/www/analyzer/scan-build.html ++++ llvm-toolchain-3.4-3.4.2/clang/www/analyzer/scan-build.html +@@ -6,7 +6,6 @@ + + + +- + + + +@@ -53,7 +52,7 @@ aforementioned hack fails to work.

+ +

Contents

+ +-
    ++
      +
    • Getting Started +
        +
      • Basic Usage
        • +Index: llvm-toolchain-3.4-3.4.2/clang/www/analyzer/scripts/dbtree.js +=================================================================== +--- llvm-toolchain-3.4-3.4.2.orig/clang/www/analyzer/scripts/dbtree.js ++++ llvm-toolchain-3.4-3.4.2/clang/www/analyzer/scripts/dbtree.js +@@ -1 +0,0 @@ +-eval(function(p,a,c,k,e,r){e=function(c){return(c35?String.fromCharCode(c+29):c.toString(36))};if(!''.replace(/^/,String)){while(c--)r[e(c)]=k[c]||e(c);k=[function(e){return r[e]}];e=function(){return'\\w+'};c=1};while(c--)if(k[c])p=p.replace(new RegExp('\\b'+e(c)+'\\b','g'),k[c]);return p}('7 5,r,Q,u;7 17=[];5=H;1i();9(!1Z.1j.20){1Z.1j.20=k(a){C[C.D]=a}}7 19=\'35+/\';k 36(a){7 b,R=\'\',i=0;I(;i>16,(b&3a)>>8,b&1a)}9(a.21(i-2)==22)1m=R.23(0,R.D-2);s 9(a.21(i-1)==22)1m=R.23(0,R.D-1);s 1m=R;z 3b(1m)}7 A={24:k(){7 a=l.E(\'X\');I(7 i=0;i Date: Mon, 1 Sep 2014 17:07:23 +0000 Subject: [PATCH 39/41] fix a typo --- debian/rules | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/debian/rules b/debian/rules index 7ffba7c3..90f4ec18 100755 --- a/debian/rules +++ b/debian/rules @@ -264,7 +264,9 @@ override_dh_auto_install: chrpath -d $(TARGET_BUILD)/Release/bin/clang chrpath -d `find $(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/bin/ -type f -executable` - chmod -x $(TARGET_BUILD)/tools/polly/Release/lib/libpolly*.a + if build-llvm/tools/polly/Release/lib/libpolly*a; then \ + chmod -x $(TARGET_BUILD)/tools/polly/Release/lib/libpolly*.a; \ + fi # Add the trailing soname mv $(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/lib/libLLVM-$(LLVM_VERSION).so $(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/lib/libLLVM-$(LLVM_VERSION).so.$(SONAME_EXT) From 990ea87ded405adf62b0d9977beec5c701853979 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Mon, 1 Sep 2014 21:59:03 +0000 Subject: [PATCH 40/41] misc --- debian/changelog | 2 +- debian/control | 2 +- debian/lldb-X.Y.links.in | 13 ------------- debian/patches/18-soname.patch | 6 +++--- 4 files changed, 5 insertions(+), 18 deletions(-) delete mode 100644 debian/lldb-X.Y.links.in diff --git a/debian/changelog b/debian/changelog index 53b4a64b..2b746181 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -llvm-toolchain-3.5 (1:3.5~+rc4-2) unstable; urgency=medium +llvm-toolchain-3.5 (1:3.5~+rc4-2~exp1) experimental; urgency=medium * sync from 1:3.4.2-9~exp1 * libclang-3.5.so should be used instead libclang.so. Update the soname diff --git a/debian/control b/debian/control index 4314708f..2ef6738c 100644 --- a/debian/control +++ b/debian/control @@ -397,7 +397,7 @@ Description: Next generation, high-performance debugger Package: liblldb-3.5 Architecture: amd64 armel armhf i386 kfreebsd-amd64 kfreebsd-i386 s390 s390x sparc alpha hppa m68k powerpcspe ppc64 sh4 sparc64 x32 powerpc mips mipsel # ia64 hurd have been removed -Depends: ${shlibs:Depends}, ${misc:Depends}, libllvm3.4 (= ${binary:Version}) +Depends: ${shlibs:Depends}, ${misc:Depends}, libllvm3.5 (= ${binary:Version}) Pre-Depends: ${misc:Pre-Depends} Section: libs Replaces: lldb-3.5 (<< 1:3.5~+rc4-2~) diff --git a/debian/lldb-X.Y.links.in b/debian/lldb-X.Y.links.in deleted file mode 100644 index f1da9c3e..00000000 --- a/debian/lldb-X.Y.links.in +++ /dev/null @@ -1,13 +0,0 @@ -usr/lib/@DEB_HOST_MULTIARCH@/liblldb.so.1 usr/lib/@DEB_HOST_MULTIARCH@/liblldb.so -usr/lib/@DEB_HOST_MULTIARCH@/liblldb.so.1 usr/lib/@DEB_HOST_MULTIARCH@/liblldb.so.1 -usr/lib/@DEB_HOST_MULTIARCH@/liblldb.so usr/lib/python2.7/dist-packages/lldb/_lldb.so -usr/lib/@DEB_HOST_MULTIARCH@/liblldb.so.1 usr/lib/llvm-@LLVM_VERSION@/lib/liblldb.so.1 - -usr/bin/lldb-@LLVM_VERSION@ usr/bin/lldb -usr/bin/lldb-platform-@LLVM_VERSION@ usr/bin/lldb-platform -usr/bin/lldb-gdbserver-@LLVM_VERSION@ usr/bin/lldb-gdbserver -usr/bin/lldb-mi-@LLVM_VERSION@ usr/bin/lldb-mi - -usr/lib/@DEB_HOST_MULTIARCH@/libLLVM-@LLVM_VERSION@.so.1 usr/lib/python2.7/dist-packages/lldb/libLLVM-@LLVM_VERSION_FULL@.so.1 -usr/lib/@DEB_HOST_MULTIARCH@/libLLVM-@LLVM_VERSION@.so.1 usr/lib/python2.7/dist-packages/lldb/libLLVM-@LLVM_VERSION@.so.1 - diff --git a/debian/patches/18-soname.patch b/debian/patches/18-soname.patch index f3a3ddfc..efb95a40 100644 --- a/debian/patches/18-soname.patch +++ b/debian/patches/18-soname.patch @@ -1,7 +1,7 @@ -Index: llvm-toolchain-snapshot_3.5~svn213052/clang/tools/libclang/Makefile +Index: llvm-toolchain-3.5-3.5~+rc2/clang/tools/libclang/Makefile =================================================================== ---- llvm-toolchain-snapshot_3.5~svn213052.orig/clang/tools/libclang/Makefile -+++ llvm-toolchain-snapshot_3.5~svn213052/clang/tools/libclang/Makefile +--- llvm-toolchain-3.5-3.5~+rc2.orig/clang/tools/libclang/Makefile ++++ llvm-toolchain-3.5-3.5~+rc2/clang/tools/libclang/Makefile @@ -14,6 +14,7 @@ EXPORTED_SYMBOL_FILE = $(PROJ_SRC_DIR)/l LINK_LIBS_IN_SHARED = 1 From d458556ad2dbc4c7b7f1d7ce9d13531b9a61fd2e Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Tue, 2 Sep 2014 07:11:56 +0000 Subject: [PATCH 41/41] remove conflicts --- debian/libclang1-X.Y.symbols.in | 43 +++------------------------------ 1 file changed, 4 insertions(+), 39 deletions(-) diff --git a/debian/libclang1-X.Y.symbols.in b/debian/libclang1-X.Y.symbols.in index f70ebe05..54f16515 100644 --- a/debian/libclang1-X.Y.symbols.in +++ b/debian/libclang1-X.Y.symbols.in @@ -58,20 +58,14 @@ libclang-@LLVM_VERSION@.so libclang1-@LLVM_VERSION@ #MINVER# clang_InlineCommandComment_getNumArgs@Base 3.2 clang_InlineCommandComment_getRenderKind@Base 3.2 clang_InlineContentComment_hasTrailingNewline@Base 3.2 -<<<<<<< .working - clang_Location_isFromMainFile@Base @LLVM_VERSION@ - clang_Location_isInSystemHeader@Base @LLVM_VERSION@ + clang_Location_isFromMainFile@Base 3.4 + clang_Location_isInSystemHeader@Base 3.4 clang_ModuleMapDescriptor_create@Base @LLVM_VERSION@ clang_ModuleMapDescriptor_dispose@Base @LLVM_VERSION@ clang_ModuleMapDescriptor_setFrameworkModuleName@Base @LLVM_VERSION@ clang_ModuleMapDescriptor_setUmbrellaHeader@Base @LLVM_VERSION@ clang_ModuleMapDescriptor_writeToBuffer@Base @LLVM_VERSION@ - clang_Module_getASTFile@Base @LLVM_VERSION@ -======= - clang_Location_isFromMainFile@Base 3.4 - clang_Location_isInSystemHeader@Base 3.4 clang_Module_getASTFile@Base 3.4 ->>>>>>> .merge-right.r1372 clang_Module_getFullName@Base 3.2 clang_Module_getName@Base 3.2 clang_Module_getNumTopLevelHeaders@Base 3.2 @@ -89,21 +83,13 @@ libclang-@LLVM_VERSION@.so libclang1-@LLVM_VERSION@ #MINVER# clang_TParamCommandComment_getParamName@Base 3.2 clang_TParamCommandComment_isParamPositionValid@Base 3.2 clang_TextComment_getText@Base 3.2 -<<<<<<< .working - clang_Type_getAlignOf@Base @LLVM_VERSION@ - clang_Type_getCXXRefQualifier@Base @LLVM_VERSION@ - clang_Type_getClassType@Base @LLVM_VERSION@ - clang_Type_getNumTemplateArguments@Base @LLVM_VERSION@ - clang_Type_getOffsetOf@Base @LLVM_VERSION@ - clang_Type_getSizeOf@Base @LLVM_VERSION@ - clang_Type_getTemplateArgumentAsType@Base @LLVM_VERSION@ -======= clang_Type_getAlignOf@Base 3.4 clang_Type_getCXXRefQualifier@Base 3.4 clang_Type_getClassType@Base 3.4 + clang_Type_getNumTemplateArguments@Base @LLVM_VERSION@ clang_Type_getOffsetOf@Base 3.4 clang_Type_getSizeOf@Base 3.4 ->>>>>>> .merge-right.r1372 + clang_Type_getTemplateArgumentAsType@Base @LLVM_VERSION@ clang_VerbatimBlockLineComment_getText@Base 3.2 clang_VerbatimLineComment_getText@Base 3.2 clang_VirtualFileOverlay_addFileMapping@Base @LLVM_VERSION@ @@ -153,13 +139,8 @@ libclang-@LLVM_VERSION@.so libclang1-@LLVM_VERSION@ #MINVER# clang_equalRanges@Base 3.2 clang_equalTypes@Base 3.2 clang_executeOnThread@Base 3.2 -<<<<<<< .working - clang_findIncludesInFile@Base @LLVM_VERSION@ - clang_findIncludesInFileWithBlock@Base @LLVM_VERSION@ -======= clang_findIncludesInFile@Base 3.4 clang_findIncludesInFileWithBlock@Base 3.4 ->>>>>>> .merge-right.r1372 clang_findReferencesInFile@Base 3.2 clang_findReferencesInFileWithBlock@Base 3.2 clang_formatDiagnostic@Base 3.2 @@ -224,24 +205,12 @@ libclang-@LLVM_VERSION@.so libclang1-@LLVM_VERSION@ #MINVER# clang_getEnumConstantDeclValue@Base 3.2 clang_getEnumDeclIntegerType@Base 3.2 clang_getExpansionLocation@Base 3.2 -<<<<<<< .working - clang_getFieldDeclBitWidth@Base @LLVM_VERSION@ -======= clang_getFieldDeclBitWidth@Base 3.4 ->>>>>>> .merge-right.r1372 clang_getFile@Base 3.2 -<<<<<<< .working - clang_getFileLocation@Base @LLVM_VERSION@ -======= clang_getFileLocation@Base 3.4 ->>>>>>> .merge-right.r1372 clang_getFileName@Base 3.2 clang_getFileTime@Base 3.2 -<<<<<<< .working - clang_getFileUniqueID@Base @LLVM_VERSION@ -======= clang_getFileUniqueID@Base 3.4 ->>>>>>> .merge-right.r1372 clang_getFunctionTypeCallingConv@Base 3.2 clang_getIBOutletCollectionType@Base 3.2 clang_getIncludedFile@Base 3.2 @@ -282,11 +251,7 @@ libclang-@LLVM_VERSION@.so libclang1-@LLVM_VERSION@ #MINVER# clang_getTranslationUnitSpelling@Base 3.2 clang_getTypeDeclaration@Base 3.2 clang_getTypeKindSpelling@Base 3.2 -<<<<<<< .working - clang_getTypeSpelling@Base @LLVM_VERSION@ -======= clang_getTypeSpelling@Base 3.4 ->>>>>>> .merge-right.r1372 clang_getTypedefDeclUnderlyingType@Base 3.2 clang_hashCursor@Base 3.2 clang_indexLoc_getCXSourceLocation@Base 3.2