[Buildroot] [git commit branch/2019.11.x] package/pango: add dependency on libfribidi

Peter Korsgaard peter at korsgaard.com
Mon Dec 23 08:03:32 UTC 2019


commit: https://git.buildroot.net/buildroot/commit/?id=fb4f870cc72944e8f1dde99f81c2dd9c9c23912b
branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2019.11.x

Since commit 5cce413eb11ac75f5c48ed351896c5d1c33961d5 ("package/pango:
bump to version 1.44.6"), pango needs libfribidi. Through the Meson
subprojects mechanism, it tries to download it by itself if not
available. But in Buildroot, we definitely want to use the separate
libfribidi package, so let's add it as a dependency of pango.

Fixes:
  http://autobuild.buildroot.net/results/f16fda910da23dfe5f8ac1cb51f9dbcec444b516

  subprocess.CalledProcessError: Command '['git', 'clone', 'https://github.com/fribidi/fribidi.git', 'fribidi']' returned non-zero exit status 128.

Signed-off-by: Peter Seiderer <ps.report at gmx.net>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni at bootlin.com>
(cherry picked from commit 861b74b1c5b07361eb6cf0d9c1b42a0a38bfc25a)
Signed-off-by: Peter Korsgaard <peter at korsgaard.com>
---
 package/pango/Config.in | 1 +
 package/pango/pango.mk  | 2 ++
 2 files changed, 3 insertions(+)

diff --git a/package/pango/Config.in b/package/pango/Config.in
index cdf8b54171..e810598eef 100644
--- a/package/pango/Config.in
+++ b/package/pango/Config.in
@@ -7,6 +7,7 @@ config BR2_PACKAGE_PANGO
 	depends on BR2_TOOLCHAIN_HAS_SYNC_4 # harfbuzz
 	depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 # harfbuzz
 	select BR2_PACKAGE_LIBGLIB2
+	select BR2_PACKAGE_LIBFRIBIDI
 	select BR2_PACKAGE_EXPAT
 	select BR2_PACKAGE_CAIRO
 	select BR2_PACKAGE_FONTCONFIG
diff --git a/package/pango/pango.mk b/package/pango/pango.mk
index 33e7825896..48edd18b05 100644
--- a/package/pango/pango.mk
+++ b/package/pango/pango.mk
@@ -19,6 +19,7 @@ PANGO_DEPENDENCIES = \
 	$(TARGET_NLS_DEPENDENCIES) \
 	host-pkgconf \
 	libglib2 \
+	libfribidi \
 	cairo \
 	harfbuzz \
 	fontconfig \
@@ -26,6 +27,7 @@ PANGO_DEPENDENCIES = \
 HOST_PANGO_DEPENDENCIES = \
 	host-pkgconf \
 	host-libglib2 \
+	host-libfribidi \
 	host-cairo \
 	host-harfbuzz \
 	host-fontconfig \


More information about the buildroot mailing list