Merge branch 'PHP-7.4'

* PHP-7.4:
  Enable option checking on CI
This commit is contained in:
Joe Watkins 2019-07-03 08:16:47 +02:00
commit 4fb595d8b7
No known key found for this signature in database
GPG key ID: F9BA0ADA31CBD89E
5 changed files with 7 additions and 2 deletions

View file

@ -15,6 +15,7 @@ jobs:
export LDFLAGS=-L/usr/lib/i386-linux-gnu export LDFLAGS=-L/usr/lib/i386-linux-gnu
export PKG_CONFIG=/usr/bin/i686-linux-gnu-pkg-config export PKG_CONFIG=/usr/bin/i686-linux-gnu-pkg-config
./configure ${{ parameters.configurationParameters }} \ ./configure ${{ parameters.configurationParameters }} \
--enable-option-checking=fatal \
--prefix=/usr \ --prefix=/usr \
--enable-phpdbg \ --enable-phpdbg \
--enable-fpm \ --enable-fpm \

View file

@ -14,6 +14,7 @@ jobs:
- script: | - script: |
./buildconf --force ./buildconf --force
./configure ${{ parameters.configurationParameters }} \ ./configure ${{ parameters.configurationParameters }} \
--enable-option-checking=fatal \
--prefix=/usr \ --prefix=/usr \
--enable-phpdbg \ --enable-phpdbg \
--enable-fpm \ --enable-fpm \

View file

@ -19,6 +19,7 @@ jobs:
export PKG_CONFIG_PATH="$PKG_CONFIG_PATH:/usr/local/opt/icu4c/lib/pkgconfig" export PKG_CONFIG_PATH="$PKG_CONFIG_PATH:/usr/local/opt/icu4c/lib/pkgconfig"
./buildconf --force ./buildconf --force
./configure ${{ parameters.configurationParameters }} \ ./configure ${{ parameters.configurationParameters }} \
--enable-option-checking=fatal \
--prefix=/usr/local \ --prefix=/usr/local \
--disable-phpdbg \ --disable-phpdbg \
--enable-fpm \ --enable-fpm \

View file

@ -20,6 +20,7 @@ jobs:
# msan requires all used libraries to be instrumented, # msan requires all used libraries to be instrumented,
# so we should avoiding linking against anything but libc here # so we should avoiding linking against anything but libc here
./configure ${{ parameters.configurationParameters }} \ ./configure ${{ parameters.configurationParameters }} \
--enable-option-checking=fatal \
--prefix=/usr \ --prefix=/usr \
--without-sqlite3 \ --without-sqlite3 \
--without-pdo-sqlite \ --without-pdo-sqlite \

View file

@ -5,7 +5,7 @@ else
TS=""; TS="";
fi fi
if [[ "$ENABLE_DEBUG" == 1 ]]; then if [[ "$ENABLE_DEBUG" == 1 ]]; then
DEBUG="--enable-debug --without-pcre-valgrind"; DEBUG="--enable-debug";
else else
DEBUG=""; DEBUG="";
fi fi
@ -27,6 +27,7 @@ MAKE_JOBS=${MAKE_JOBS:-2}
./buildconf --force ./buildconf --force
./configure \ ./configure \
--enable-option-checking=fatal \
--prefix="$HOME"/php-install \ --prefix="$HOME"/php-install \
$CONFIG_QUIET \ $CONFIG_QUIET \
$DEBUG \ $DEBUG \
@ -46,7 +47,7 @@ $TS \
--with-freetype \ --with-freetype \
--with-xpm \ --with-xpm \
--enable-exif \ --enable-exif \
--enable-zip \ --with-zip \
--with-zlib \ --with-zlib \
--with-zlib-dir=/usr \ --with-zlib-dir=/usr \
--enable-soap \ --enable-soap \