0001-Don-t-force-fstack-protector.patch 2.5 KB

12345678910111213141516171819202122232425262728293031323334353637383940414243444546474849505152
  1. From 28ca7393c08cb54b87d11c1ca92821e48f54781b Mon Sep 17 00:00:00 2001
  2. From: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
  3. Date: Mon, 15 Apr 2019 23:09:33 +0200
  4. Subject: [PATCH] Don't force -fstack-protector
  5. This allows the environment to decide whether SSP should be used or
  6. not, for example to support toolchains that don't have SSP support.
  7. Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
  8. ---
  9. api/mfx_dispatch/linux/CMakeLists.txt | 2 +-
  10. builder/FindPackages.cmake | 4 ++--
  11. 2 files changed, 3 insertions(+), 3 deletions(-)
  12. diff --git a/api/mfx_dispatch/linux/CMakeLists.txt b/api/mfx_dispatch/linux/CMakeLists.txt
  13. index 15a4bd9a..4415f840 100644
  14. --- a/api/mfx_dispatch/linux/CMakeLists.txt
  15. +++ b/api/mfx_dispatch/linux/CMakeLists.txt
  16. @@ -100,7 +100,7 @@ target_link_libraries(mfx dl)
  17. get_api_version(MFX_VERSION_MAJOR MFX_VERSION_MINOR)
  18. set_target_properties( mfx PROPERTIES LINK_FLAGS
  19. - "-Wl,--no-undefined,-z,relro,-z,now,-z,noexecstack -Wl,--version-script=${CMAKE_CURRENT_SOURCE_DIR}/libmfx.map -fstack-protector")
  20. + "-Wl,--no-undefined,-z,relro,-z,now,-z,noexecstack -Wl,--version-script=${CMAKE_CURRENT_SOURCE_DIR}/libmfx.map")
  21. set_target_properties( mfx PROPERTIES LIBRARY_OUTPUT_DIRECTORY ${CMAKE_LIB_DIR}/${CMAKE_BUILD_TYPE} FOLDER mfx )
  22. set_target_properties( mfx PROPERTIES VERSION ${MFX_VERSION_MAJOR}.${MFX_VERSION_MINOR})
  23. set_target_properties( mfx PROPERTIES SOVERSION ${MFX_VERSION_MAJOR})
  24. diff --git a/builder/FindPackages.cmake b/builder/FindPackages.cmake
  25. index 7e36ae2d..5b8b9b9d 100644
  26. --- a/builder/FindPackages.cmake
  27. +++ b/builder/FindPackages.cmake
  28. @@ -83,7 +83,7 @@ function( configure_build_variant_linux target variant )
  29. return() # should not occur; just in case
  30. endif()
  31. set( link_flags_list "-Wl,--no-undefined,-z,relro,-z,now,-z,noexecstack -Wl,--no-as-needed -ldl")
  32. - append_property( ${ARGV0} LINK_FLAGS "${link_flags_list} ${MFX_LDFLAGS} -fstack-protector" )
  33. + append_property( ${ARGV0} LINK_FLAGS "${link_flags_list} ${MFX_LDFLAGS}" )
  34. # message( STATUS "Libva located at: ${PKG_LIBVA_LIBRARY_DIRS}" )
  35. if( ARGV1 MATCHES hw AND Linux )
  36. @@ -448,7 +448,7 @@ function(configure_dependencies target dependencies variant)
  37. endforeach()
  38. set(SCOPE_CFLAGS ${SCOPE_CFLAGS} PARENT_SCOPE)
  39. - set(SCOPE_LINKFLAGS "${SCOPE_LINKFLAGS} -Wl,--no-undefined,-z,relro,-z,now,-z,noexecstack -fstack-protector" PARENT_SCOPE)
  40. + set(SCOPE_LINKFLAGS "${SCOPE_LINKFLAGS} -Wl,--no-undefined,-z,relro,-z,now,-z,noexecstack" PARENT_SCOPE)
  41. set(SCOPE_LIBS ${SCOPE_LIBS} PARENT_SCOPE)
  42. endfunction()
  43. --
  44. 2.20.1