package/domoticz: fix build with RELRO
PATCH v2 1/1 package/domoticz: fix build with RELRO
Fixes:
- http://autobuild.buildroot.org/results/5c1ca3083ad672401d1e050c6c3a07b8c33b851d
---
Changes v1 -> v2:
- Retrieve upstream patch that adds -c as suggested by Arnout during review of v1
...dd-c-argument-to-build-precompiled-h.patch | 34 +++++++++++++++++++ 1 file changed, 34 insertions(+) create mode 100644 package/domoticz/0003-CMakeLists.txt-add-c-argument-to-build-precompiled-h.patch
package/domoticz/0003-CMakeLists.txt-add-c-argument-to-build-precompiled-h.patch new file +34 -0
@@ -0,0 +1,34 @@ +From 17107b876fb308e3ef3e759ab90f3d8e4755cdc4 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine <[email protected]> +Date: Fri, 8 Nov 2019 14:17:58 +0100 +Subject: [PATCH] CMakeLists.txt: add -c argument to build precompiled headers + +Add "-c" argument when building precompiler headers as suggested +by Arnout in https://patchwork.ozlabs.org/patch/1187328. + +This will fix the build with RELRO + +Signed-off-by: Fabrice Fontaine <[email protected]> +[Retrieved from: +https://github.com/domoticz/domoticz/commit/17107b876fb308e3ef3e759ab90f3d8e4755cdc4] +--- + CMakeLists.txt | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 32a0dd2a8c..010cdf2db8 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -277,10 +277,10 @@ MACRO(ADD_PRECOMPILED_HEADER _targetName _input) + ENDFOREACH(item) + + SEPARATE_ARGUMENTS(_compiler_FLAGS) +- MESSAGE("${CMAKE_CXX_COMPILER} ${CMAKE_CXX_COMPILER_ARG1} ${_compiler_FLAGS} -x c++-header -o ${_output} ${_source}") ++ MESSAGE("${CMAKE_CXX_COMPILER} ${CMAKE_CXX_COMPILER_ARG1} ${_compiler_FLAGS} -x c++-header -c -o ${_output} ${_source}") + ADD_CUSTOM_COMMAND( + OUTPUT ${_output} +- COMMAND ${CMAKE_CXX_COMPILER} ${CMAKE_CXX_COMPILER_ARG1} ${_compiler_FLAGS} -x c++-header -o ${_output} ${_source} ++ COMMAND ${CMAKE_CXX_COMPILER} ${CMAKE_CXX_COMPILER_ARG1} ${_compiler_FLAGS} -x c++-header -c -o ${_output} ${_source} + DEPENDS ${_source} ) + ADD_CUSTOM_TARGET(${_targetName}_gch DEPENDS ${_output}) + ADD_DEPENDENCIES(${_targetName} ${_targetName}_gch)
Signature · 1 line
2.23.0
PATCH v2 1/1 package/domoticz: fix build with RELRO
Quoted 8 lines · On Fri, 8 Nov 2019 18:04:45 +0100 Fabrice Fontaine…
Fixes:
- http://autobuild.buildroot.org/results/5c1ca3083ad672401d1e050c6c3a07b8c33b851dSigned-off-by Fabrice Fontaine <[email protected]>---
Changes v1 -> v2:
- Retrieve upstream patch that adds -c as suggested by Arnout during review of v1
Thanks for the additional work, this seems like a much better solution!
Thomas
Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com
PATCH v2 1/1 package/domoticz: fix build with RELRO
In reply to Fabrice FontaineQuoted 10 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"Fabrice" == Fabrice Fontaine <[email protected]> writes:
Fixes:
- http://autobuild.buildroot.org/results/5c1ca3083ad672401d1e050c6c3a07b8c33b851dSigned-off-by Fabrice Fontaine <[email protected]>---
Changes v1 -> v2:
- Retrieve upstream patch that adds -c as suggested by Arnout during review of v1
Committed to 2019.02.x and 2019.08.x, thanks.
Signature · 1 line
Bye, Peter Korsgaard