[beignet] 01/06: Update 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 82231dbaf65c9b34e7618b8f5d6702ab7017fcaf
Author: Rebecca N. Palmer <rebecca_palmer at zoho.com>
Date:   Mon Nov 17 16:11:19 2014 +0000

    Update Debian-compliant-compiler-flags-handling.patch
    
    Upstream moved the CFLAGS,etc-ignoring code
    from backend/CMakeLists.txt to CMakeLists.txt
    
    The rest of the patch is no longer needed as debhelper's build type
    is now None (#701233)
---
 .../Debian-compliant-compiler-flags-handling.patch | 30 ++++++++++++++++------
 1 file changed, 22 insertions(+), 8 deletions(-)

diff --git a/debian/patches/Debian-compliant-compiler-flags-handling.patch b/debian/patches/Debian-compliant-compiler-flags-handling.patch
index a9762a0..5994325 100644
--- a/debian/patches/Debian-compliant-compiler-flags-handling.patch
+++ b/debian/patches/Debian-compliant-compiler-flags-handling.patch
@@ -1,12 +1,6 @@
-From: Simon Richter <sjr at debian.org>
-Date: Fri, 29 Aug 2014 16:17:45 +0200
-Subject: Debian compliant compiler flags handling
-
----
- CMakeLists.txt         |  1 -
- backend/CMakeLists.txt | 46 +++++++++++++++++++++++-----------------------
- 2 files changed, 23 insertions(+), 24 deletions(-)
+Description: Respect CFLAGS,etc and be verbose
 
+Author: Simon Richter <sjr at debian.org>,Rebecca Palmer <rebecca_palmer at zoho.com>
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
 @@ -30,7 +30,6 @@ INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINA
@@ -17,3 +11,23 @@ Subject: Debian compliant compiler flags handling
  set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/CMake/")
  if (NOT LIB_INSTALL_DIR)
    set (LIB_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/lib")
+@@ -81,8 +80,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 ()
+-set (CMAKE_CXX_FLAGS "${CMAKE_C_CXX_FLAGS} -std=c++0x -Wno-invalid-offsetof -fno-rtti")
+-set (CMAKE_C_FLAGS "${CMAKE_C_CXX_FLAGS}")
++set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${CMAKE_C_CXX_FLAGS} -std=c++0x -Wno-invalid-offsetof -fno-rtti")
++set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${CMAKE_C_CXX_FLAGS}")
+ 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")
+@@ -96,7 +95,7 @@ set (CMAKE_C_FLAGS_RELEASE        "-O2 -
+ #INCLUDE(CMake/FindLLVM.cmake)
+ Find_Package(LLVM 3.3)
+ 
+-set (CMAKE_SHARED_LINKER_FLAGS "-Wl,--no-undefined ${LLVM_LDFLAGS}")
++set (CMAKE_SHARED_LINKER_FLAGS ${CMAKE_SHARED_LINKER_FLAGS} "-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