Skip to content

Commit dc01d2b

Browse files
committed
Fix 7.4.x build
1 parent d8c8513 commit dc01d2b

File tree

3 files changed

+3
-2
lines changed

3 files changed

+3
-2
lines changed

.travis.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -252,6 +252,7 @@ before_script:
252252

253253
script:
254254
- cat $HOME/.php-build/share/php-build/default_configure_options
255+
- export PKG_CONFIG_PATH="$HOME/.phpenv/versions/$VERSION/lib/pkgconfig:$PKG_CONFIG_PATH"
255256
- ./bin/compile
256257
- | # disable 3rd-party extension builds on master
257258
if [[ ! $VERSION =~ ^master$ ]]; then

bin/install-libsodium

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,5 +24,5 @@ popd
2424
if [[ ! $VERSION =~ ^master$ ]] && [[ "$(printf "7.4\n$VERSION" | sort -V | head -n1)" < "7.4" ]]; then
2525
echo "--with-sodium=$LIBSODIUM_INSTALL_DIR" >> $TRAVIS_BUILD_DIR/custom_configure_options
2626
else
27-
echo "--with-libsodium=$LIBSODIUM_INSTALL_DIR" >> $TRAVIS_BUILD_DIR/custom_configure_options
27+
echo "--with-sodium" >> $TRAVIS_BUILD_DIR/custom_configure_options
2828
fi

bin/install-libzip

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,5 +41,5 @@ popd
4141
if [[ "$(printf "7.4\n$VERSION" | sort -V | head -n1)" < "7.4" ]]; then
4242
echo "--with-libzip=$LIBZIP_INSTALL_DIR" >> $TRAVIS_BUILD_DIR/custom_configure_options
4343
else
44-
echo "--with-zip=$LIBZIP_INSTALL_DIR" >> $TRAVIS_BUILD_DIR/custom_configure_options
44+
echo "--with-zip" >> $TRAVIS_BUILD_DIR/custom_configure_options
4545
fi

0 commit comments

Comments
 (0)