[libclc] 217/291: Imported Debian patch 0~git20140101-4

[Andreas Beckmann]

This is an automated email from the git hooks/post-receive script.

anbe pushed a commit to branch master
in repository libclc.

commit c1553c34727e8c24f6eb9696587b7b5d8bf303cc
Author: Michael Gilbert <mgilbert at debian.org>
Date:   Sun Oct 12 20:16:32 2014 +0000

    Imported Debian patch 0~git20140101-4
---
 debian/changelog              |  6 +++++
 debian/control                |  3 ++-
 debian/patches/clang3.5.patch | 55 +++++++++++++++++++++++++++++++++++++++++++
 debian/patches/series         |  1 +
 4 files changed, 64 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 6600379..9b6dacf 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+libclc (0~git20140101-4) unstable; urgency=medium
+
+  * Support clang 3.5 as the new default (closes: #764835).
+
+ -- Michael Gilbert <mgilbert at debian.org>  Sun, 12 Oct 2014 20:16:32 +0000
+
 libclc (0~git20140101-3) unstable; urgency=medium
 
   * Build-depend llvm-dev instead of llvm (closes: #760665).
diff --git a/debian/control b/debian/control
index a14a57d..f78e91b 100644
--- a/debian/control
+++ b/debian/control
@@ -8,7 +8,8 @@ Build-Depends:
  debhelper (>= 9),
  python,
  clang,
- llvm-dev,
+ llvm-dev (>= 3.5),
+ libedit-dev,
 Standards-Version: 3.9.5
 Homepage: http://libclc.llvm.org
 
diff --git a/debian/patches/clang3.5.patch b/debian/patches/clang3.5.patch
new file mode 100644
index 0000000..c78c949
--- /dev/null
+++ b/debian/patches/clang3.5.patch
@@ -0,0 +1,55 @@
+description: support clang 3.5 as the default
+author: Michael Gilbert <mgilbert at debian.org>
+origin: https://www.libreoffice.org/bugzilla/show_bug.cgi?id=80243
+
+--- a/utils/prepare-builtins.cpp
++++ b/utils/prepare-builtins.cpp
+@@ -1,4 +1,3 @@
+-#include "llvm/ADT/OwningPtr.h"
+ #include "llvm/Bitcode/ReaderWriter.h"
+ #include "llvm/IR/Function.h"
+ #include "llvm/IR/GlobalVariable.h"
+@@ -8,7 +7,7 @@
+ #include "llvm/Support/ManagedStatic.h"
+ #include "llvm/Support/MemoryBuffer.h"
+ #include "llvm/Support/raw_ostream.h"
+-#include "llvm/Support/system_error.h"
++#include "llvm/Support/FileSystem.h"
+ #include "llvm/Support/ToolOutputFile.h"
+ #include "llvm/Config/config.h"
+ 
+@@ -31,11 +30,17 @@ int main(int argc, char **argv) {
+   std::auto_ptr<Module> M;
+ 
+   {
+-    OwningPtr<MemoryBuffer> BufferPtr;
+-    if (error_code ec = MemoryBuffer::getFileOrSTDIN(InputFilename, BufferPtr))
++    ErrorOr<std::unique_ptr<MemoryBuffer>> BufferOrErr =
++      MemoryBuffer::getFile(InputFilename);
++    std::unique_ptr<MemoryBuffer> &BufferPtr = BufferOrErr.get();
++    if (std::error_code  ec = BufferOrErr.getError())
+       ErrorMessage = ec.message();
+-    else
+-      M.reset(ParseBitcodeFile(BufferPtr.get(), Context, &ErrorMessage));
++    else {
++      ErrorOr<Module *> ModuleOrErr = parseBitcodeFile(BufferPtr.get(), Context);
++      if (std::error_code ec = ModuleOrErr.getError())
++        ErrorMessage = ec.message();
++      M.reset(ModuleOrErr.get());
++    }
+   }
+ 
+   if (M.get() == 0) {
+@@ -65,10 +70,10 @@ int main(int argc, char **argv) {
+   }
+ 
+   std::string ErrorInfo;
+-  OwningPtr<tool_output_file> Out
++  std::unique_ptr<tool_output_file> Out
+   (new tool_output_file(OutputFilename.c_str(), ErrorInfo,
+ #if LLVM_VERSION_MAJOR > 3 || (LLVM_VERSION_MAJOR == 3 && LLVM_VERSION_MINOR > 3)
+-                        sys::fs::F_Binary));
++                        sys::fs::F_None));
+ #else
+                         raw_fd_ostream::F_Binary));
+ #endif
diff --git a/debian/patches/series b/debian/patches/series
index 389be6e..9a9ed75 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 system-clang.patch
+clang3.5.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-opencl/libclc.git