From e6672bf1d3e8ea7fe3c73f07d75c12e6383a42b6 Mon Sep 17 00:00:00 2001
From: Dylan Araps <dylan.araps@gmail.com>
Date: Sun, 4 Aug 2019 19:54:25 +0300
Subject: [PATCH] freetype-harfbuzz: correctly link to local versions

---
 testing/freetype-harfbuzz/build | 32 ++++++++++++++++++++------------
 1 file changed, 20 insertions(+), 12 deletions(-)

diff --git a/testing/freetype-harfbuzz/build b/testing/freetype-harfbuzz/build
index 0c511ec0..c06e1dc4 100755
--- a/testing/freetype-harfbuzz/build
+++ b/testing/freetype-harfbuzz/build
@@ -1,16 +1,5 @@
 #!/bin/sh -e
 
-build_harfbuzz() (
-    cd harfbuzz
-
-    ./configure \
-        --prefix=/usr \
-        --with-glib
-
-    make
-    make DESTDIR="$1" install
-)
-
 build_freetype() (
     cd freetype
 
@@ -24,11 +13,30 @@ build_freetype() (
     make DESTDIR="$1" install
 )
 
+build_harfbuzz() (
+    cd harfbuzz
+
+    ./configure \
+        --prefix=/usr \
+        --with-glib=yes \
+        --with-icu=no
+
+    make
+    make DESTDIR="$1" install
+)
+
 build_freetype "$1" no
 
-export LD_LIBRARY_PATH="$1/usr/lib"
+# Point Harfbuzz to the Freetype files.
+export FREETYPE_CFLAGS="-I$PWD/freetype/src"
+export FREETYPE_LIBS="-L$PWD/freetype/src/.libs -lfreetype2"
 
 build_harfbuzz "$1"
+
+# Point Freetype to the Harfbuzz files.
+export HARFBUZZ_CFLAGS="-I$PWD/harfbuzz/src"
+export HARFBUZZ_LIBS="-L$PWD/harfbuzz/src/.libs -lharfbuzz"
+
 build_freetype "$1" yes
 
 # Remove a ton of HTML documentation.