From 93351fa0b3b8b6dd10faa9a15a7a173b92cb40a0 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Fri, 13 Aug 2021 23:16:48 +0200 Subject: [PATCH] package/fontconfig: fix build with NLS Add TARGET_NLS_DEPENDENCIES and host-gettext dependency to avoid the following build failure in a per-package-directorie build with host-cairo raised because fontconfig installs its ITS files in the wrong directory (i.e. outside of gettext-tiny symlink): mkdir -p /tmp/instance-0/output-1/per-package/host-cairo/host rsync -a --link-dest=/tmp/instance-0/output-1/per-package/host-fontconfig/host/ /tmp/instance-0/output-1/per-package/host-fontconfig/host/ /tmp/instance-0/output-1/per-package/host-cairo/host rsync -a --link-dest=/tmp/instance-0/output-1/per-package/host-freetype/host/ /tmp/instance-0/output-1/per-package/host-freetype/host/ /tmp/instance-0/output-1/per-package/host-cairo/host rsync -a --link-dest=/tmp/instance-0/output-1/per-package/host-libglib2/host/ /tmp/instance-0/output-1/per-package/host-libglib2/host/ /tmp/instance-0/output-1/per-package/host-cairo/host cannot delete non-empty directory: share/gettext could not make way for new symlink: share/gettext This only happens with per-package directories because then the rsync is done. Otherwise the fontconfig installation will simply follow the symlink. The error of course exists for target as well, but doesn't occur in autobuilders since it already fails for host. Fixes: - http://autobuild.buildroot.org/results/00e29958cecfffa4e994ab549637117dd8f55c30 Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/fontconfig/fontconfig.mk | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/package/fontconfig/fontconfig.mk b/package/fontconfig/fontconfig.mk index d59e893d4d..e34acde534 100644 --- a/package/fontconfig/fontconfig.mk +++ b/package/fontconfig/fontconfig.mk @@ -11,9 +11,11 @@ FONTCONFIG_SOURCE = fontconfig-$(FONTCONFIG_VERSION).tar.bz2 FONTCONFIG_AUTORECONF = YES FONTCONFIG_INSTALL_STAGING = YES FONTCONFIG_DEPENDENCIES = freetype expat host-pkgconf host-gperf \ - $(if $(BR2_PACKAGE_UTIL_LINUX_LIBS),util-linux-libs,util-linux) + $(if $(BR2_PACKAGE_UTIL_LINUX_LIBS),util-linux-libs,util-linux) \ + $(TARGET_NLS_DEPENDENCIES) HOST_FONTCONFIG_DEPENDENCIES = \ - host-freetype host-expat host-pkgconf host-gperf host-util-linux + host-freetype host-expat host-pkgconf host-gperf host-util-linux \ + host-gettext FONTCONFIG_LICENSE = fontconfig license FONTCONFIG_LICENSE_FILES = COPYING FONTCONFIG_CPE_ID_VENDOR = fontconfig_project -- 2.30.2