mirror/buildroot
1
0
Fork 0
mirror of https://gitlab.com/buildroot.org/buildroot.git synced 2026-09-30 22:11:59 -09:00
Code Issues Packages Projects Releases Wiki Activity

package/freetype: unconditionally disable harfbuzz

Browse Source 
Commit 939e714393 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>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
(cherry picked from commit a98b79e2e6)
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
This commit is contained in:
Fabrice Fontaine
2020-10-02 07:44:29 +02:00
committed by Peter Korsgaard
parent d78ea69ceb
commit 0749af79b0
1 changed files with 4 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
package/freetype/freetype.mk
View File

@@ -14,6 +14,10 @@ FREETYPE_LICENSE_FILES = docs/LICENSE.TXT docs/FTL.TXT docs/GPLv2.TXT
FREETYPE_DEPENDENCIES = host-pkgconf FREETYPE_DEPENDENCIES = host-pkgconf
FREETYPE_CONFIG_SCRIPTS = freetype-config 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_DEPENDENCIES = host-pkgconf
HOST_FREETYPE_CONF_OPTS = \ HOST_FREETYPE_CONF_OPTS = \
--without-bzip2 \ --without-bzip2 \
@@ -39,13 +43,6 @@ else
FREETYPE_CONF_OPTS += --without-bzip2 FREETYPE_CONF_OPTS += --without-bzip2
endif 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) ifeq ($(BR2_PACKAGE_LIBPNG),y)
FREETYPE_DEPENDENCIES += libpng FREETYPE_DEPENDENCIES += libpng
FREETYPE_CONF_OPTS += --with-png FREETYPE_CONF_OPTS += --with-png