[beignet] 03/04: Drop llvm-config --system-libs and related dependencies

[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 638971d387dea6ddba2b7dcd17e865a6fdd519fb
Author: Rebecca N. Palmer <rebecca_palmer at zoho.com>
Date:   Tue Apr 28 20:28:39 2015 +0100

    Drop llvm-config --system-libs and related dependencies
    
    dh_shlibdeps says we don't need them
---
 debian/changelog                 |  4 +++-
 debian/control                   |  2 --
 debian/patches/shared-llvm.patch | 16 +++++++++++++---
 3 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 02798cd..9a7a561 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,7 +8,9 @@ beignet (1.0.3-1) UNRELEASED; urgency=medium
   * Build with Python 3.
   * Drop Enhance-debug-output.patch.
   * Add reportbug script.
-  * Drop Link-against-terminfo.patch and libtinfo dependency.
+  * Drop Link-against-terminfo.patch, llvm-config --system-libs and
+    related dependencies, as they are not needed when dynamically
+    linking libllvm.
   * Make __local on Haswell an error instead of silently doing nothing,
     and document workarounds.
 
diff --git a/debian/control b/debian/control
index 2ab94be..08cbb04 100644
--- a/debian/control
+++ b/debian/control
@@ -17,10 +17,8 @@ Build-Depends:
  pkg-config,
  python3,
  libdrm-dev,
- libedit-dev,
  libxext-dev,
  libxfixes-dev,
- zlib1g-dev,
 Standards-Version: 3.9.6
 Homepage: http://www.freedesktop.org/wiki/Software/Beignet/
 Vcs-Git: git://anonscm.debian.org/pkg-opencl/beignet.git
diff --git a/debian/patches/shared-llvm.patch b/debian/patches/shared-llvm.patch
index ce29960..cd87d93 100644
--- a/debian/patches/shared-llvm.patch
+++ b/debian/patches/shared-llvm.patch
@@ -7,7 +7,7 @@ Author: Rebecca Palmer <rebecca_palmer at zoho.com>
 
 --- beignet-1.0.2.orig/CMake/FindLLVM.cmake
 +++ beignet-1.0.2/CMake/FindLLVM.cmake
-@@ -93,11 +93,7 @@ execute_process(
+@@ -93,20 +93,7 @@ execute_process(
    OUTPUT_STRIP_TRAILING_WHITESPACE
  )
  
@@ -16,7 +16,17 @@ Author: Rebecca Palmer <rebecca_palmer at zoho.com>
 -  OUTPUT_VARIABLE LLVM_MODULE_LIBS
 -  OUTPUT_STRIP_TRAILING_WHITESPACE
 -)
+-
+-if (LLVM_VERSION_NODOT VERSION_GREATER 34)
+-execute_process(
+-  COMMAND ${LLVM_CONFIG_EXECUTABLE} --system-libs
+-  OUTPUT_VARIABLE LLVM_SYSTEM_LIBS_ORIG
+-  OUTPUT_STRIP_TRAILING_WHITESPACE
+-)
+-string(REGEX REPLACE " *\n" "" LLVM_SYSTEM_LIBS ${LLVM_SYSTEM_LIBS_ORIG})
+-endif (LLVM_VERSION_NODOT VERSION_GREATER 34)
 +set(LLVM_MODULE_LIBS "-lLLVM-${LLVM_VERSION}")
  
- if (LLVM_VERSION_NODOT VERSION_GREATER 34)
- execute_process(
+ macro(add_one_lib name)
+   FIND_LIBRARY(CLANG_LIB
+

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