From e3a867d9d31a348099f840fe1da7f09f995e9339 Mon Sep 17 00:00:00 2001
From: Andrew Murray <radarhere@users.noreply.github.com>
Date: Sun, 26 Jan 2020 00:50:56 +1100
Subject: [PATCH] Removed customisation of bzip2 build

---
 config.sh | 12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)

diff --git a/config.sh b/config.sh
index a61fdfda9..225217186 100644
--- a/config.sh
+++ b/config.sh
@@ -51,18 +51,12 @@ function pre_build {
         CPPFLAGS=$ORIGINAL_CPPFLAGS
     fi
 
-    # freetype
-    freetype_args=""
     if [ -n "$IS_OSX" ]; then
-        freetype_args="--with-harfbuzz=no"
+        # Custom freetype build
+        build_simple freetype $FREETYPE_VERSION https://download.savannah.gnu.org/releases/freetype tar.gz --with-harfbuzz=no
     else
-        # bzip2
-        fetch_unpack https://sourceware.org/pub/bzip2/bzip2-${BZIP2_VERSION}.tar.gz
-        (cd bzip2-${BZIP2_VERSION} \
-            && make -f Makefile-libbz2_so \
-            && make install PREFIX=$BUILD_PREFIX)
+        build_freetype
     fi
-    build_simple freetype $FREETYPE_VERSION https://download.savannah.gnu.org/releases/freetype tar.gz $freetype_args
 }
 
 function run_tests_in_repo {