diff options
-rw-r--r-- | meta-oe/recipes-support/poppler/poppler/0001-Do-not-overwrite-all-our-build-flags.patch | 36 |
1 files changed, 19 insertions, 17 deletions
diff --git a/meta-oe/recipes-support/poppler/poppler/0001-Do-not-overwrite-all-our-build-flags.patch b/meta-oe/recipes-support/poppler/poppler/0001-Do-not-overwrite-all-our-build-flags.patch index 5b66a8a9c..18f508519 100644 --- a/meta-oe/recipes-support/poppler/poppler/0001-Do-not-overwrite-all-our-build-flags.patch +++ b/meta-oe/recipes-support/poppler/poppler/0001-Do-not-overwrite-all-our-build-flags.patch | |||
@@ -10,27 +10,29 @@ Upstream-Status: Inappropriate [embedded specific] | |||
10 | 10 | ||
11 | Signed-off-by: Andreas Müller <schnitzeltony@gmail.com> | 11 | Signed-off-by: Andreas Müller <schnitzeltony@gmail.com> |
12 | --- | 12 | --- |
13 | cmake/modules/PopplerMacros.cmake | 2 ++ | 13 | cmake/modules/PopplerMacros.cmake | 4 ++-- |
14 | 1 file changed, 2 insertions(+) | 14 | 1 file changed, 2 insertions(+), 2 deletions(-) |
15 | 15 | ||
16 | diff --git a/cmake/modules/PopplerMacros.cmake b/cmake/modules/PopplerMacros.cmake | 16 | diff --git a/cmake/modules/PopplerMacros.cmake b/cmake/modules/PopplerMacros.cmake |
17 | index ccb2790..f29481e 100644 | 17 | index ccb2790..0f392cb 100644 |
18 | --- a/cmake/modules/PopplerMacros.cmake | 18 | --- a/cmake/modules/PopplerMacros.cmake |
19 | +++ b/cmake/modules/PopplerMacros.cmake | 19 | +++ b/cmake/modules/PopplerMacros.cmake |
20 | @@ -98,6 +98,7 @@ if(NOT CMAKE_BUILD_TYPE AND NOT CMAKE_CONFIGURATION_TYPES) | 20 | @@ -125,14 +125,14 @@ if(CMAKE_COMPILER_IS_GNUCXX) |
21 | set(CMAKE_BUILD_TYPE RelWithDebInfo) | 21 | set(DEFAULT_COMPILE_WARNINGS_EXTRA "${_warn} ${_warnx}") |
22 | endif(NOT CMAKE_BUILD_TYPE AND NOT CMAKE_CONFIGURATION_TYPES) | ||
23 | |||
24 | +if(false) | ||
25 | if(CMAKE_COMPILER_IS_GNUCXX) | ||
26 | # set the default compile warnings | ||
27 | set(_warn "-Wall -Wextra -Wpedantic") | ||
28 | @@ -159,4 +160,5 @@ if(CMAKE_C_COMPILER MATCHES "icc") | ||
29 | set(CMAKE_C_FLAGS_DEBUG "-O2 -g -Ob0 -noalign ${_save_cflags}") | ||
30 | set(CMAKE_C_FLAGS_DEBUGFULL "-g -Ob0 -noalign ${_save_cflags}") | ||
31 | endif(CMAKE_C_COMPILER MATCHES "icc") | ||
32 | +endif(false) | ||
33 | 22 | ||
23 | set(_save_cxxflags "${CMAKE_CXX_FLAGS}") | ||
24 | - set(CMAKE_CXX_FLAGS "-fno-exceptions -fno-check-new -fno-common -D_DEFAULT_SOURCE") | ||
25 | + set(CMAKE_CXX_FLAGS "-fno-exceptions -fno-check-new -fno-common -D_DEFAULT_SOURCE ${_save_cxxflags}") | ||
26 | set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-O2 -g ${_save_cxxflags}") | ||
27 | set(CMAKE_CXX_FLAGS_RELEASE "-O2 -DNDEBUG ${_save_cxxflags}") | ||
28 | set(CMAKE_CXX_FLAGS_DEBUG "-g -O2 -fno-reorder-blocks -fno-schedule-insns -fno-inline ${_save_cxxflags}") | ||
29 | set(CMAKE_CXX_FLAGS_DEBUGFULL "-g3 -fno-inline ${_save_cxxflags}") | ||
30 | set(CMAKE_CXX_FLAGS_PROFILE "-g3 -fno-inline -ftest-coverage -fprofile-arcs ${_save_cxxflags}") | ||
31 | set(_save_cflags "${CMAKE_C_FLAGS}") | ||
32 | - set(CMAKE_C_FLAGS "-std=c99 -D_DEFAULT_SOURCE") | ||
33 | + set(CMAKE_C_FLAGS "-std=c99 -D_DEFAULT_SOURCE ${_save_cflags}") | ||
34 | set(CMAKE_C_FLAGS_RELWITHDEBINFO "-O2 -g ${_save_cflags}") | ||
35 | set(CMAKE_C_FLAGS_RELEASE "-O2 -DNDEBUG ${_save_cflags}") | ||
36 | set(CMAKE_C_FLAGS_DEBUG "-g -O2 -fno-reorder-blocks -fno-schedule-insns -fno-inline ${_save_cflags}") | ||
34 | -- | 37 | -- |
35 | 2.14.3 | 38 | 2.14.3 |
36 | |||