]> git.ipfire.org Git - thirdparty/curl.git/commitdiff
travis: adapt to Hyper build change
authorDaniel Stenberg <daniel@haxx.se>
Tue, 5 Jan 2021 23:50:49 +0000 (00:50 +0100)
committerDaniel Stenberg <daniel@haxx.se>
Wed, 6 Jan 2021 14:09:20 +0000 (15:09 +0100)
Closes #6419

docs/HYPER.md
scripts/travis/before_script.sh

index 724257260f1d05013cc8dbcc8c508100cc88e29e..88d6f854a46a3b44dbffd2288e9ba0704014712d 100644 (file)
@@ -24,7 +24,7 @@ Build hyper and enable the C API:
 
      % git clone -b hyper-capi https://github.com/hyperium/hyper
      % cd hyper
-     % cargo build --no-default-features --features ffi
+     % RUSTFLAGS="--cfg hyper_unstable_ffi" cargo build --features client,http1,http2,ffi
 
 Build curl to use hyper's C API:
 
index 162bbaf4136604f72e3f330e2b654424a0254bc4..c82a97c62a1febf6606a03d5e7135b963b197166 100755 (executable)
@@ -6,7 +6,7 @@
 #                            | (__| |_| |  _ <| |___
 #                             \___|\___/|_| \_\_____|
 #
-# Copyright (C) 1998 - 2020, Daniel Stenberg, <daniel@haxx.se>, et al.
+# Copyright (C) 1998 - 2021, Daniel Stenberg, <daniel@haxx.se>, et al.
 #
 # This software is licensed as described in the file COPYING, which
 # you should have received as part of this distribution. The terms
@@ -109,7 +109,7 @@ if [ "$TRAVIS_OS_NAME" = linux -a "$HYPER" ]; then
   curl https://sh.rustup.rs -sSf | sh -s -- -y
   source $HOME/.cargo/env
   cd $HOME/hyper
-  cargo build -v --no-default-features --features ffi
+  RUSTFLAGS="--cfg hyper_unstable_ffi" cargo build --features client,http1,http2,ffi
 fi
 
 if [ "$TRAVIS_OS_NAME" = linux -a "$QUICHE" ]; then