Merge pull request #50 from travis-ci/ha-merge-php-build

Merge 7.4 support

Author: BanzaiMan

.travis.yml

@@ -102,7 +102,7 @@ jobs:
       dist: bionic
       language: minimal
       env:
-        - RELEASE=bionic-s390x
+        - RELEASE=bionic
       name: bionic-s390x
       before_install:
         - sudo rm -rf /var/lib/apt/lists/lock /var/cache/apt/archives/lock /var/lib/dpkg/lock
@@ -119,12 +119,13 @@ jobs:
               eval "$(phpenv init -)"
             fi
           fi
+        - 'echo "--without-pcre-jit" >> $TRAVIS_BUILD_DIR/custom_configure_options'
     - arch: s390x
       dist: xenial
       group: edge
       language: minimal
       env:
-        - RELEASE=xenial-s390x
+        - RELEASE=xenial
       name: xenial-s390x
       before_install:
         - sudo rm -rf /var/lib/apt/lists/lock /var/cache/apt/archives/lock /var/lib/dpkg/lock
@@ -141,6 +142,7 @@ jobs:
               eval "$(phpenv init -)"
             fi
           fi
+        - 'echo "--without-pcre-jit" >> $TRAVIS_BUILD_DIR/custom_configure_options'
     - arch: arm64
       dist: bionic
       language: minimal
@@ -251,7 +253,9 @@ before_script:
 - __dots() { while true ; do echo -en . ; sleep 30 ; done } ; __dots &
 
 script:
+  - echo "--enable-option-checking=fatal" >> $HOME/.php-build/share/php-build/default_configure_options
   - cat $HOME/.php-build/share/php-build/default_configure_options
+  - export PKG_CONFIG_PATH="$HOME/.phpenv/versions/$VERSION/lib/pkgconfig:$PKG_CONFIG_PATH"
   - ./bin/compile
   - | # disable 3rd-party extension builds on master
     if [[ ! $VERSION =~ ^master$ ]]; then

bin/install-libsodium

@@ -21,4 +21,8 @@ make install
 popd
 
 # add the option in custom_configure_options
-echo "--with-sodium=$LIBSODIUM_INSTALL_DIR" >> $TRAVIS_BUILD_DIR/custom_configure_options
+if [[ ! $VERSION =~ ^master$ ]] && [[ "$(printf "7.4\n$VERSION" | sort -V | head -n1)" < "7.4" ]]; then
+	echo "--with-sodium=$LIBSODIUM_INSTALL_DIR" >> $TRAVIS_BUILD_DIR/custom_configure_options
+else
+	echo "--with-sodium" >> $TRAVIS_BUILD_DIR/custom_configure_options
+fi

bin/install-libzip

@@ -38,4 +38,8 @@ make install
 popd
 
 # add the option in custom_configure_options
-echo "--with-libzip=$LIBZIP_INSTALL_DIR" >> $TRAVIS_BUILD_DIR/custom_configure_options
+if [[ "$(printf "7.4\n$VERSION" | sort -V | head -n1)" < "7.4" ]]; then
+	echo "--with-libzip=$LIBZIP_INSTALL_DIR" >> $TRAVIS_BUILD_DIR/custom_configure_options
+else
+	echo "--with-zip" >> $TRAVIS_BUILD_DIR/custom_configure_options
+fi

default_configure_options.bionic

@@ -9,7 +9,6 @@
 --enable-zip
 --with-zlib
 --with-zlib-dir=/usr
---with-mcrypt=/usr
 --with-pdo-sqlite
 --enable-soap
 --enable-xmlreader
@@ -21,7 +20,6 @@
 --enable-sysvshm
 --enable-sysvmsg
 --enable-shmop
---with-mysql=mysqlnd
 --with-mysqli=mysqlnd
 --with-pdo-mysql=mysqlnd
 --enable-pcntl

default_configure_options.bionic-s390x renamed to default_configure_options.bionic-7.4

@@ -1,12 +1,10 @@
 --enable-intl
 --with-openssl
 --without-pear
---with-gd
---with-jpeg-dir=/usr
---with-png-dir=/usr
---with-freetype-dir=/usr
+--enable-gd
+--with-jpeg=/usr
+--with-freetype=/usr
 --enable-exif
---enable-zip
 --with-zlib
 --with-zlib-dir=/usr
 --with-pdo-sqlite
@@ -45,4 +43,3 @@
 --with-ldap-sasl
 --enable-dba
 --with-cdb
---without-pcre-jit

default_configure_options.xenial-s390x renamed to default_configure_options.bionic-master

@@ -1,12 +1,11 @@
 --enable-intl
 --with-openssl
 --without-pear
---with-gd
---with-jpeg-dir=/usr
---with-png-dir=/usr
---with-freetype-dir=/usr
+--enable-gd
+--with-jpeg
+--with-freetype
 --enable-exif
---enable-zip
+--with-zip
 --with-zlib
 --with-zlib-dir=/usr
 --with-pdo-sqlite
@@ -35,14 +34,12 @@
 --enable-calendar
 --with-libdir=lib
 --enable-fpm
---enable-maintainer-zts
+--enable-zts
 --with-gmp
---with-kerberos
 --with-imap
 --with-imap-ssl
 --with-kerberos
 --with-ldap
 --with-ldap-sasl
 --enable-dba
 --with-cdb
---without-pcre-jit

default_configure_options.trusty

@@ -9,7 +9,6 @@
 --enable-zip
 --with-zlib
 --with-zlib-dir=/usr
---with-mcrypt=/usr
 --with-pdo-sqlite
 --enable-soap
 --enable-xmlreader
@@ -21,7 +20,6 @@
 --enable-sysvshm
 --enable-sysvmsg
 --enable-shmop
---with-mysql=mysqlnd
 --with-mysqli=mysqlnd
 --with-pdo-mysql=mysqlnd
 --enable-pcntl

default_configure_options.trusty-7.4

@@ -2,12 +2,9 @@
 --with-openssl
 --without-pear
 --enable-gd
---with-jpeg
---with-freetype
+--with-jpeg=/usr
+--with-freetype=/usr
 --enable-exif
---with-zip
---with-zlib
---with-zlib-dir=/usr
 --with-pdo-sqlite
 --enable-soap
 --enable-xmlreader
@@ -36,6 +33,7 @@
 --enable-fpm
 --enable-maintainer-zts
 --with-gmp
+--with-kerberos
 --with-imap
 --with-imap-ssl
 --with-kerberos

default_configure_options.xenial

@@ -9,7 +9,6 @@
 --enable-zip
 --with-zlib
 --with-zlib-dir=/usr
---with-mcrypt=/usr
 --with-pdo-sqlite
 --enable-soap
 --enable-xmlreader
@@ -21,7 +20,6 @@
 --enable-sysvshm
 --enable-sysvmsg
 --enable-shmop
---with-mysql=mysqlnd
 --with-mysqli=mysqlnd
 --with-pdo-mysql=mysqlnd
 --enable-pcntl

default_configure_options.xenial-7.4

@@ -2,10 +2,9 @@
 --with-openssl
 --without-pear
 --enable-gd
---with-jpeg
---with-freetype
+--with-jpeg=/usr
+--with-freetype=/usr
 --enable-exif
---with-zip
 --with-zlib
 --with-zlib-dir=/usr
 --with-pdo-sqlite
@@ -36,6 +35,7 @@
 --enable-fpm
 --enable-maintainer-zts
 --with-gmp
+--with-kerberos
 --with-imap
 --with-imap-ssl
 --with-kerberos