[libclc] 284/291: Remove clang3.5.patch, refresh system-clang.patch.

[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 65441c875c407ac3c0d99f63d832f3528088a368
Author: Timo Aaltonen <tjaalton at debian.org>
Date:   Tue Aug 18 10:06:00 2015 +0300

    Remove clang3.5.patch, refresh system-clang.patch.
---
 debian/changelog                  |  1 +
 debian/patches/clang3.5.patch     | 55 ---------------------------------------
 debian/patches/series             |  1 -
 debian/patches/system-clang.patch |  4 +--
 4 files changed, 3 insertions(+), 58 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 57f5096..947c54e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ libclc (0.2.0~git20150813-1) UNRELEASED; urgency=medium
 
   * New upstream snapshot.
   * control: Bump llvm build-dep to 3.7.
+  * Remove clang3.5.patch, refresh system-clang.patch.
 
  -- Timo Aaltonen <tjaalton at debian.org>  Tue, 18 Aug 2015 09:49:34 +0300
 
diff --git a/debian/patches/clang3.5.patch b/debian/patches/clang3.5.patch
deleted file mode 100644
index c78c949..0000000
--- a/debian/patches/clang3.5.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-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 9a9ed75..389be6e 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
 system-clang.patch
-clang3.5.patch
diff --git a/debian/patches/system-clang.patch b/debian/patches/system-clang.patch
index 58454b2..4940693 100644
--- a/debian/patches/system-clang.patch
+++ b/debian/patches/system-clang.patch
@@ -4,9 +4,9 @@ Date: Tue, 7 Jan 2014 16:32:47 +0100
 
 --- a/configure.py
 +++ b/configure.py
-@@ -73,13 +73,13 @@ llvm_core_libs = llvm_config(['--libs', 'core', 'bitreader', 'bitwriter']) + ' '
-                  llvm_config(['--ldflags'])
+@@ -81,13 +81,13 @@ llvm_core_libs = llvm_config(['--libs',
  llvm_cxxflags = llvm_config(['--cxxflags']) + ' -fno-exceptions -fno-rtti'
+ llvm_libdir = llvm_config(['--libdir'])
  
 -llvm_clang = os.path.join(llvm_bindir, 'clang')
 +llvm_clang = 'clang'

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