]> git.ipfire.org Git - thirdparty/apache/httpd.git/commitdiff
*) test: backport the cbindgen workaround for building rustls-ffi
authorStefan Eissing <icing@apache.org>
Wed, 11 May 2022 08:02:02 +0000 (08:02 +0000)
committerStefan Eissing <icing@apache.org>
Wed, 11 May 2022 08:02:02 +0000 (08:02 +0000)
     so that rustc and cbindget are in a combination that works on
     focal.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1900804 13f79535-47bb-0310-9956-ffa450edef68

test/travis_run_linux.sh

index 65b911b45f46b1ec3614688c78e4440bec0876ff..2e2d6c74750abb5a75f4e94a215bcc4368abae67 100755 (executable)
@@ -60,7 +60,10 @@ if test -v TEST_MOD_TLS; then
   pushd "$RUSTLS_HOME"
     git fetch origin
     git checkout tags/$RUSTLS_VERSION
-    make install DESTDIR="$PREFIX"
+    # 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"
   popd
   CONFIG="$CONFIG --with-tls --with-rustls=$PREFIX"
 fi