[beignet] 01/02: Use -Bsymbolic to make sure we jump to our LLVM and not mesa's. Closes: #768185

[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 6cb0b398800dda3cadb08f5c11a4124d6987ea62
Author: Rebecca N. Palmer <rebecca_palmer at zoho.com>
Date:   Thu Jan 29 13:40:44 2015 +0000

    Use -Bsymbolic to make sure we jump to our LLVM and not mesa's.
    Closes: #768185
---
 debian/README.Debian                                          | 9 ---------
 debian/changelog                                              | 5 +++++
 debian/patches/Debian-compliant-compiler-flags-handling.patch | 8 ++++++--
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/debian/README.Debian b/debian/README.Debian
deleted file mode 100644
index 0aa0f63..0000000
--- a/debian/README.Debian
+++ /dev/null
@@ -1,9 +0,0 @@
-Known Issues
-============
-
-* Interoperability problems with mesa-opencl-icd
-  https://bugs.debian.org/768185
-
-  There are interoperability problems between beignet and mesa-opencl-icd
-  that may render the whole OpenCL stack unusable. This issue is currently
-  being investigated. As a workaround uninstall one of these packages.
diff --git a/debian/changelog b/debian/changelog
index 19d0d8d..e1dfa2a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,15 @@
 beignet (1.0.1-1) UNRELEASED; urgency=medium
 
+  [ Andreas Beckmann ]
   * New upstream release.
   * Add beignet-dbg package with debug symbols.
   * Update watch file.
   * Refresh patches.
 
+  [ Rebecca N. Palmer ]
+  * Use -Bsymbolic to make sure we jump to our LLVM and not mesa's.
+    (Closes: #768185)
+
  -- Andreas Beckmann <anbe at debian.org>  Fri, 23 Jan 2015 23:17:24 +0100
 
 beignet (1.0.0-1) experimental; urgency=medium
diff --git a/debian/patches/Debian-compliant-compiler-flags-handling.patch b/debian/patches/Debian-compliant-compiler-flags-handling.patch
index f5a729e..8e97324 100644
--- a/debian/patches/Debian-compliant-compiler-flags-handling.patch
+++ b/debian/patches/Debian-compliant-compiler-flags-handling.patch
@@ -1,4 +1,8 @@
-Description: Respect CFLAGS,etc and be verbose
+Description: Set compiler flags
+
+Respect CFLAGS,CXXFLAGS,LDFLAGS (security hardening etc.)
+Be verbose
+Use -Bsymbolic to avoid jumping into mesa's LLVM (#768185)
 
 Author: Simon Richter <sjr at debian.org>,Rebecca Palmer <rebecca_palmer at zoho.com>
 --- a/CMakeLists.txt
@@ -27,7 +31,7 @@ Author: Simon Richter <sjr at debian.org>,Rebecca Palmer <rebecca_palmer at zoho.com>
  
  
 -set (CMAKE_SHARED_LINKER_FLAGS "-Wl,--no-undefined ${LLVM_LDFLAGS}")
-+set (CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,--no-undefined ${LLVM_LDFLAGS}")
++set (CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,-Bsymbolic -Wl,--no-undefined ${LLVM_LDFLAGS}")
  
  # XLib
  Find_Package(X11)

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