diff --git a/debian/changelog b/debian/changelog index 42fb2894..04ad94ec 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,5 +1,8 @@ -llvm-toolchain-3.4 (1:3.4+204650-1~exp1) UNRELEASED; urgency=medium +llvm-toolchain-3.4 (1:3.4.1-1) unstable; urgency=medium + * New upstream release. Note that only LLVM & Clang had a new release. + I just copied the 3.4 tarballs for clang-extra-tools, polly, lldb and + compiler-rt. * Symlink for current build mode missing (Closes upstream #18836) * Add link usr/lib/llvm-3.4/ to usr/lib/llvm-3.4/build/Debug+Asserts * Backport of a r201586 from upstream. scan-build was failing on some project @@ -21,11 +24,12 @@ llvm-toolchain-3.4 (1:3.4+204650-1~exp1) UNRELEASED; urgency=medium - ocamldoc.tar.gz - llvm-3.4-doc - BugpointPasses.so - llvm-3.4-dev - liblldb* - lldb-3.4-dev + - lldb-platform-3.4 - lldb-3.4 - clang-apply-replacements - clang-3.4 - clang-tidy - clang-3.4 - pp-trace - clang-3.4 - -- Sylvestre Ledru Fri, 28 Mar 2014 13:41:23 +0000 + -- Sylvestre Ledru Fri, 09 May 2014 19:57:33 +0200 llvm-toolchain-3.4 (1:3.4-2) unstable; urgency=medium diff --git a/debian/libclang-common-3.4-dev.install b/debian/libclang-common-3.4-dev.install index f1b1bd68..b8c18c0d 100644 --- a/debian/libclang-common-3.4-dev.install +++ b/debian/libclang-common-3.4-dev.install @@ -1,7 +1,7 @@ -usr/lib/llvm-3.4/lib/clang/3.4/include +usr/lib/llvm-3.4/lib/clang/3.4.1/include usr/lib/llvm-3.4/include/polly/ -usr/lib/llvm-3.4/lib/clang/3.4/lib +usr/lib/llvm-3.4/lib/clang/3.4.1/lib #usr/lib/clang/3.4/lib /usr/lib/clang/3.4/ diff --git a/debian/libclang-common-3.4-dev.links b/debian/libclang-common-3.4-dev.links index 1710f707..7f0afa19 100644 --- a/debian/libclang-common-3.4-dev.links +++ b/debian/libclang-common-3.4-dev.links @@ -1,3 +1,6 @@ -usr/lib/llvm-3.4/lib/clang/3.4/include usr/include/clang/3.4/include -usr/lib/llvm-3.4/lib/clang/3.4/include usr/lib/clang/3.4/include -usr/lib/llvm-3.4/lib/clang/3.4/lib usr/lib/clang/3.4/lib +usr/lib/llvm-3.4/lib/clang/3.4.1/include usr/include/clang/3.4/include +usr/lib/llvm-3.4/lib/clang/3.4.1/include usr/lib/clang/3.4/include +usr/lib/llvm-3.4/lib/clang/3.4.1/lib usr/lib/clang/3.4/lib +usr/lib/llvm-3.4/lib/clang/3.4.1/include usr/include/clang/3.4.1/include +usr/lib/llvm-3.4/lib/clang/3.4.1/include usr/lib/clang/3.4.1/include +usr/lib/llvm-3.4/lib/clang/3.4.1/lib usr/lib/clang/3.4.1/lib \ No newline at end of file diff --git a/debian/lldb-3.4.install.in b/debian/lldb-3.4.install.in index 389d5f50..42f0dae9 100644 --- a/debian/lldb-3.4.install.in +++ b/debian/lldb-3.4.install.in @@ -1,4 +1,5 @@ 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@/ diff --git a/debian/llvm-3.4-dev.install b/debian/llvm-3.4-dev.install index f2d33cd2..17e9f329 100644 --- a/debian/llvm-3.4-dev.install +++ b/debian/llvm-3.4-dev.install @@ -1,6 +1,7 @@ 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/libLLVM*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/ diff --git a/debian/llvm-3.4-dev.links.in b/debian/llvm-3.4-dev.links.in index f51c39f3..9e2652c9 100644 --- a/debian/llvm-3.4-dev.links.in +++ b/debian/llvm-3.4-dev.links.in @@ -1,5 +1,5 @@ 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.1.so.1 usr/lib/llvm-3.4/lib/libLLVM-3.4.1.so +usr/lib/@DEB_HOST_MULTIARCH@/libLLVM-3.4.1.so.1 usr/lib/llvm-3.4/lib/libLLVM-3.4.1.so 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 diff --git a/debian/patches/30-kfreebsd.diff b/debian/patches/30-kfreebsd.diff index 68353c50..6dba9fc8 100644 --- a/debian/patches/30-kfreebsd.diff +++ b/debian/patches/30-kfreebsd.diff @@ -1,39 +1,23 @@ -Index: llvm-toolchain-3.4-3.4~+rc2/clang/lib/Driver/ToolChains.h +Index: llvm-toolchain-3.4-3.4.1/clang/lib/Driver/ToolChains.cpp =================================================================== ---- llvm-toolchain-3.4-3.4~+rc2.orig/clang/lib/Driver/ToolChains.h 2013-11-17 23:36:07.000000000 +0100 -+++ llvm-toolchain-3.4-3.4~+rc2/clang/lib/Driver/ToolChains.h 2013-12-05 09:07:45.000000000 +0100 -@@ -164,6 +164,8 @@ - virtual bool isPICDefault() const; - virtual bool isPIEDefault() const; - virtual bool isPICDefaultForced() const; -+ virtual void AddClangSystemIncludeArgs(const llvm::opt::ArgList &DriverArgs, -+ llvm::opt::ArgStringList &CC1Args) const; +--- llvm-toolchain-3.4-3.4.1.orig/clang/lib/Driver/ToolChains.cpp 2014-04-26 01:38:13.000000000 +0200 ++++ llvm-toolchain-3.4-3.4.1/clang/lib/Driver/ToolChains.cpp 2014-05-10 12:34:16.374471699 +0200 +@@ -2588,6 +2588,10 @@ + if (DriverArgs.hasArg(options::OPT_nostdinc)) + return; - protected: - virtual Tool *getTool(Action::ActionClass AC) const; -Index: llvm-toolchain-3.4-3.4~+rc2/clang/lib/Driver/ToolChains.cpp -=================================================================== ---- llvm-toolchain-3.4-3.4~+rc2.orig/clang/lib/Driver/ToolChains.cpp 2013-12-02 11:00:07.000000000 +0100 -+++ llvm-toolchain-3.4-3.4~+rc2/clang/lib/Driver/ToolChains.cpp 2013-12-05 09:08:49.000000000 +0100 -@@ -973,6 +973,13 @@ - return GoodVersion; - } - -+void Generic_GCC::AddClangSystemIncludeArgs(const llvm::opt::ArgList &DriverArgs, -+ llvm::opt::ArgStringList &CC1Args) const { + // Under Debian, clang headers are installed into + // '/usr/include/clang/VERSION/include/' + addSystemInclude(DriverArgs, CC1Args, "/usr/include/clang/" + std::string(CLANG_VERSION_STRING) + "/include/"); -+} + - /// \brief Less-than for GCCVersion, implementing a Strict Weak Ordering. - bool Generic_GCC::GCCVersion::isOlderThan(int RHSMajor, int RHSMinor, - int RHSPatch, -Index: llvm-toolchain-3.4-3.4~+rc2/lldb/source/Host/common/Host.cpp + if (!DriverArgs.hasArg(options::OPT_nostdlibinc)) + addSystemInclude(DriverArgs, CC1Args, SysRoot + "/usr/local/include"); + +Index: llvm-toolchain-3.4-3.4.1/lldb/source/Host/common/Host.cpp =================================================================== ---- llvm-toolchain-3.4-3.4~+rc2.orig/lldb/source/Host/common/Host.cpp 2013-12-05 09:08:49.000000000 +0100 -+++ llvm-toolchain-3.4-3.4~+rc2/lldb/source/Host/common/Host.cpp 2013-12-05 09:09:17.294953434 +0100 -@@ -1546,7 +1546,7 @@ +--- llvm-toolchain-3.4-3.4.1.orig/lldb/source/Host/common/Host.cpp 2013-12-16 10:49:51.000000000 +0100 ++++ llvm-toolchain-3.4-3.4.1/lldb/source/Host/common/Host.cpp 2014-05-10 12:33:20.000000000 +0200 +@@ -1586,7 +1586,7 @@ return error; } diff --git a/debian/patches/profile_rt.diff b/debian/patches/profile_rt.diff index a13697fc..1012c6fe 100644 --- a/debian/patches/profile_rt.diff +++ b/debian/patches/profile_rt.diff @@ -1,8 +1,8 @@ -Index: llvm-toolchain-snapshot_3.4~svn192346/clang/lib/Driver/Tools.cpp +Index: llvm-toolchain-3.4_3.4~+final/clang/lib/Driver/Tools.cpp =================================================================== ---- llvm-toolchain-snapshot_3.4~svn192346.orig/clang/lib/Driver/Tools.cpp 2013-10-10 13:38:05.214083057 +0200 -+++ llvm-toolchain-snapshot_3.4~svn192346/clang/lib/Driver/Tools.cpp 2013-10-10 13:38:05.206083056 +0200 -@@ -36,6 +36,7 @@ +--- llvm-toolchain-3.4_3.4~+final.orig/clang/lib/Driver/Tools.cpp 2014-05-09 20:00:11.406805529 +0200 ++++ llvm-toolchain-3.4_3.4~+final/clang/lib/Driver/Tools.cpp 2014-05-09 20:00:11.402805450 +0200 +@@ -37,6 +37,7 @@ #include "llvm/Support/Program.h" #include "llvm/Support/Process.h" #include "llvm/Support/raw_ostream.h" @@ -10,7 +10,7 @@ Index: llvm-toolchain-snapshot_3.4~svn192346/clang/lib/Driver/Tools.cpp #include using namespace clang::driver; -@@ -221,7 +222,7 @@ +@@ -222,7 +223,7 @@ // libprofile_rt.so. We used to use the -l:libprofile_rt.a syntax, but that is // not supported by old linkers. std::string ProfileRT = diff --git a/debian/rules b/debian/rules index 4a9f8c86..3bb129a8 100755 --- a/debian/rules +++ b/debian/rules @@ -258,7 +258,10 @@ override_dh_auto_install: 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); \ - fi + fi; \ + rm -f libLLVM-$(LLVM_VERSION).so; \ + ln -s libLLVM-$(LLVM_VERSION_FULL).so.$(SONAME_EXT) libLLVM-$(LLVM_VERSION).so; \ + rm -f libclang.so # cd $(TARGET_BUILD)/tools/clang/runtime/compiler-rt/ && rm -rf $$(find . -iname "SubDir.lib*" -o -iname .dir) && rm -rf $$(find -empty)