package/freetype: unconditionally disable harfbuzz
PATCH 1/1 package/freetype: unconditionally disable harfbuzz
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
--- package/freetype/freetype.mk | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-)
package/freetype/freetype.mk +4 -7
@@ -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
Signature · 1 line
2.28.0
PATCH 1/1 package/freetype: unconditionally disable harfbuzz
Quoted 10 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"Fabrice" == Fabrice Fontaine <[email protected]> writes:
Commit
939e714393e9d7f60f3a198d831608b08a25662eadded an optional harfbuzz dependency to freetype but this creates a circular dependency so unconditionally disable itFixes:
- http://autobuild.buildroot.org/results/3cc4ce3207a253186a9c4f8f5151ea0fc0854a28Signed-off-by Fabrice Fontaine <[email protected]>
Committed, thanks.
Signature · 1 line
Bye, Peter Korsgaard
PATCH 1/1 package/freetype: unconditionally disable harfbuzz
In reply to Fabrice FontaineQuoted 10 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"Fabrice" == Fabrice Fontaine <[email protected]> writes:
Commit
939e714393e9d7f60f3a198d831608b08a25662eadded an optional harfbuzz dependency to freetype but this creates a circular dependency so unconditionally disable itFixes:
- http://autobuild.buildroot.org/results/3cc4ce3207a253186a9c4f8f5151ea0fc0854a28Signed-off-by Fabrice Fontaine <[email protected]>
Committed to 2020.02.x, 2020.05.x and 2020.08.x, thanks.
Signature · 1 line
Bye, Peter Korsgaard