From ec6572dec4ad3e4ed63c5ef84eefb7dfa1c15908 Mon Sep 17 00:00:00 2001
From: David Zuelke <dzuelke@gmail.com>
Date: Fri, 6 Dec 2019 21:49:55 -0700
Subject: [PATCH] Use system libsqlite on heroku-16 and heroku-18

---
 CHANGELOG.md      | 1 +
 support/build/php | 9 ++++++---
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6b0ee9613..f976550ad 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,7 @@
 - Use system libc-client for IMAP extension [David Zuelke]
 - Use system libmcrypt on all stacks [David Zuelke]
 - Use system libzip on heroku-16 and heroku-18 stacks [David Zuelke]
+- Use system libsqlite on heroku-16 and heroku-18 stacks [David Zuelke]
 
 ## v171 (2020-02-11)
 
diff --git a/support/build/php b/support/build/php
index 79b6e1fd0..aa9dfb8da 100755
--- a/support/build/php
+++ b/support/build/php
@@ -68,6 +68,9 @@ fi
 needed=( libgmp-dev libpam0g-dev libc-client2007e-dev libicu-dev libsasl2-dev libkrb5-dev libldap2-dev )
 if [[ $STACK != "cedar-14" ]]; then
 	needed+=( libsodium-dev libsqlite3-dev libzip-dev )
+	sqlite_prefix="/usr"
+else
+	sqlite_prefix=
 fi
 if [[ $STACK != "cedar-14" && $STACK != "heroku-16" ]]; then
 	needed+=( libwebp-dev )
@@ -104,12 +107,14 @@ configureopts=()
 if [[ $dep_version == 7.* ]]; then
 	if [[ $dep_version == 7.[0-3].* ]]; then
 		configureopts+=("--enable-opcache-file" "--enable-zip")
+		configureopts+=("--with-sqlite3=shared${sqlite_prefix:+","}${sqlite_prefix}" "--with-pdo-sqlite=shared${sqlite_prefix:+","}${sqlite_prefix}")
 		configureopts+=("--with-gd=shared" "--with-freetype-dir=/usr" "--with-jpeg-dir=/usr" "--with-png-dir=/usr") # for ext-gd
 		if [[ $STACK != "cedar-14" && $STACK != "heroku-16" ]]; then
 			configureopts+=("--with-webp-dir=/usr") # for ext-gd
 		fi
 	else
 		configureopts+=("--with-zip" "--disable-mbregex") # we do not have libonig
+		configureopts+=("--with-sqlite3=shared" "--with-pdo-sqlite=shared")
 		configureopts+=("--enable-gd=shared" "--with-freetype" "--with-jpeg") # for ext-gd
 		if [[ $STACK != "cedar-14" && $STACK != "heroku-16" ]]; then
 			configureopts+=("--with-webp") # for ext-gd
@@ -127,7 +132,7 @@ if [[ $dep_version == 7.* ]]; then
 		fi
 	fi
 else
-	configureopts+=("--with-gd=shared" "--with-freetype-dir=/usr" "--with-jpeg-dir=/usr" "--with-png-dir=/usr" "--with-mcrypt" "--with-mysql=shared" "--enable-zip")
+	configureopts+=("--with-gd=shared" "--with-freetype-dir=/usr" "--with-jpeg-dir=/usr" "--with-png-dir=/usr" "--with-mcrypt" "--with-mysql=shared" "--enable-zip" "--with-sqlite3=shared${sqlite_prefix:+","}${sqlite_prefix}" "--with-pdo-sqlite=shared${sqlite_prefix:+","}${sqlite_prefix}")
 fi
 if [[ $STACK == "cedar-14" ]]; then
 	configureopts+=("--without-libzip") # there is no libzip on cedar-14
@@ -170,8 +175,6 @@ export PATH=${OUT_PREFIX}/bin:$PATH
 	--enable-pcntl=shared \
 	--enable-shmop=shared \
 	--enable-soap=shared \
-	--with-sqlite3=shared \
-	--with-pdo-sqlite=shared \
 	--with-xmlrpc=shared \
 	--with-xsl=shared \
 	"${configureopts[@]}"