Support circular dependency of harfbuzz-freetype

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

Hide file tree

Showing 3 changed files with 4 additions and 5 deletions.
diff --git a/freetype/VITABUILD b/freetype/VITABUILD
@@ -7,8 +7,7 @@ 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
+  ./autogen.sh --host=arm-vita-eabi --prefix=$prefix --with-zlib --with-bzip2 --with-png --with-harfbuzz=${WITHHB:-yes}
   make
 }
 

diff --git a/harfbuzz/VITABUILD b/harfbuzz/VITABUILD
@@ -10,8 +10,7 @@ prepare() {
 
 build() {
   cd harfbuzz-$pkgver
-  mkdir build && cd build
-  cmake .. $CMARGS -DCMAKE_INSTALL_PREFIX=$prefix
+  ./autogen.sh --host=arm-vita-eabi --prefix=$prefix --with-freetype --without-glib --without-icu --without-cairo --without-fontconfig
   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=no b freetype # once without hb to support hb-ft circular dependency
 b harfbuzz
+b freetype
 b fftw
 b libvita2d
 b libmad