From f0b74faa45bd9d5afbb94c852ab71a21b4f8529b Mon Sep 17 00:00:00 2001 From: Glenn Strauss Date: Sat, 16 Jan 2021 16:08:00 -0500 Subject: [build] scripts/ci-build.sh adjustments remove --with-nss; nss libs not currently part of our FreeBSD build img remove with_zstd=yes from SCons build, due to dependency on libpthread --- scripts/ci-build.sh | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'scripts') diff --git a/scripts/ci-build.sh b/scripts/ci-build.sh index 610ccbaa..ffc08f54 100755 --- a/scripts/ci-build.sh +++ b/scripts/ci-build.sh @@ -46,7 +46,6 @@ case "${build}" in --with-nettle \ --with-gnutls \ --with-mbedtls \ - --with-nss \ --with-openssl make make check @@ -72,7 +71,6 @@ case "${build}" in -DWITH_GNUTLS=ON \ -DWITH_MBEDTLS=ON \ -DWITH_NETTLE=ON \ - -DWITH_NSS=ON \ -DWITH_OPENSSL=ON \ -DWITH_WEBDAV_LOCKS=ON \ -DWITH_WEBDAV_PROPS=ON \ @@ -88,9 +86,9 @@ case "${build}" in export LIBS="-ldl" ;; esac - # 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 + # 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 ;; *) echo >&2 "Unknown build system: ${build}" -- cgit v1.2.1