[beignet] 05/09: Switch to LLVM 5.0 on release architectures (Closes: #873403), add now-required --link-static to --system-libs.

[Rebecca Palmer]

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

rnpalmer-guest pushed a commit to branch master
in repository beignet.

commit 4d30357dbec95bfdd5f0378146dd5f16a11e9d47
Author: Rebecca N. Palmer <rebecca_palmer at zoho.com>
Date:   Fri Oct 27 19:51:29 2017 +0100

    Switch to LLVM 5.0 on release architectures (Closes: #873403),
    add now-required --link-static to --system-libs.
---
 debian/changelog                 |  2 ++
 debian/control                   |  6 +++---
 debian/patches/static-llvm.patch | 17 ++++++++++++++++-
 debian/rules                     |  2 +-
 4 files changed, 22 insertions(+), 5 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index d9dc6d4..0941019 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,8 @@ beignet (1.3.2-1) UNRELEASED; urgency=medium
   * New upstream release.
   * Drop patch applied upstream, refresh others.
   * Fix broken link in documentation.
+  * Switch to LLVM 5.0 on release architectures,
+    add now-required --link-static to --system-libs.  (Closes: #873403)
 
  -- Rebecca N. Palmer <rebecca_palmer at zoho.com>  Fri, 27 Oct 2017 07:31:21 +0100
 
diff --git a/debian/control b/debian/control
index 84b3774..119c8fc 100644
--- a/debian/control
+++ b/debian/control
@@ -12,9 +12,9 @@ Build-Depends:
  clang-3.8 [!amd64 !i386],
  libclang-3.8-dev [!amd64 !i386],
  llvm-3.8-dev [!amd64 !i386],
- clang-3.9 [amd64 i386],
- libclang-3.9-dev [amd64 i386],
- llvm-3.9-dev [amd64 i386],
+ clang-5.0 [amd64 i386],
+ libclang-5.0-dev [amd64 i386],
+ llvm-5.0-dev [amd64 i386],
  ocl-icd-dev,
  ocl-icd-opencl-dev,
  opencl-headers (>= 2.0~),
diff --git a/debian/patches/static-llvm.patch b/debian/patches/static-llvm.patch
index f50b02d..affb987 100644
--- a/debian/patches/static-llvm.patch
+++ b/debian/patches/static-llvm.patch
@@ -13,7 +13,7 @@ Bug-Debian: https://bugs.debian.org/852746
 
 --- beignet-1.3.0.orig/CMake/FindLLVM.cmake
 +++ beignet-1.3.0/CMake/FindLLVM.cmake
-@@ -87,11 +87,19 @@ execute_process(
+@@ -87,18 +87,34 @@ execute_process(
    OUTPUT_STRIP_TRAILING_WHITESPACE
  )
  
@@ -32,5 +32,20 @@ Bug-Debian: https://bugs.debian.org/852746
 +endif (LLVM_VERSION_NODOT VERSION_GREATER 38)
  
  if (LLVM_VERSION_NODOT VERSION_GREATER 34)
++if (LLVM_VERSION_NODOT VERSION_GREATER 38)
++execute_process(
++  COMMAND ${LLVM_CONFIG_EXECUTABLE} --system-libs --link-static
++  OUTPUT_VARIABLE LLVM_SYSTEM_LIBS_ORIG
++  OUTPUT_STRIP_TRAILING_WHITESPACE
++)
++else (LLVM_VERSION_NODOT VERSION_GREATER 38)
  execute_process(
+   COMMAND ${LLVM_CONFIG_EXECUTABLE} --system-libs
+   OUTPUT_VARIABLE LLVM_SYSTEM_LIBS_ORIG
+   OUTPUT_STRIP_TRAILING_WHITESPACE
+ )
++endif (LLVM_VERSION_NODOT VERSION_GREATER 38)
+ if (LLVM_SYSTEM_LIBS_ORIG)
+ string(REGEX REPLACE " *\n" "" LLVM_SYSTEM_LIBS ${LLVM_SYSTEM_LIBS_ORIG})
+ endif (LLVM_SYSTEM_LIBS_ORIG)
 
diff --git a/debian/rules b/debian/rules
index b32edc8..5d81bda 100755
--- a/debian/rules
+++ b/debian/rules
@@ -13,7 +13,7 @@ export DEB_CPPFLAGS_MAINT_APPEND = -DGBE_DEBUG=1
 # We build with the headers from opencl-headers.
 SUPERFLUOUS=cl.h cl_d3d10.h cl_dx9_media_sharing.h cl_ext.h cl_gl_ext.h cl_platform.h cl.hpp cl_d3d11.h cl_egl.h cl_gl.h opencl.h
 
-LLVM_VERSION		:= $(if $(shell [ -d /usr/lib/llvm-3.9/include/clang ] && echo 1),3.9,3.8)
+LLVM_VERSION		:= $(if $(shell [ -d /usr/lib/llvm-5.0/include/clang ] && echo 1),5.0,3.8)
 
 override_dh_auto_configure:
 	$(RM) $(patsubst %,include/CL/%,$(SUPERFLUOUS))

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