summaryrefslogtreecommitdiffstats
path: root/meta-oe/recipes-support/poppler
diff options
context:
space:
mode:
authorHongxu Jia <hongxu.jia@windriver.com>2025-10-22 11:18:16 +0800
committerKhem Raj <raj.khem@gmail.com>2025-10-21 23:12:48 -0700
commitcf343333041bf833aeb94dfdfb515e509004c849 (patch)
tree81ee3209c10f9d02fc73aa3c95e55b5b743580f1 /meta-oe/recipes-support/poppler
parentb66ce03e277ffae6259cf5d5b77f9a3902fc35cc (diff)
downloadmeta-openembedded-cf343333041bf833aeb94dfdfb515e509004c849.tar.gz
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 <hongxu.jia@windriver.com> Signed-off-by: Khem Raj <raj.khem@gmail.com>
Diffstat (limited to 'meta-oe/recipes-support/poppler')
-rw-r--r--meta-oe/recipes-support/poppler/poppler/0001-workaround-build-racing.patch43
-rw-r--r--meta-oe/recipes-support/poppler/poppler_25.10.0.bb1
2 files changed, 44 insertions, 0 deletions
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 @@
1From 83ad73024c69d41fda302f39acf50c381684890e Mon Sep 17 00:00:00 2001
2From: Hongxu Jia <hongxu.jia@windriver.com>
3Date: Tue, 21 Oct 2025 02:39:36 -0700
4Subject: [PATCH] workaround build racing
5
6There is a racing issue in world build while multilib enabled:
7
8...log.do_install...
9CMake Error at utils/po/ca/cmake_install.cmake:46 (file):
10 file INSTALL cannot find
11 "TOPDIR/tmp/work/core2-32-wrs-linux/poppler/25.08.0/build/utils/po/ca/pdfsig.gmo":
12 No such file or directory.
13Call Stack (most recent call first):
14 utils/po/cmake_install.cmake:47 (include)
15 utils/cmake_install.cmake:243 (include)
16 cmake_install.cmake:229 (include)
17...log.do_install...
18
19Revert "pdfsig: Catalan translation" to workaround
20
21This reverts commit 99f5416d9bfb6a34bbc5cbcb368e258b98fd3f08.
22
23Upstream-Status: Inappropriate [Yocto specific]
24
25Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
26---
27 utils/po/ca/CMakeLists.txt | 4 ----
28 1 file changed, 4 deletions(-)
29 delete mode 100644 utils/po/ca/CMakeLists.txt
30
31diff --git a/utils/po/ca/CMakeLists.txt b/utils/po/ca/CMakeLists.txt
32deleted file mode 100644
33index 3225131c..00000000
34--- a/utils/po/ca/CMakeLists.txt
35+++ /dev/null
36@@ -1,4 +0,0 @@
37-get_filename_component(_lang ${CMAKE_CURRENT_SOURCE_DIR} NAME)
38-gettext_process_po_files(${_lang} ALL INSTALL_DESTINATION ${CMAKE_INSTALL_LOCALEDIR} PO_FILES
39- pdfsig.po
40-)
41--
422.49.0
43
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 \
7 file://0001-Do-not-overwrite-all-our-build-flags.patch \ 7 file://0001-Do-not-overwrite-all-our-build-flags.patch \
8 file://basename-include.patch \ 8 file://basename-include.patch \
9 file://0001-cmake-Do-not-use-isystem.patch \ 9 file://0001-cmake-Do-not-use-isystem.patch \
10 file://0001-workaround-build-racing.patch \
10 " 11 "
11SRC_URI[sha256sum] = "6b5e9bb64dabb15787a14db1675291c7afaf9387438cc93a4fb7f6aec4ee6fe0" 12SRC_URI[sha256sum] = "6b5e9bb64dabb15787a14db1675291c7afaf9387438cc93a4fb7f6aec4ee6fe0"
12 13