summaryrefslogtreecommitdiff
path: root/.travis.yml
diff options
context:
space:
mode:
authorOtto Kekäläinen <otto@kekalainen.net>2020-03-16 16:13:16 +0200
committerVicențiu-Marian Ciorbaru <vicentiu@mariadb.org>2020-03-18 22:49:55 +0200
commit0f8d6e3bd8adb76de1be8f67bbf4a8585bbe3653 (patch)
tree814afd2a447e77d30c835660824aa2867e8a91a9 /.travis.yml
parentc235691d67c9506385c744821b3d5c52089d2265 (diff)
downloadmariadb-git-0f8d6e3bd8adb76de1be8f67bbf4a8585bbe3653.tar.gz
MDEV-21942: Correctly use newer libpcre2 version (regression in b6b6980)
If libpcre2 (10.x) is not defined and only the older libpcre3 (8.x) would be available, the build would attempt to download it from the Internet, violating many build environment restrictions. Commit b6b69806867b88f3aab82c34a3a881931628ef9e attempted to fix MDEV-21942 but was incomplete, and after in CI systems started failing since the .travis.yml update was missing.
Diffstat (limited to '.travis.yml')
-rw-r--r--.travis.yml2
1 files changed, 1 insertions, 1 deletions
diff --git a/.travis.yml b/.travis.yml
index 80d954018bf..b428950bdc5 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -51,7 +51,7 @@ addons:
- libjudy-dev
- libncurses5-dev
- libpam0g-dev
- - libpcre3-dev
+ - libpcre2-dev
- libreadline-gplv2-dev
- libstemmer-dev
- libssl-dev