From be5ab2765cc318fab069ddfd179f9e6854f056b9 Mon Sep 17 00:00:00 2001 From: Glenn Strauss Date: Tue, 23 Nov 2021 03:14:03 -0500 Subject: [build] CI builds now use pcre2 (upgrade pcre) pcre2 is current. pcre is no longer maintained. --- scripts/ci-build.sh | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'scripts') diff --git a/scripts/ci-build.sh b/scripts/ci-build.sh index 0d990b79..b1e3ee0c 100755 --- a/scripts/ci-build.sh +++ b/scripts/ci-build.sh @@ -17,7 +17,7 @@ case "${build}" in ./configure \ --with-pic --enable-extra-warnings \ --with-dbi --with-mysql --with-pgsql \ - --with-ldap --with-pcre \ + --with-ldap --with-pcre2 \ --with-zlib --with-zstd --with-brotli --with-bzip2 \ --with-webdav-props --with-webdav-locks --with-gdbm \ --with-memcached --with-lua --with-libev --with-libunwind \ @@ -38,7 +38,7 @@ case "${build}" in ./configure \ --with-pic --enable-extra-warnings \ --with-dbi --with-mysql --with-pgsql \ - --with-ldap --with-pcre \ + --with-ldap --with-pcre2 \ --with-zlib --with-zstd --with-brotli --with-bzip2 \ --with-webdav-props --with-webdav-locks --with-gdbm \ --with-memcached --with-lua --with-libev --with-libunwind \ @@ -55,6 +55,7 @@ case "${build}" in cmake \ -DBUILD_EXTRA_WARNINGS=ON \ -DCMAKE_BUILD_TYPE=RelWithDebInfo \ + -DWITH_PCRE2=ON \ -DWITH_ZSTD=ON \ -DWITH_BROTLI=ON \ -DWITH_BZIP=ON \ @@ -86,7 +87,7 @@ case "${build}" in esac # scons with_zlib=yes with_brotli=yes with_bzip2=yes with_openssl=yes -k check_fullstatic # scons with_zlib=yes with_brotli=yes with_bzip2=yes with_openssl=yes with_memcached=yes -k check_static check_dynamic - scons with_zlib=yes with_brotli=yes with_bzip2=yes with_openssl=yes -k check_fullstatic check_static check_dynamic + scons with_pcre2=yes with_zlib=yes with_brotli=yes with_bzip2=yes with_openssl=yes -k check_fullstatic check_static check_dynamic ;; *) echo >&2 "Unknown build system: ${build}" -- cgit v1.2.1