summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Eissing <icing@apache.org>2022-05-14 09:09:01 +0000
committerStefan Eissing <icing@apache.org>2022-05-14 09:09:01 +0000
commit1e27ffd880d8d1c3ea894cc5d6919eb5d517f0e0 (patch)
tree5410600ead8f5db3d377f71571b52a26a1017efd
parente6e83f275f4f7e66023a0dec83dfe2ca147bb536 (diff)
downloadhttpd-1e27ffd880d8d1c3ea894cc5d6919eb5d517f0e0.tar.gz
* test: upgrade rustls-ffi version to 0.9.0 which
gets rid of the dependency on cbindgen. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1900875 13f79535-47bb-0310-9956-ffa450edef68
-rwxr-xr-xtest/travis_run_linux.sh8
1 files changed, 3 insertions, 5 deletions
diff --git a/test/travis_run_linux.sh b/test/travis_run_linux.sh
index 409077944b..692e5f82ba 100755
--- a/test/travis_run_linux.sh
+++ b/test/travis_run_linux.sh
@@ -55,15 +55,13 @@ fi
# build the version we want from source
if test -v TEST_MOD_TLS; then
RUSTLS_HOME="$HOME/build/rustls-ffi"
- RUSTLS_VERSION="v0.8.2"
+ RUSTLS_VERSION="v0.9.0"
git clone https://github.com/rustls/rustls-ffi.git "$RUSTLS_HOME"
pushd "$RUSTLS_HOME"
+ # since v0.9.0, there is no longer a dependency on cbindgen
git fetch origin
git checkout tags/$RUSTLS_VERSION
- # force an update to cbindgen as focal seems to deliver v0.12.1
- # always something changes with rust/cargo every few weeks, sigh.
- cargo install --force cbindgen
- PATH="${HOME}/.cargo/bin:${PATH}" make install DESTDIR="$PREFIX"
+ make install DESTDIR="$PREFIX"
popd
CONFIG="$CONFIG --with-tls --with-rustls=$PREFIX"
fi