From fbc4c69e38d271a81b725108995ddbe60323dd0a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Duval?= Date: Fri, 15 Jan 2021 21:09:02 +0100 Subject: [PATCH] freetype: don't build with harfbuzz on x86_gcc2 --- media-libs/freetype/freetype-2.10.4.recipe | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) diff --git a/media-libs/freetype/freetype-2.10.4.recipe b/media-libs/freetype/freetype-2.10.4.recipe index cecf8ca30..72dbf82ca 100644 --- a/media-libs/freetype/freetype-2.10.4.recipe +++ b/media-libs/freetype/freetype-2.10.4.recipe @@ -21,10 +21,15 @@ PROVIDES=" REQUIRES=" haiku$secondaryArchSuffix lib:libbz2$secondaryArchSuffix - lib:libharfbuzz$secondaryArchSuffix lib:libpng16$secondaryArchSuffix lib:libz$secondaryArchSuffix >= 1 " +if [ "$effectiveTargetArchitecture" != x86_gcc2 ]; then + REQUIRES="$REQUIRES + lib:libharfbuzz$secondaryArchSuffix + " +fi + PROVIDES_devel=" freetype${secondaryArchSuffix}_devel = $portVersion @@ -34,18 +39,26 @@ PROVIDES_devel=" REQUIRES_devel=" freetype${secondaryArchSuffix} == $portVersion base devel:libbz2$secondaryArchSuffix - devel:libharfbuzz$secondaryArchSuffix devel:libpng16$secondaryArchSuffix devel:libz$secondaryArchSuffix " +if [ "$effectiveTargetArchitecture" != x86_gcc2 ]; then + REQUIRES="$REQUIRES + devel:libharfbuzz$secondaryArchSuffix + " +fi BUILD_REQUIRES=" haiku${secondaryArchSuffix}_devel devel:libbz2$secondaryArchSuffix - devel:libharfbuzz$secondaryArchSuffix devel:libpng16$secondaryArchSuffix devel:libz$secondaryArchSuffix " +if [ "$effectiveTargetArchitecture" != x86_gcc2 ]; then + BUILD_REQUIRES="$BUILD_REQUIRES + devel:libharfbuzz$secondaryArchSuffix + " +fi BUILD_PREREQUIRES=" cmd:aclocal cmd:autoconf