From d9a522ae49e6abf85162babe96a43fef7e538b86 Mon Sep 17 00:00:00 2001
From: Jeff Ching <ching.jeff@gmail.com>
Date: Tue, 9 Jan 2018 11:03:59 -0800
Subject: [PATCH] Compile PHP 7.2 with-sodium (#410)

---
 deb-package-builder/build.sh        | 4 +++-
 deb-package-builder/debian/rules.in | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/deb-package-builder/build.sh b/deb-package-builder/build.sh
index bd9797bf..3895f8bf 100755
--- a/deb-package-builder/build.sh
+++ b/deb-package-builder/build.sh
@@ -67,8 +67,10 @@ build_php_version()
     export ARTIFACT_PKG_DIR="${ARTIFACT_DIR}/${FULL_VERSION}"
     if [ "${SHORT_VERSION}" == "72" ]; then
         export EXTRA_DEPS="libsodium18, "
+        export EXTRA_OPTS="--with-sodium"
     else
         export EXTRA_DEPS=""
+        export EXTRA_OPTS=""
     fi
     mkdir -p ${ARTIFACT_PKG_DIR}
 
@@ -117,7 +119,7 @@ build_php_version()
               ${PACKAGE_NAME}-${PHP_VERSION}
           popd
       fi
-      envsubst '${SHORT_VERSION}' < debian/rules.in > debian/rules
+      envsubst '${SHORT_VERSION} ${EXTRA_OPTS}' < debian/rules.in > debian/rules
       chmod +x debian/rules
       envsubst '${SHORT_VERSION} ${EXTRA_DEPS}' < debian/control.in > debian/control
       envsubst '${SHORT_VERSION}' < debian/patches/series.in > \
diff --git a/deb-package-builder/debian/rules.in b/deb-package-builder/debian/rules.in
index a36a41bf..e5e9f3d9 100755
--- a/deb-package-builder/debian/rules.in
+++ b/deb-package-builder/debian/rules.in
@@ -11,7 +11,7 @@ override_dh_auto_configure:
 	rm -f configure \
 	&& ./buildconf --force \
 	&& ln -s /usr/include/x86_64-linux-gnu/gmp.h /usr/include/gmp.h \
-	&& dh_auto_configure -- --prefix=/opt/php${SHORT_VERSION} \
+	&& dh_auto_configure -- --prefix=/opt/php${SHORT_VERSION} ${EXTRA_OPTS} \
 	--with-config-file-path=/opt/php${SHORT_VERSION}/lib \
 	--with-config-file-scan-dir=/opt/php${SHORT_VERSION}/lib/ext.enabled:/opt/php${SHORT_VERSION}/lib/conf.d \
 	--enable-sysvsem \