drop redundant pie flags to make blhc happy

Forwarded: not-needed

pie is enabled by default on Debian

Gbp-Pq: Name blhc.patch

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 7fff118025eec7d982aecdff7eaebc76a8eeaf0b..65e79e5841e3d7c70cfbdeda32740aa51e5be8f0 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -83,9 +83,9 @@ set(VERSION_STRING ${MAJOR_VERSION}.${MINOR_VERSION}${VERSION_SUFFIX})
 set(POCL_VERSION_BASE ${VERSION_STRING})
 
 # required b/c SHARED libs defaults to ON while OBJECT defaults to OFF
-set(CMAKE_POSITION_INDEPENDENT_CODE ON)
+#set(CMAKE_POSITION_INDEPENDENT_CODE ON)
 # CMake doesn't add "-pie" by default for executables (CMake issue #14983)
-set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -pie")
+#set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -pie")
 
 enable_testing()
 

diff --git a/cmake/Hardening.cmake b/cmake/Hardening.cmake
index a4e0e71578692e79e589df60e4c185cd9894c504..df00f1c3b6215f6ae18cf385ec34caaf365d0541 100644 (file)
--- a/cmake/Hardening.cmake
+++ b/cmake/Hardening.cmake
@@ -53,13 +53,13 @@ function(processFlagsList target property cache)
 endfunction(processFlagsList)
 
 function(setupPIC target)
-       set_property(TARGET ${target} PROPERTY POSITION_INDEPENDENT_CODE ON) # bad, doesn't work
+       #set_property(TARGET ${target} PROPERTY POSITION_INDEPENDENT_CODE ON) # bad, doesn't work
        if(CMAKE_CXX_COMPILER_ID MATCHES "GNU|Clang")
                get_target_property(type ${target} TYPE)
                if(type STREQUAL "EXECUTABLE")
-                       list(APPEND HARDENING_PIC_COMPILE_FLAGS
-                               "-fPIE"
-                       )
+                       #list(APPEND HARDENING_PIC_COMPILE_FLAGS
+                       #       "-fPIE"
+                       #)
                else()
                        list(APPEND HARDENING_PIC_COMPILE_FLAGS
                                "-fPIC"
@@ -67,9 +67,9 @@ function(setupPIC target)
                endif()
                if(type STREQUAL "EXECUTABLE")
                        # https://mropert.github.io/2018/02/02/pic_pie_sanitizers/
-                       list(APPEND HARDENING_PIC_LINKER_FLAGS
-                               "-Wl,-pie"
-                       )
+                       #list(APPEND HARDENING_PIC_LINKER_FLAGS
+                       #       "-Wl,-pie"
+                       #)
                        if(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
                                message(STATUS "Working around Clang bug https://bugs.llvm.org/show_bug.cgi?id=44594 ...")
                                list(APPEND HARDENING_PIC_LINKER_FLAGS