[Buildroot] [PATCH 1/1] package/fontconfig: fix per-package build with NLS

[Arnout Vandecappelle]

On 13/08/2021 23:16, Fabrice Fontaine wrote:
> Add TARGET_NLS_DEPENDENCIES and host-gettext dependency to avoid the
> following build failure 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
> 
> Fixes:
>  - http://autobuild.buildroot.org/results/00e29958cecfffa4e994ab549637117dd8f55c30
> 
> Signed-off-by: Fabrice Fontaine <fontaine.fabrice at gmail.com>

 Applied to master, thanks.

 I've extended the commit message a bit to explain why it only happens with PPD.

 Regards,
 Arnout

> ---
>  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
>