diff options
| author | Joe Watkins <krakjoe@php.net> | 2019-07-03 08:16:47 +0200 |
|---|---|---|
| committer | Joe Watkins <krakjoe@php.net> | 2019-07-03 08:16:47 +0200 |
| commit | 4fb595d8b72e1a1059aac32bca24f6c8b915b091 (patch) | |
| tree | 5a0f1658f8c6241fa679cec68e7b49988f6106f1 | |
| parent | 0baf81514a44ee4988384ffbe6e448781267001c (diff) | |
| parent | a45192e183d456b3288e466b51137e7e2a5e2cf6 (diff) | |
| download | php-git-4fb595d8b72e1a1059aac32bca24f6c8b915b091.tar.gz | |
Merge branch 'PHP-7.4'
* PHP-7.4:
Enable option checking on CI
| -rw-r--r-- | azure/i386/job.yml | 1 | ||||
| -rw-r--r-- | azure/job.yml | 1 | ||||
| -rw-r--r-- | azure/macos/job.yml | 1 | ||||
| -rw-r--r-- | azure/msan_job.yml | 1 | ||||
| -rwxr-xr-x | travis/compile.sh | 5 |
5 files changed, 7 insertions, 2 deletions
diff --git a/azure/i386/job.yml b/azure/i386/job.yml index 40b46d3672..7d7ceeeeff 100644 --- a/azure/i386/job.yml +++ b/azure/i386/job.yml @@ -15,6 +15,7 @@ jobs: export LDFLAGS=-L/usr/lib/i386-linux-gnu export PKG_CONFIG=/usr/bin/i686-linux-gnu-pkg-config ./configure ${{ parameters.configurationParameters }} \ + --enable-option-checking=fatal \ --prefix=/usr \ --enable-phpdbg \ --enable-fpm \ diff --git a/azure/job.yml b/azure/job.yml index 425e54ceee..4da192cc17 100644 --- a/azure/job.yml +++ b/azure/job.yml @@ -14,6 +14,7 @@ jobs: - script: | ./buildconf --force ./configure ${{ parameters.configurationParameters }} \ + --enable-option-checking=fatal \ --prefix=/usr \ --enable-phpdbg \ --enable-fpm \ diff --git a/azure/macos/job.yml b/azure/macos/job.yml index 878fda52c1..61c5f4a78e 100644 --- a/azure/macos/job.yml +++ b/azure/macos/job.yml @@ -19,6 +19,7 @@ jobs: export PKG_CONFIG_PATH="$PKG_CONFIG_PATH:/usr/local/opt/icu4c/lib/pkgconfig" ./buildconf --force ./configure ${{ parameters.configurationParameters }} \ + --enable-option-checking=fatal \ --prefix=/usr/local \ --disable-phpdbg \ --enable-fpm \ diff --git a/azure/msan_job.yml b/azure/msan_job.yml index bae65e018e..28dcae3f88 100644 --- a/azure/msan_job.yml +++ b/azure/msan_job.yml @@ -20,6 +20,7 @@ jobs: # msan requires all used libraries to be instrumented, # so we should avoiding linking against anything but libc here ./configure ${{ parameters.configurationParameters }} \ + --enable-option-checking=fatal \ --prefix=/usr \ --without-sqlite3 \ --without-pdo-sqlite \ diff --git a/travis/compile.sh b/travis/compile.sh index e64bc64e6e..045178d6b1 100755 --- a/travis/compile.sh +++ b/travis/compile.sh @@ -5,7 +5,7 @@ else TS=""; fi if [[ "$ENABLE_DEBUG" == 1 ]]; then - DEBUG="--enable-debug --without-pcre-valgrind"; + DEBUG="--enable-debug"; else DEBUG=""; fi @@ -27,6 +27,7 @@ MAKE_JOBS=${MAKE_JOBS:-2} ./buildconf --force ./configure \ +--enable-option-checking=fatal \ --prefix="$HOME"/php-install \ $CONFIG_QUIET \ $DEBUG \ @@ -46,7 +47,7 @@ $TS \ --with-freetype \ --with-xpm \ --enable-exif \ ---enable-zip \ +--with-zip \ --with-zlib \ --with-zlib-dir=/usr \ --enable-soap \ |