[beignet] 03/12: Refresh Debian-compliant-compiler-flags-handling.patch

[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 03df23bab9929628162a23c3985ee7f9bc96afd5
Author: Rebecca N. Palmer <rebecca_palmer at zoho.com>
Date:   Wed Mar 18 08:16:47 2015 +0000

    Refresh Debian-compliant-compiler-flags-handling.patch
    
    The -Bsymbolic part is now upstream
---
 debian/changelog                                        |  2 +-
 .../Debian-compliant-compiler-flags-handling.patch      | 17 ++++-------------
 2 files changed, 5 insertions(+), 14 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index c8fb5f5..690d190 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,7 +7,7 @@ beignet (1.0.2-1) UNRELEASED; urgency=medium
   [ Rebecca N. Palmer ]
   * Enable building on hurd-i386 and x32.
   * Fix FTBFS on kfreebsd-*.
-  * Drop patches applied upstream.
+  * Drop patches applied upstream, refresh others.
 
  -- Andreas Beckmann <anbe at debian.org>  Tue, 17 Mar 2015 23:29:43 +0100
 
diff --git a/debian/patches/Debian-compliant-compiler-flags-handling.patch b/debian/patches/Debian-compliant-compiler-flags-handling.patch
index 8e97324..a97b283 100644
--- a/debian/patches/Debian-compliant-compiler-flags-handling.patch
+++ b/debian/patches/Debian-compliant-compiler-flags-handling.patch
@@ -2,7 +2,6 @@ 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
@@ -13,9 +12,9 @@ Author: Simon Richter <sjr at debian.org>,Rebecca Palmer <rebecca_palmer at zoho.com>
  
 -SET(CMAKE_VERBOSE_MAKEFILE "false")
  set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/CMake/")
- if (NOT LIB_INSTALL_DIR)
-   set (LIB_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/lib")
-@@ -66,8 +65,8 @@ elseif (COMPILER STREQUAL "CLANG")
+ INCLUDE (GNUInstallDirs OPTIONAL)
+ # support old CMake without GNUInstallDirs
+@@ -79,8 +78,8 @@ elseif (COMPILER STREQUAL "CLANG")
  elseif (COMPILER STREQUAL "ICC")
    set (CMAKE_C_CXX_FLAGS "${CMAKE_C_CXX_FLAGS}  -wd2928 -Wall -fPIC -fstrict-aliasing -fp-model fast -msse4.1 -Wl,-E")
  endif ()
@@ -26,12 +25,4 @@ Author: Simon Richter <sjr at debian.org>,Rebecca Palmer <rebecca_palmer at zoho.com>
  set (CMAKE_CXX_FLAGS_DEBUG          "-O0 -g -DGBE_DEBUG=1")
  set (CMAKE_CXX_FLAGS_RELWITHDEBINFO "-O2 -g -DGBE_DEBUG=1")
  set (CMAKE_CXX_FLAGS_MINSIZEREL     "-Os -DNDEBUG -DGBE_DEBUG=0")
-@@ -88,7 +87,7 @@ ELSE (USE_STANDALONE_GBE_COMPILER STREQU
- ENDIF (USE_STANDALONE_GBE_COMPILER STREQUAL "true")
- 
- 
--set (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