0001-Do-not-overwrite-all-our-build-flags.patch 3.1 KB

12345678910111213141516171819202122232425262728293031323334353637383940414243444546474849505152535455
  1. From b6fc6c36d359a50503138cd87d7147faf6dff893 Mon Sep 17 00:00:00 2001
  2. From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
  3. Date: Sat, 17 Mar 2018 20:52:10 +0100
  4. Subject: [PATCH] Do not overwrite all our build flags
  5. MIME-Version: 1.0
  6. Content-Type: text/plain; charset=UTF-8
  7. Content-Transfer-Encoding: 8bit
  8. Upstream-Status: Inappropriate [embedded specific]
  9. Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
  10. ---
  11. cmake/modules/PopplerMacros.cmake | 4 ++--
  12. 1 file changed, 2 insertions(+), 2 deletions(-)
  13. --- a/cmake/modules/PopplerMacros.cmake
  14. +++ b/cmake/modules/PopplerMacros.cmake
  15. @@ -104,14 +104,14 @@ if(CMAKE_COMPILER_IS_GNUCXX)
  16. set(DEFAULT_COMPILE_WARNINGS_EXTRA "${_warn} ${_warnx}")
  17. set(_save_cxxflags "${CMAKE_CXX_FLAGS}")
  18. - set(CMAKE_CXX_FLAGS "-fno-exceptions -fno-check-new -fno-common -fno-operator-names -D_DEFAULT_SOURCE")
  19. + set(CMAKE_CXX_FLAGS "-fno-exceptions -fno-check-new -fno-common -fno-operator-names -D_DEFAULT_SOURCE ${_save_cxxflags}")
  20. set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-O2 -g ${_save_cxxflags}")
  21. set(CMAKE_CXX_FLAGS_RELEASE "-O2 -DNDEBUG ${_save_cxxflags}")
  22. set(CMAKE_CXX_FLAGS_DEBUG "-g -O2 -fno-reorder-blocks -fno-schedule-insns -fno-inline ${_save_cxxflags}")
  23. set(CMAKE_CXX_FLAGS_DEBUGFULL "-g3 -fno-inline ${_save_cxxflags}")
  24. set(CMAKE_CXX_FLAGS_PROFILE "-g3 -fno-inline -ftest-coverage -fprofile-arcs ${_save_cxxflags}")
  25. set(_save_cflags "${CMAKE_C_FLAGS}")
  26. - set(CMAKE_C_FLAGS "-std=c99 -D_DEFAULT_SOURCE")
  27. + set(CMAKE_C_FLAGS "-std=c99 -D_DEFAULT_SOURCE ${_save_cflags}")
  28. set(CMAKE_C_FLAGS_RELWITHDEBINFO "-O2 -g ${_save_cflags}")
  29. set(CMAKE_C_FLAGS_RELEASE "-O2 -DNDEBUG ${_save_cflags}")
  30. set(CMAKE_C_FLAGS_DEBUG "-g -O2 -fno-reorder-blocks -fno-schedule-insns -fno-inline ${_save_cflags}")
  31. @@ -149,7 +149,7 @@ if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
  32. set(DEFAULT_COMPILE_WARNINGS_EXTRA "${_warn} ${_warnx}")
  33. set(_save_cxxflags "${CMAKE_CXX_FLAGS}")
  34. - set(CMAKE_CXX_FLAGS "-fno-exceptions -fno-check-new -fno-common -D_DEFAULT_SOURCE")
  35. + set(CMAKE_CXX_FLAGS "-fno-exceptions -fno-check-new -fno-common -D_DEFAULT_SOURCE ${_save_cxxflags}")
  36. set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-O2 -g ${_save_cxxflags}")
  37. set(CMAKE_CXX_FLAGS_RELEASE "-O2 -DNDEBUG ${_save_cxxflags}")
  38. # clang does not support -fno-reorder-blocks -fno-schedule-insns, so do not use -O2
  39. @@ -157,7 +157,7 @@ if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
  40. set(CMAKE_CXX_FLAGS_DEBUGFULL "-g3 -fno-inline ${_save_cxxflags}")
  41. set(CMAKE_CXX_FLAGS_PROFILE "-g3 -fno-inline -ftest-coverage -fprofile-arcs ${_save_cxxflags}")
  42. set(_save_cflags "${CMAKE_C_FLAGS}")
  43. - set(CMAKE_C_FLAGS "-std=c99 -D_DEFAULT_SOURCE")
  44. + set(CMAKE_C_FLAGS "-std=c99 -D_DEFAULT_SOURCE ${_save_cflags}")
  45. set(CMAKE_C_FLAGS_RELWITHDEBINFO "-O2 -g ${_save_cflags}")
  46. set(CMAKE_C_FLAGS_RELEASE "-O2 -DNDEBUG ${_save_cflags}")
  47. # clang does not support -fno-reorder-blocks -fno-schedule-insns, so do not use -O2
  48. --
  49. 2.25.1