From cf343333041bf833aeb94dfdfb515e509004c849 Mon Sep 17 00:00:00 2001 From: Hongxu Jia Date: Wed, 22 Oct 2025 11:18:16 +0800 Subject: [PATCH] poppler: fix racing build issue There is a racing issue in world build while multilib enabled: ...log.do_install... CMake Error at utils/po/ca/cmake_install.cmake:46 (file): file INSTALL cannot find "TOPDIR/tmp/work/core2-32-wrs-linux/poppler/25.08.0/build/utils/po/ca/pdfsig.gmo": No such file or directory. Call Stack (most recent call first): utils/po/cmake_install.cmake:47 (include) utils/cmake_install.cmake:243 (include) cmake_install.cmake:229 (include) ...log.do_install... The issue has reported to upstream [1][2] and upstream tried to fix it [3], but the issue still existed. The catalan translation of pdfsig is not vital for poppler. So revert upstream commit "pdfsig: Catalan translation" to workaround [1] https://gitlab.freedesktop.org/poppler/poppler/-/issues/1550 [1] https://gitlab.freedesktop.org/poppler/poppler/-/issues/1551 [2] https://gitlab.freedesktop.org/poppler/poppler/-/commit/053acd5d2b310c696993dc97072d1f2b3b1dd7ac Signed-off-by: Hongxu Jia Signed-off-by: Khem Raj --- .../0001-workaround-build-racing.patch | 43 +++++++++++++++++++ .../poppler/poppler_25.10.0.bb | 1 + 2 files changed, 44 insertions(+) create mode 100644 meta-oe/recipes-support/poppler/poppler/0001-workaround-build-racing.patch diff --git a/meta-oe/recipes-support/poppler/poppler/0001-workaround-build-racing.patch b/meta-oe/recipes-support/poppler/poppler/0001-workaround-build-racing.patch new file mode 100644 index 0000000000..fdf4f7ff70 --- /dev/null +++ b/meta-oe/recipes-support/poppler/poppler/0001-workaround-build-racing.patch @@ -0,0 +1,43 @@ +From 83ad73024c69d41fda302f39acf50c381684890e Mon Sep 17 00:00:00 2001 +From: Hongxu Jia +Date: Tue, 21 Oct 2025 02:39:36 -0700 +Subject: [PATCH] workaround build racing + +There is a racing issue in world build while multilib enabled: + +...log.do_install... +CMake Error at utils/po/ca/cmake_install.cmake:46 (file): + file INSTALL cannot find + "TOPDIR/tmp/work/core2-32-wrs-linux/poppler/25.08.0/build/utils/po/ca/pdfsig.gmo": + No such file or directory. +Call Stack (most recent call first): + utils/po/cmake_install.cmake:47 (include) + utils/cmake_install.cmake:243 (include) + cmake_install.cmake:229 (include) +...log.do_install... + +Revert "pdfsig: Catalan translation" to workaround + +This reverts commit 99f5416d9bfb6a34bbc5cbcb368e258b98fd3f08. + +Upstream-Status: Inappropriate [Yocto specific] + +Signed-off-by: Hongxu Jia +--- + utils/po/ca/CMakeLists.txt | 4 ---- + 1 file changed, 4 deletions(-) + delete mode 100644 utils/po/ca/CMakeLists.txt + +diff --git a/utils/po/ca/CMakeLists.txt b/utils/po/ca/CMakeLists.txt +deleted file mode 100644 +index 3225131c..00000000 +--- a/utils/po/ca/CMakeLists.txt ++++ /dev/null +@@ -1,4 +0,0 @@ +-get_filename_component(_lang ${CMAKE_CURRENT_SOURCE_DIR} NAME) +-gettext_process_po_files(${_lang} ALL INSTALL_DESTINATION ${CMAKE_INSTALL_LOCALEDIR} PO_FILES +- pdfsig.po +-) +-- +2.49.0 + diff --git a/meta-oe/recipes-support/poppler/poppler_25.10.0.bb b/meta-oe/recipes-support/poppler/poppler_25.10.0.bb index 29a5f33e81..cce5e5f7ae 100644 --- a/meta-oe/recipes-support/poppler/poppler_25.10.0.bb +++ b/meta-oe/recipes-support/poppler/poppler_25.10.0.bb @@ -7,6 +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 \ file://0001-cmake-Do-not-use-isystem.patch \ + file://0001-workaround-build-racing.patch \ " SRC_URI[sha256sum] = "6b5e9bb64dabb15787a14db1675291c7afaf9387438cc93a4fb7f6aec4ee6fe0"