Compile PHP 7.2 with-sodium (#410)

GoogleCloudPlatform · Jan 9, 2018 · d9a522a · d9a522a
1 parent a8b16da
commit d9a522a
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git 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
@@ -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 \