Control: fixed -1 beignet/0.9.3~really.0.8+dfsg-1 Control: found -1 beignet/1.0.0-1 Control: tags -1 patch
Adding RTLD_DEEPBIND in ocl-icd doesn't help, but building beignet with -Bsymbolic (attached, replaces the existing patch with the same name) does: beignet and pocl then continue to work when mesa-opencl-icd is installed.
Can someone with suitable hardware test what happens when mesa-opencl-icd is used?
(Prior to this, beignet was using -Bsymbolic for libcl.so, but not libgbe.so/libgbeinterp.so. pocl and libgl1-mesa-dri use -Bsymbolic, but mesa-opencl-icd doesn't.)
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 <s...@debian.org>,Rebecca Palmer <rebecca_pal...@zoho.com> --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -30,7 +30,6 @@ INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINA INCLUDE (FindPkgConfig) -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") @@ -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,-Bsymbolic -Wl,--no-undefined ${LLVM_LDFLAGS}") # XLib Find_Package(X11)