File tree Expand file tree Collapse file tree 2 files changed +5
-1
lines changed Expand file tree Collapse file tree 2 files changed +5
-1
lines changed Original file line number Diff line number Diff line change @@ -91,6 +91,7 @@ install:
91
91
export PKG_CONFIG_PATH=$PWD:$PKG_CONFIG_PATH
92
92
fi
93
93
- ./bin/install-icu
94
+ - export PKG_CONFIG_PATH=$ICU_INSTALL_DIR/lib/pkgconfig:$PKG_CONFIG_PATH
94
95
- ./bin/install-libzip
95
96
- ./bin/install-libsodium
96
97
- ./bin/install-password-argon2
Original file line number Diff line number Diff line change @@ -20,4 +20,7 @@ rm -rf $ICU_INSTALL_DIR
20
20
make install
21
21
popd
22
22
23
- echo " --with-icu-dir=$ICU_INSTALL_DIR " >> $TRAVIS_BUILD_DIR /default_configure_options.${RELEASE}
23
+ # PHP >= 7.4 exclusively uses pkg-config for ICU
24
+ if [[ $VERSION =~ ^5 || $VERSION =~ 7\. [0123] ]]; then
25
+ echo " --with-icu-dir=$ICU_INSTALL_DIR " >> $TRAVIS_BUILD_DIR /default_configure_options.${RELEASE}
26
+ fi
You can’t perform that action at this time.
0 commit comments