Support circular depedency of harfbuzz-freetype

vitasdk · Jan 19, 2018 · a7ffd49 · a7ffd49
1 parent 36015b9
commit a7ffd49
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/freetype/VITABUILD b/freetype/VITABUILD
@@ -7,8 +7,9 @@ sha256sums=('7b657d5f872b0ab56461f3bd310bd1c5ec64619bd15f0d8e08282d494d9cfea4')
 
 build() {
   cd freetype-$pkgver
-  mkdir build && cd build
-  cmake .. $CMARGS -DWITH_ZLIB=ON -DWITH_BZip2=OFF -DWITH_PNG=ON -DWITH_HarfBuzz=OFF -DCMAKE_INSTALL_PREFIX=$prefix
+  mkdir build || true
+  cd build
+  cmake .. $CMARGS -DWITH_ZLIB=ON -DWITH_BZip2=OFF -DWITH_PNG=ON -DWITH_HarfBuzz=${WITHHB:-ON} -DCMAKE_INSTALL_PREFIX=$prefix
   make
 }
 

diff --git a/travis_packages.sh b/travis_packages.sh
@@ -11,8 +11,9 @@ b libexif
 b libjpeg-turbo
 b jansson
 b yaml-cpp
-b freetype
+WITHHB=OFF b freetype # Support hb-ft circular dependency
 b harfbuzz
+b freetype
 b fftw
 b libvita2d
 b libmad