[beignet] 04/09: explicitly use clang-3.4 and friends

[Andreas Beckmann]

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

anbe pushed a commit to branch jessie
in repository beignet.

commit 0f4607f6a9c848a6706c00cae2ae5bf70ec660c8
Author: Rebecca N. Palmer <rebecca_palmer at zoho.com>
Date:   Tue Oct 28 18:56:52 2014 +0000

    explicitly use clang-3.4 and friends
---
 debian/changelog                    |  5 +++++
 debian/control                      |  6 +++---
 debian/patches/versioned-llvm-tools | 16 ++++++++++++++--
 3 files changed, 22 insertions(+), 5 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 5bd1a32..402d1b0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,15 @@
 beignet (0.9.3~really.0.8+dfsg-1) UNRELEASED; urgency=medium
 
+  [ Andreas Beckmann ]
   * Set Maintainer to "Debian OpenCL Maintainers" with Simon's permission.
   * Add Simon Richter, Rebecca N. Palmer and myself to Uploaders.
   * Repack upstream tarball to remove non-distributable Len(n)a images and
     CC-BY-NC-SA licensed parts from the test suite.  (Closes: #767387)
 
+  [ Rebecca N. Palmer ]
+  * Build-Depends: clang-3.4, lib{clang,llvm}-3.4-dev.  (Closes: #764930)
+  * patches/versioned-llvm-tools: Fix one more unversioned use of clang.
+
  -- Andreas Beckmann <anbe at debian.org>  Mon, 17 Nov 2014 12:50:31 +0100
 
 beignet (0.8-1.1) unstable; urgency=medium
diff --git a/debian/control b/debian/control
index 86f082b..6638739 100644
--- a/debian/control
+++ b/debian/control
@@ -8,9 +8,9 @@ Uploaders:
 Build-Depends: debhelper (>= 9), cmake, pkg-config, python-minimal,
  ocl-icd-dev, ocl-icd-opencl-dev,
  libdrm-dev, libxfixes-dev, libxext-dev,
- llvm-dev (>= 1:3.4),
- clang (>= 1:3.4),
- libclang-dev (>= 1:3.4),
+ llvm-3.4-dev,
+ clang-3.4,
+ libclang-3.4-dev,
  libgl1-mesa-dev (>= 9) [!kfreebsd-any],
  libegl1-mesa-dev (>= 9) [!kfreebsd-any],
  libgbm-dev (>= 9) [!kfreebsd-any],
diff --git a/debian/patches/versioned-llvm-tools b/debian/patches/versioned-llvm-tools
index 65e77b3..67c87e4 100644
--- a/debian/patches/versioned-llvm-tools
+++ b/debian/patches/versioned-llvm-tools
@@ -1,9 +1,21 @@
 Description: Use versioned LLVM tools
-Author: Simon Richter <sjr at debian.org>
-Last-Update: 2014-04-19
+Description: <short summary of the patch>
+Author: Simon Richter <sjr at debian.org>, Rebecca N. Palmer <rebecca_palmer at zoho.com>
+Bug-Debian: https://bugs.debian.org/759933,https://bugs.debian.org/764930
 
 --- beignet-0.8.orig/backend/src/CMakeLists.txt
 +++ beignet-0.8/backend/src/CMakeLists.txt
+@@ -58,8 +58,8 @@ set (clang_cmd ${clang_cmd} -fno-builtin
+ add_custom_command(
+      OUTPUT ${pch_object}
+      COMMAND rm -f ${pch_object}
+-     COMMAND clang ${clang_cmd} --relocatable-pch -emit-pch -isysroot ${CMAKE_CURRENT_BINARY_DIR} ${ocl_blob_file} -o ${pch_object}
+-     COMMAND clang ${clang_cmd} -emit-pch ${ocl_blob_file} -o ${local_pch_object}
++     COMMAND clang-3.4 ${clang_cmd} --relocatable-pch -emit-pch -isysroot ${CMAKE_CURRENT_BINARY_DIR} ${ocl_blob_file} -o ${pch_object}
++     COMMAND clang-3.4 ${clang_cmd} -emit-pch ${ocl_blob_file} -o ${local_pch_object}
+      DEPENDS ${ocl_blob_file}
+      )
+ 
 @@ -71,14 +71,14 @@ macro(ll_add_library ll_lib ll_sources)
    add_custom_command(
         OUTPUT  ${ll}.bc

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