* [Buildroot] [PATCH 1/1] package/freetype: unconditionally disable harfbuzz
@ 2020-10-02 5:44 Fabrice Fontaine
2020-10-03 6:53 ` Peter Korsgaard
2020-10-03 8:40 ` Peter Korsgaard
0 siblings, 2 replies; 3+ messages in thread
From: Fabrice Fontaine @ 2020-10-02 5:44 UTC (permalink / raw)
To: buildroot
Commit 939e714393e9d7f60f3a198d831608b08a25662e added an optional
harfbuzz dependency to freetype but this creates a circular dependency
so unconditionally disable it
Fixes:
- http://autobuild.buildroot.org/results/3cc4ce3207a253186a9c4f8f5151ea0fc0854a28
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
---
package/freetype/freetype.mk | 11 ++++-------
1 file changed, 4 insertions(+), 7 deletions(-)
diff --git a/package/freetype/freetype.mk b/package/freetype/freetype.mk
index e6463c30b6..f4d71bedf7 100644
--- a/package/freetype/freetype.mk
+++ b/package/freetype/freetype.mk
@@ -14,6 +14,10 @@ FREETYPE_LICENSE_FILES = docs/LICENSE.TXT docs/FTL.TXT docs/GPLv2.TXT
FREETYPE_DEPENDENCIES = host-pkgconf
FREETYPE_CONFIG_SCRIPTS = freetype-config
+# harfbuzz already depends on freetype so disable harfbuzz in freetype to avoid
+# a circular dependency
+FREETYPE_CONF_OPTS = --without-harfbuzz
+
HOST_FREETYPE_DEPENDENCIES = host-pkgconf
HOST_FREETYPE_CONF_OPTS = \
--without-brotli \
@@ -47,13 +51,6 @@ else
FREETYPE_CONF_OPTS += --without-bzip2
endif
-ifeq ($(BR2_PACKAGE_HARFBUZZ),y)
-FREETYPE_DEPENDENCIES += harfbuzz
-FREETYPE_CONF_OPTS += --with-harbuzz
-else
-FREETYPE_CONF_OPTS += --without-harfbuzz
-endif
-
ifeq ($(BR2_PACKAGE_LIBPNG),y)
FREETYPE_DEPENDENCIES += libpng
FREETYPE_CONF_OPTS += --with-png
--
2.28.0
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [Buildroot] [PATCH 1/1] package/freetype: unconditionally disable harfbuzz
2020-10-02 5:44 [Buildroot] [PATCH 1/1] package/freetype: unconditionally disable harfbuzz Fabrice Fontaine
@ 2020-10-03 6:53 ` Peter Korsgaard
2020-10-03 8:40 ` Peter Korsgaard
1 sibling, 0 replies; 3+ messages in thread
From: Peter Korsgaard @ 2020-10-03 6:53 UTC (permalink / raw)
To: buildroot
>>>>> "Fabrice" == Fabrice Fontaine <fontaine.fabrice@gmail.com> writes:
> Commit 939e714393e9d7f60f3a198d831608b08a25662e added an optional
> harfbuzz dependency to freetype but this creates a circular dependency
> so unconditionally disable it
> Fixes:
> - http://autobuild.buildroot.org/results/3cc4ce3207a253186a9c4f8f5151ea0fc0854a28
> Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Committed, thanks.
--
Bye, Peter Korsgaard
^ permalink raw reply [flat|nested] 3+ messages in thread
* [Buildroot] [PATCH 1/1] package/freetype: unconditionally disable harfbuzz
2020-10-02 5:44 [Buildroot] [PATCH 1/1] package/freetype: unconditionally disable harfbuzz Fabrice Fontaine
2020-10-03 6:53 ` Peter Korsgaard
@ 2020-10-03 8:40 ` Peter Korsgaard
1 sibling, 0 replies; 3+ messages in thread
From: Peter Korsgaard @ 2020-10-03 8:40 UTC (permalink / raw)
To: buildroot
>>>>> "Fabrice" == Fabrice Fontaine <fontaine.fabrice@gmail.com> writes:
> Commit 939e714393e9d7f60f3a198d831608b08a25662e added an optional
> harfbuzz dependency to freetype but this creates a circular dependency
> so unconditionally disable it
> Fixes:
> - http://autobuild.buildroot.org/results/3cc4ce3207a253186a9c4f8f5151ea0fc0854a28
> Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Committed to 2020.02.x, 2020.05.x and 2020.08.x, thanks.
--
Bye, Peter Korsgaard
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2020-10-03 8:40 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-10-02 5:44 [Buildroot] [PATCH 1/1] package/freetype: unconditionally disable harfbuzz Fabrice Fontaine
2020-10-03 6:53 ` Peter Korsgaard
2020-10-03 8:40 ` Peter Korsgaard
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.