[pocl] 10/14: llvm-config --system-libs is only needed with static llvm

[Andreas Beckmann]

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

anbe pushed a commit to branch master
in repository pocl.

commit 73ca24c4e27f6e913bf4b68ce9ec1182ad4f35f1
Author: Andreas Beckmann <anbe at debian.org>
Date:   Mon Apr 25 01:18:48 2016 +0200

    llvm-config --system-libs is only needed with static llvm
---
 debian/changelog                      |  1 +
 debian/patches/llvm-system-libs.patch | 36 +++++++++++++++++++++++++++++++++++
 debian/patches/series                 |  1 +
 3 files changed, 38 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 542c609..7bfdb80 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -12,6 +12,7 @@ pocl (0.11-1) UNRELEASED; urgency=medium
   * Show the full tests/testsuite.log on testsuite failures.
   * Drop the -dbg package in favor of autogenerated -dbgsym packages.
   * Update symbols files for amd64 and i386.
+  * llvm-config --system-libs is only needed with static llvm.
   * Put package under "Debian OpenCL Maintainers" team maintenance.
   * Add Vincent Danjean and myself to Uploaders.
   * Bump Standards-Version to 3.9.8 (no changes needed).
diff --git a/debian/patches/llvm-system-libs.patch b/debian/patches/llvm-system-libs.patch
new file mode 100644
index 0000000..1caac75
--- /dev/null
+++ b/debian/patches/llvm-system-libs.patch
@@ -0,0 +1,36 @@
+Author: Andreas Beckmann <anbe at debian.org>
+Description: llvm-config --system-libs is only needed with static llvm
+
+--- a/configure.ac
++++ b/configure.ac
+@@ -86,6 +86,7 @@ LLVM_VERSION=`$LLVM_CONFIG --version`
+ LLVM_BINDIR=`$LLVM_CONFIG --bindir`
+ LLVM_LIBDIR=`$LLVM_CONFIG --libdir`
+ LLVM_LDFLAGS=`$LLVM_CONFIG --ldflags`
++LLMV_SYSTEM_LIBS=
+ # Whether we can use our own printf implementation
+ NEW_PRINTF_WORKS=true
+ LLVM_3_6=false
+@@ -107,12 +108,12 @@ case "$LLVM_VERSION" in
+    ;;   
+      3.5*)
+      AC_DEFINE([LLVM_3_5], [], "Using LLVM 3.5")
+-     LLVM_LDFLAGS="$LLVM_LDFLAGS `$LLVM_CONFIG --system-libs`"
++     LLMV_SYSTEM_LIBS="`$LLVM_CONFIG --system-libs`"
+    ;;
+      3.6*)
+      AC_DEFINE([LLVM_3_6], [], "Using LLVM svn, upcoming 3.6")
+      LLVM_3_6=true
+-     LLVM_LDFLAGS="$LLVM_LDFLAGS `$LLVM_CONFIG --system-libs`"
++     LLMV_SYSTEM_LIBS="`$LLVM_CONFIG --system-libs`"
+    ;;
+      *)
+    AC_MSG_ERROR(
+@@ -140,6 +141,7 @@ AC_ARG_ENABLE([static-llvm],
+ LLVM_SHARED_LIB_FILE=$LLVM_LIBDIR/libLLVM-$LLVM_VERSION$LIBRARY_SUFFIX
+ 
+ if test "$link_llvm_static" = "yes"; then
++  LLVM_LDFLAGS="$LLVM_LDFLAGS $LLMV_SYSTEM_LIBS"
+   LLVM_LIBS=$($LLVM_CONFIG --libfiles)
+ else
+   LLVM_LIBS=-lLLVM-$LLVM_VERSION
diff --git a/debian/patches/series b/debian/patches/series
index e0aa072..749be3f 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 freebsd-compat.patch
 fix-configure-for-debian-archs.patch
+llvm-system-libs.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/collab-maint/pocl.git