diff options
| author | Khem Raj <raj.khem@gmail.com> | 2019-11-16 10:41:02 -0800 |
|---|---|---|
| committer | Khem Raj <raj.khem@gmail.com> | 2019-11-17 12:34:21 -0800 |
| commit | a1c37384e45c5db30d59b07d8f1fa72877a594cf (patch) | |
| tree | f7c6fd4956afd792f2da5225a19b6e1364447b2d | |
| parent | 35dddf62f59fb87a9a888f7e3ff7493f94375830 (diff) | |
| download | meta-openembedded-a1c37384e45c5db30d59b07d8f1fa72877a594cf.tar.gz | |
poppler: Extend the c/c++ flags fix to cover clang
Signed-off-by: Khem Raj <raj.khem@gmail.com>
| -rw-r--r-- | meta-oe/recipes-support/poppler/poppler/0001-Do-not-overwrite-all-our-build-flags.patch | 24 |
1 files changed, 19 insertions, 5 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 18f508519e..05e0abede6 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 | |||
| @@ -13,11 +13,9 @@ Signed-off-by: Andreas Müller <schnitzeltony@gmail.com> | |||
| 13 | cmake/modules/PopplerMacros.cmake | 4 ++-- | 13 | cmake/modules/PopplerMacros.cmake | 4 ++-- |
| 14 | 1 file changed, 2 insertions(+), 2 deletions(-) | 14 | 1 file changed, 2 insertions(+), 2 deletions(-) |
| 15 | 15 | ||
| 16 | diff --git a/cmake/modules/PopplerMacros.cmake b/cmake/modules/PopplerMacros.cmake | ||
| 17 | index ccb2790..0f392cb 100644 | ||
| 18 | --- a/cmake/modules/PopplerMacros.cmake | 16 | --- a/cmake/modules/PopplerMacros.cmake |
| 19 | +++ b/cmake/modules/PopplerMacros.cmake | 17 | +++ b/cmake/modules/PopplerMacros.cmake |
| 20 | @@ -125,14 +125,14 @@ if(CMAKE_COMPILER_IS_GNUCXX) | 18 | @@ -123,14 +123,14 @@ if(CMAKE_COMPILER_IS_GNUCXX) |
| 21 | set(DEFAULT_COMPILE_WARNINGS_EXTRA "${_warn} ${_warnx}") | 19 | set(DEFAULT_COMPILE_WARNINGS_EXTRA "${_warn} ${_warnx}") |
| 22 | 20 | ||
| 23 | set(_save_cxxflags "${CMAKE_CXX_FLAGS}") | 21 | set(_save_cxxflags "${CMAKE_CXX_FLAGS}") |
| @@ -34,5 +32,21 @@ index ccb2790..0f392cb 100644 | |||
| 34 | set(CMAKE_C_FLAGS_RELWITHDEBINFO "-O2 -g ${_save_cflags}") | 32 | set(CMAKE_C_FLAGS_RELWITHDEBINFO "-O2 -g ${_save_cflags}") |
| 35 | set(CMAKE_C_FLAGS_RELEASE "-O2 -DNDEBUG ${_save_cflags}") | 33 | 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 | set(CMAKE_C_FLAGS_DEBUG "-g -O2 -fno-reorder-blocks -fno-schedule-insns -fno-inline ${_save_cflags}") |
| 37 | -- | 35 | @@ -167,7 +167,7 @@ if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL |
| 38 | 2.14.3 | 36 | set(DEFAULT_COMPILE_WARNINGS_EXTRA "${_warn} ${_warnx}") |
| 37 | |||
| 38 | set(_save_cxxflags "${CMAKE_CXX_FLAGS}") | ||
| 39 | - set(CMAKE_CXX_FLAGS "-fno-exceptions -fno-check-new -fno-common -D_DEFAULT_SOURCE") | ||
| 40 | + set(CMAKE_CXX_FLAGS "-fno-exceptions -fno-check-new -fno-common -D_DEFAULT_SOURCE ${_save_cxxflags}") | ||
| 41 | set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-O2 -g ${_save_cxxflags}") | ||
| 42 | set(CMAKE_CXX_FLAGS_RELEASE "-O2 -DNDEBUG ${_save_cxxflags}") | ||
| 43 | # clang does not support -fno-reorder-blocks -fno-schedule-insns, so do not use -O2 | ||
| 44 | @@ -175,7 +175,7 @@ if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL | ||
| 45 | set(CMAKE_CXX_FLAGS_DEBUGFULL "-g3 -fno-inline ${_save_cxxflags}") | ||
| 46 | set(CMAKE_CXX_FLAGS_PROFILE "-g3 -fno-inline -ftest-coverage -fprofile-arcs ${_save_cxxflags}") | ||
| 47 | set(_save_cflags "${CMAKE_C_FLAGS}") | ||
| 48 | - set(CMAKE_C_FLAGS "-std=c99 -D_DEFAULT_SOURCE") | ||
| 49 | + set(CMAKE_C_FLAGS "-std=c99 -D_DEFAULT_SOURCE ${_save_cflags}") | ||
| 50 | set(CMAKE_C_FLAGS_RELWITHDEBINFO "-O2 -g ${_save_cflags}") | ||
| 51 | set(CMAKE_C_FLAGS_RELEASE "-O2 -DNDEBUG ${_save_cflags}") | ||
| 52 | # clang does not support -fno-reorder-blocks -fno-schedule-insns, so do not use -O2 | ||