From: Stefan Eissing <icing@apache.org>
Date: Wed, 11 May 2022 08:02:02 +0000 (+0000)
Subject:   *) test: backport the cbindgen workaround for building rustls-ffi
X-Git-Tag: 2.4.54-rc1-candidate~81
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=41e92b9190e3c8eff22ed923841078db9118a810;p=thirdparty%2Fapache%2Fhttpd.git

  *) test: backport the cbindgen workaround for building rustls-ffi
     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
---

diff --git a/test/travis_run_linux.sh b/test/travis_run_linux.sh
index 65b911b45f4..2e2d6c74750 100755
--- a/test/travis_run_linux.sh
+++ b/test/travis_run_linux.sh
@@ -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