Seeing this error https://errors.yoctoproject.org/Errors/Details/540475/
On Fri, Dec 18, 2020 at 12:09 AM zhengruoqin <[email protected]> wrote: > > Refresh the following patch: > 0001-Do-not-overwrite-all-our-build-flags.patch > > Signed-off-by: Zheng Ruoqin <[email protected]> > --- > ...1-Do-not-overwrite-all-our-build-flags.patch | 17 ++++++++++------- > .../{poppler_20.11.0.bb => poppler_20.12.1.bb} | 2 +- > 2 files changed, 11 insertions(+), 8 deletions(-) > rename meta-oe/recipes-support/poppler/{poppler_20.11.0.bb => > poppler_20.12.1.bb} (96%) > > 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 05e0abede..afb0b5df0 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 > @@ -15,12 +15,12 @@ Signed-off-by: Andreas Müller <[email protected]> > > --- a/cmake/modules/PopplerMacros.cmake > +++ b/cmake/modules/PopplerMacros.cmake > -@@ -123,14 +123,14 @@ if(CMAKE_COMPILER_IS_GNUCXX) > +@@ -104,14 +104,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 "-fno-exceptions -fno-check-new > -fno-common -fno-operator-names -D_DEFAULT_SOURCE") > ++ set(CMAKE_CXX_FLAGS "-fno-exceptions -fno-check-new > -fno-common -fno-operator-names -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}") > @@ -32,16 +32,16 @@ Signed-off-by: Andreas Müller <[email protected]> > 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}") > -@@ -167,7 +167,7 @@ if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL > +@@ -149,7 +149,7 @@ if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang") > 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}") > # clang does not support -fno-reorder-blocks -fno-schedule-insns, so do > not use -O2 > -@@ -175,7 +175,7 @@ if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL > +@@ -157,7 +157,7 @@ if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang") > 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}") > @@ -50,3 +50,6 @@ Signed-off-by: Andreas Müller <[email protected]> > set(CMAKE_C_FLAGS_RELWITHDEBINFO "-O2 -g ${_save_cflags}") > set(CMAKE_C_FLAGS_RELEASE "-O2 -DNDEBUG ${_save_cflags}") > # clang does not support -fno-reorder-blocks -fno-schedule-insns, so do > not use -O2 > +-- > +2.25.1 > + > diff --git a/meta-oe/recipes-support/poppler/poppler_20.11.0.bb > b/meta-oe/recipes-support/poppler/poppler_20.12.1.bb > similarity index 96% > rename from meta-oe/recipes-support/poppler/poppler_20.11.0.bb > rename to meta-oe/recipes-support/poppler/poppler_20.12.1.bb > index 729923d40..87a57523f 100644 > --- a/meta-oe/recipes-support/poppler/poppler_20.11.0.bb > +++ b/meta-oe/recipes-support/poppler/poppler_20.12.1.bb > @@ -7,7 +7,7 @@ SRC_URI = "http://poppler.freedesktop.org/${BP}.tar.xz \ > file://0001-Do-not-overwrite-all-our-build-flags.patch \ > file://basename-include.patch \ > " > -SRC_URI[sha256sum] = > "021557074516492375c2bb4226a413aad431159e9177f9f14dff4159d2723b14" > +SRC_URI[sha256sum] = > "d0aa2586c0a4296c775f0d2045f28bb95a694113fc995f95350faa12930f7b35" > > DEPENDS = "fontconfig zlib cairo lcms glib-2.0" > > -- > 2.25.1 > > > > > >
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#88518): https://lists.openembedded.org/g/openembedded-devel/message/88518 Mute This Topic: https://lists.openembedded.org/mt/79057212/21656 Group Owner: [email protected] Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
