diff options
| author | Glenn Strauss <gstrauss@gluelogic.com> | 2021-01-16 15:28:15 -0500 |
|---|---|---|
| committer | Glenn Strauss <gstrauss@gluelogic.com> | 2021-01-16 15:30:53 -0500 |
| commit | 2d94d56fe53ecc7dc331fc7ed6133cb545cd4c69 (patch) | |
| tree | 2a31f421e95b9eece85a011e96350b40beee8de9 /scripts | |
| parent | db1ca2a60f3b19a097363cde0d8e532cdfd2082e (diff) | |
| download | lighttpd-git-2d94d56fe53ecc7dc331fc7ed6133cb545cd4c69.tar.gz | |
[build] update scripts/ci-build.sh
* remove use of deprecated or obsolete packages on Linux, *BSD builds
--with-attr --with-fam --with-geoip
* add zstd
--with-zstd
* add multiple TLS options to build
--with-gnutls --with-mbedtls --with-nss --with-openssl --with-wolfssl
(leave one TLS option (openssl) for SCons static build)
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/ci-build.sh | 39 |
1 files changed, 26 insertions, 13 deletions
diff --git a/scripts/ci-build.sh b/scripts/ci-build.sh index b04ec351..dd318e52 100755 --- a/scripts/ci-build.sh +++ b/scripts/ci-build.sh @@ -17,11 +17,16 @@ case "${build}" in ./configure \ --with-pic --enable-extra-warnings \ --with-dbi --with-mysql --with-pgsql \ - --with-ldap --with-attr --with-openssl --with-pcre \ - --with-zlib --with-brotli --with-bzip2 \ - --with-webdav-props --with-webdav-locks --with-fam --with-gdbm \ + --with-ldap --with-pcre \ + --with-zlib --with-zstd --with-brotli --with-bzip2 \ + --with-webdav-props --with-webdav-locks --with-gdbm \ --with-memcached --with-lua --with-libev --with-libunwind \ - --with-krb5 --with-geoip + --with-krb5 \ + --with-gnutls \ + --with-mbedtls \ + --with-nss \ + --with-openssl \ + --with-wolfssl make clean export PATH="${COVERITY_PATH}" cov-build --dir "cov-int" make @@ -32,11 +37,16 @@ case "${build}" in ./configure \ --with-pic --enable-extra-warnings \ --with-dbi --with-mysql --with-pgsql \ - --with-ldap --with-attr --with-openssl --with-pcre \ - --with-zlib --with-brotli --with-bzip2 \ - --with-webdav-props --with-webdav-locks --with-fam --with-gdbm \ + --with-ldap --with-pcre \ + --with-zlib --with-zstd --with-brotli --with-bzip2 \ + --with-webdav-props --with-webdav-locks --with-gdbm \ --with-memcached --with-lua --with-libev --with-libunwind \ - --with-krb5 --with-geoip --with-sasl + --with-krb5 --with-sasl \ + --with-gnutls \ + --with-mbedtls \ + --with-nss \ + --with-openssl \ + --with-wolfssl make make check ;; @@ -46,9 +56,9 @@ case "${build}" in cmake \ -DBUILD_EXTRA_WARNINGS=ON \ -DCMAKE_BUILD_TYPE=RelWithDebInfo \ + -DWITH_ZSTD=ON \ -DWITH_BROTLI=ON \ -DWITH_BZIP=ON \ - -DWITH_FAM=ON \ -DWITH_GDBM=ON \ -DWITH_LDAP=ON \ -DWITH_LIBEV=ON \ @@ -58,10 +68,13 @@ case "${build}" in -DWITH_DBI=ON \ -DWITH_MYSQL=ON \ -DWITH_PGSQL=ON \ + -DWITH_GNUTLS=ON \ + -DWITH_MBEDTLS=ON \ + -DWITH_NSS=ON \ -DWITH_OPENSSL=ON \ + -DWITH_WOLFSSL=ON \ -DWITH_WEBDAV_LOCKS=ON \ -DWITH_WEBDAV_PROPS=ON \ - -DWITH_XATTR=ON \ .. make ctest -V @@ -74,9 +87,9 @@ case "${build}" in export LIBS="-ldl" ;; 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_zlib=yes with_zstd=yes with_brotli=yes with_bzip2=yes with_openssl=yes -k check_fullstatic + # scons with_zlib=yes with_zstd=yes with_brotli=yes with_bzip2=yes with_openssl=yes with_memcached=yes -k check_static check_dynamic + scons with_zlib=yes with_zstd=yes with_brotli=yes with_bzip2=yes with_openssl=yes -k check_fullstatic check_static check_dynamic ;; *) echo >&2 "Unknown build system: ${build}" |