Skip to content

Commit 66b1ef8

Browse files
nikicausi
authored andcommitted
Place ICU_INSTALL_DIR on PKG_CONFIG_PATH
1 parent 33cb994 commit 66b1ef8

File tree

2 files changed

+5
-1
lines changed

2 files changed

+5
-1
lines changed

.travis.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -91,6 +91,7 @@ install:
9191
export PKG_CONFIG_PATH=$PWD:$PKG_CONFIG_PATH
9292
fi
9393
- ./bin/install-icu
94+
- export PKG_CONFIG_PATH=$ICU_INSTALL_DIR/lib/pkgconfig:$PKG_CONFIG_PATH
9495
- ./bin/install-libzip
9596
- ./bin/install-libsodium
9697
- ./bin/install-password-argon2

bin/install-icu

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,4 +20,7 @@ rm -rf $ICU_INSTALL_DIR
2020
make install
2121
popd
2222

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

0 commit comments

Comments
 (0)