From f46e562749981b68f228838b6dfe2c5a6f331318 Mon Sep 17 00:00:00 2001
From: Andrew Dunham <andrew@du.nham.ca>
Date: Thu, 12 Mar 2015 17:54:52 -0700
Subject: [PATCH] ag: Build zlib, fix linking with lzma

---
 the_silver_searcher/build.sh | 23 +++++++++++++++++++++--
 1 file changed, 21 insertions(+), 2 deletions(-)

diff --git a/the_silver_searcher/build.sh b/the_silver_searcher/build.sh
index 9f3091f..2b3b654 100755
--- a/the_silver_searcher/build.sh
+++ b/the_silver_searcher/build.sh
@@ -6,6 +6,7 @@ set -x
 
 
 MUSL_VERSION=1.1.6
+ZLIB_VERSION=1.2.8
 PCRE_VERSION=8.36
 LZMA_VERSION=5.0.8
 
@@ -24,6 +25,20 @@ function build_musl() {
     make install
 }
 
+function build_zlib() {
+    cd /build
+
+    # Download
+    curl -LO http://zlib.net/zlib-${ZLIB_VERSION}.tar.gz
+    tar zxvf zlib-${ZLIB_VERSION}.tar.gz
+    cd zlib-${ZLIB_VERSION}
+
+    # Build
+    CC='/usr/local/musl/bin/musl-gcc -static' CFLAGS='-fPIC' ./configure \
+        --static
+    make -j4
+}
+
 function build_pcre() {
     cd /build
 
@@ -71,11 +86,14 @@ function build_ag() {
     # Note: since the system won't have PCRE/liblzma installed, we just have pkg-config return true
     CC='/usr/local/musl/bin/musl-gcc -static'                               \
         CFLAGS='-fPIC'                                                      \
-        CPPFLAGS="-I/build/pcre-${PCRE_VERSION}"                            \
+        CPPFLAGS="-I/build/pcre-${PCRE_VERSION} -I/build/xz-${LZMA_VERSION}/src/liblzma/api -I/build/zlib-${ZLIB_VERSION}" \
+        LDFLAGS="-L/build/zlib-${ZLIB_VERSION} -lz"    \
         PCRE_LIBS="-L/build/pcre-${PCRE_VERSION}/.libs -lpcre"              \
         PCRE_CFLAGS="-I/build/pcre-${PCRE_VERSION}"                         \
         LZMA_LIBS="-L/build/xz-${LZMA_VERSION}/src/liblzma/.libs -llzma"    \
-        LZMA_CFLAGS="-I/build/xz-${LZMA_VERSION}"                           \
+        LZMA_CFLAGS="-I/build/xz-${LZMA_VERSION}/src/liblzma/api"           \
+        ZLIB_LIBS="-L/build/zlib-${ZLIB_VERSION} -lz"    \
+        ZLIB_CFLAGS="-I/build/zlib-${ZLIB_VERSION}"           \
         ./configure PKG_CONFIG="/bin/true"
 
     # Build
@@ -86,6 +104,7 @@ function build_ag() {
 function doit() {
     # Kick off all builds
     build_musl
+    build_zlib
     build_pcre
     build_lzma
     build_ag