Skip to content

Commit 4fb595d

Browse files
committed
Merge branch 'PHP-7.4'
* PHP-7.4: Enable option checking on CI
2 parents 0baf815 + a45192e commit 4fb595d

File tree

5 files changed

+7
-2
lines changed

5 files changed

+7
-2
lines changed

azure/i386/job.yml

+1
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ jobs:
1515
export LDFLAGS=-L/usr/lib/i386-linux-gnu
1616
export PKG_CONFIG=/usr/bin/i686-linux-gnu-pkg-config
1717
./configure ${{ parameters.configurationParameters }} \
18+
--enable-option-checking=fatal \
1819
--prefix=/usr \
1920
--enable-phpdbg \
2021
--enable-fpm \

azure/job.yml

+1
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ jobs:
1414
- script: |
1515
./buildconf --force
1616
./configure ${{ parameters.configurationParameters }} \
17+
--enable-option-checking=fatal \
1718
--prefix=/usr \
1819
--enable-phpdbg \
1920
--enable-fpm \

azure/macos/job.yml

+1
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ jobs:
1919
export PKG_CONFIG_PATH="$PKG_CONFIG_PATH:/usr/local/opt/icu4c/lib/pkgconfig"
2020
./buildconf --force
2121
./configure ${{ parameters.configurationParameters }} \
22+
--enable-option-checking=fatal \
2223
--prefix=/usr/local \
2324
--disable-phpdbg \
2425
--enable-fpm \

azure/msan_job.yml

+1
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ jobs:
2020
# msan requires all used libraries to be instrumented,
2121
# so we should avoiding linking against anything but libc here
2222
./configure ${{ parameters.configurationParameters }} \
23+
--enable-option-checking=fatal \
2324
--prefix=/usr \
2425
--without-sqlite3 \
2526
--without-pdo-sqlite \

travis/compile.sh

+3-2
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ else
55
TS="";
66
fi
77
if [[ "$ENABLE_DEBUG" == 1 ]]; then
8-
DEBUG="--enable-debug --without-pcre-valgrind";
8+
DEBUG="--enable-debug";
99
else
1010
DEBUG="";
1111
fi
@@ -27,6 +27,7 @@ MAKE_JOBS=${MAKE_JOBS:-2}
2727

2828
./buildconf --force
2929
./configure \
30+
--enable-option-checking=fatal \
3031
--prefix="$HOME"/php-install \
3132
$CONFIG_QUIET \
3233
$DEBUG \
@@ -46,7 +47,7 @@ $TS \
4647
--with-freetype \
4748
--with-xpm \
4849
--enable-exif \
49-
--enable-zip \
50+
--with-zip \
5051
--with-zlib \
5152
--with-zlib-dir=/usr \
5253
--enable-soap \

0 commit comments

Comments
 (0)