diff options
| author |   Andreas Müller <schnitzeltony@gmail.com> | 2018-04-04 01:16:00 +0200 |
|---|---|---|
| committer |   Armin Kuster <akuster808@gmail.com> | 2018-04-13 12:41:06 -0700 |
| commit | e4082460b28db92650c51f5720373c8f58f62acd (patch) | |
| tree | c91685f4eb61b020408e22493ef0d8a28651d98a /meta-oe/recipes-support | |
| parent | 1d663545cb921a4bd0c92c7dcc722886a67e8154 (diff) | |
| download | meta-openembedded-contrib-e4082460b28db92650c51f5720373c8f58f62acd.tar.gz | |
poppler: Rework patch fixing do_configure
Turn the patch from a workaround into a proper fix. It was submitted to poppler
bugzilla - but after endless discussions I won't follow this further.
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
Signed-off-by: Armin Kuster <akuster808@gmail.com>
Diffstat (limited to 'meta-oe/recipes-support')
| -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 5b66a8a9c6..18f508519e 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] Signed-off-by: Andreas Müller <schnitzeltony@gmail.com> --- - cmake/modules/PopplerMacros.cmake | 2 ++ - 1 file changed, 2 insertions(+) + cmake/modules/PopplerMacros.cmake | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cmake/modules/PopplerMacros.cmake b/cmake/modules/PopplerMacros.cmake -index ccb2790..f29481e 100644 +index ccb2790..0f392cb 100644 --- a/cmake/modules/PopplerMacros.cmake +++ b/cmake/modules/PopplerMacros.cmake -@@ -98,6 +98,7 @@ if(NOT CMAKE_BUILD_TYPE AND NOT CMAKE_CONFIGURATION_TYPES) - set(CMAKE_BUILD_TYPE RelWithDebInfo) - endif(NOT CMAKE_BUILD_TYPE AND NOT CMAKE_CONFIGURATION_TYPES) - -+if(false) - if(CMAKE_COMPILER_IS_GNUCXX) - # set the default compile warnings - set(_warn "-Wall -Wextra -Wpedantic") -@@ -159,4 +160,5 @@ if(CMAKE_C_COMPILER MATCHES "icc") - set(CMAKE_C_FLAGS_DEBUG "-O2 -g -Ob0 -noalign ${_save_cflags}") - set(CMAKE_C_FLAGS_DEBUGFULL "-g -Ob0 -noalign ${_save_cflags}") - endif(CMAKE_C_COMPILER MATCHES "icc") -+endif(false) +@@ -125,14 +125,14 @@ if(CMAKE_COMPILER_IS_GNUCXX) + set(DEFAULT_COMPILE_WARNINGS_EXTRA "${_warn} ${_warnx}") + set(_save_cxxflags "${CMAKE_CXX_FLAGS}") +- set(CMAKE_CXX_FLAGS "-fno-exceptions -fno-check-new -fno-common -D_DEFAULT_SOURCE") ++ set(CMAKE_CXX_FLAGS "-fno-exceptions -fno-check-new -fno-common -D_DEFAULT_SOURCE ${_save_cxxflags}") + set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-O2 -g ${_save_cxxflags}") + set(CMAKE_CXX_FLAGS_RELEASE "-O2 -DNDEBUG ${_save_cxxflags}") + set(CMAKE_CXX_FLAGS_DEBUG "-g -O2 -fno-reorder-blocks -fno-schedule-insns -fno-inline ${_save_cxxflags}") + set(CMAKE_CXX_FLAGS_DEBUGFULL "-g3 -fno-inline ${_save_cxxflags}") + set(CMAKE_CXX_FLAGS_PROFILE "-g3 -fno-inline -ftest-coverage -fprofile-arcs ${_save_cxxflags}") + set(_save_cflags "${CMAKE_C_FLAGS}") +- set(CMAKE_C_FLAGS "-std=c99 -D_DEFAULT_SOURCE") ++ set(CMAKE_C_FLAGS "-std=c99 -D_DEFAULT_SOURCE ${_save_cflags}") + set(CMAKE_C_FLAGS_RELWITHDEBINFO "-O2 -g ${_save_cflags}") + set(CMAKE_C_FLAGS_RELEASE "-O2 -DNDEBUG ${_save_cflags}") + set(CMAKE_C_FLAGS_DEBUG "-g -O2 -fno-reorder-blocks -fno-schedule-insns -fno-inline ${_save_cflags}") -- 2.14.3 - |