From: Ross Burton Date: Fri, 16 Jan 2026 18:05:01 +0000 (+0000) Subject: fontconfig: backport a patch to fix a build race X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0baab9204ff48ff8c45d528f91ae3204329dab2a;p=thirdparty%2Fopenembedded%2Fopenembedded-core.git fontconfig: backport a patch to fix a build race There's a build race where some objects don't explicitly depend on the generated header ftalias.h being created: In file included from ../sources/fontconfig-2.17.1/src/fcpat.c:23: ../sources/fontconfig-2.17.1/src/fcint.h:129:12: fatal error: fcalias.h: No such file or directory 129 | # include "fcalias.h" Backport a patch from upstream to add the missing dependencies. [ YOCTO #16134 ] Signed-off-by: Ross Burton Signed-off-by: Antonin Godard Signed-off-by: Richard Purdie --- diff --git a/meta/recipes-graphics/fontconfig/fontconfig/0001-build-Added-missing-target-rule-dependencies.patch b/meta/recipes-graphics/fontconfig/fontconfig/0001-build-Added-missing-target-rule-dependencies.patch new file mode 100644 index 0000000000..40b25cc926 --- /dev/null +++ b/meta/recipes-graphics/fontconfig/fontconfig/0001-build-Added-missing-target-rule-dependencies.patch @@ -0,0 +1,31 @@ +From 0bba79bfd3d8a216794d15af97ce4abefd4b8748 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Florian=20=22sp1rit=22=E2=80=8B?= +Date: Sat, 9 Aug 2025 20:22:43 +0200 +Subject: [PATCH] build: Added missing target rule-dependencies + +02b835b62 did not appropriately ensure, that the patternlib_internal +target waits until the {ft_,}alias_headers have finished generating the +headers that it depends on. + +Upstream-Status: Backport [0bba79bfd3d8a216794d15af97ce4abefd4b8748] +Signed-off-by: Ross Burton +--- + src/meson.build | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/meson.build b/src/meson.build +index c4d65d6c..10866aa8 100644 +--- a/src/meson.build ++++ b/src/meson.build +@@ -9,7 +9,7 @@ endif + # Factor our pattern manipulation code into its own library + # to break the depedency cycle: + # FontConfig pattern handling - Fontations code - FontConfig. +-pattern_sources = [ 'fcpat.c', fcstdint_h, fclang_h ] ++pattern_sources = [ 'fcpat.c', fcstdint_h, fclang_h, alias_headers, ft_alias_headers ] + pattern_lib = static_library('patternlib_internal', + pattern_sources, + include_directories: incbase, +-- +2.43.0 + diff --git a/meta/recipes-graphics/fontconfig/fontconfig_2.17.1.bb b/meta/recipes-graphics/fontconfig/fontconfig_2.17.1.bb index eca12400db..0d0fcfcceb 100644 --- a/meta/recipes-graphics/fontconfig/fontconfig_2.17.1.bb +++ b/meta/recipes-graphics/fontconfig/fontconfig_2.17.1.bb @@ -23,6 +23,7 @@ DEPENDS = "expat freetype zlib gperf-native util-linux" SRC_URI = "https://gitlab.freedesktop.org/api/v4/projects/890/packages/generic/fontconfig/${PV}/fontconfig-${PV}.tar.xz \ file://revert-static-pkgconfig.patch \ file://musl-fix.patch \ + file://0001-build-Added-missing-target-rule-dependencies.patch \ " SRC_URI[sha256sum] = "9f5cae93f4fffc1fbc05ae99cdfc708cd60dfd6612ffc0512827025c026fa541"