From a280135a2dfd38e7d055e50cab2f4e24db005bb0 Mon Sep 17 00:00:00 2001 From: Zihua Wu Date: Thu, 24 Mar 2022 18:19:01 +0800 Subject: [PATCH 1/6] [hyper] Actually compile the C API --- H/hyper/build_tarballs.jl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/H/hyper/build_tarballs.jl b/H/hyper/build_tarballs.jl index f6e7ac34623..0802ede2886 100644 --- a/H/hyper/build_tarballs.jl +++ b/H/hyper/build_tarballs.jl @@ -14,7 +14,7 @@ sources = [ # Bash recipe for building across all platforms script = raw""" cd $WORKSPACE/srcdir/hyper*/ -cargo build --release +RUSTFLAGS="--cfg hyper_unstable_ffi" cargo build --release --features client,http1,http2,ff install -Dm 755 target/${rust_target}/release/*hyper.${dlext} "${libdir}/libhyper.${dlext}" """ From 68e3c1cc4c22ab20a75c03a6f8305ed3415fc099 Mon Sep 17 00:00:00 2001 From: Zihua Wu Date: Thu, 24 Mar 2022 18:22:53 +0800 Subject: [PATCH 2/6] fix typo --- H/hyper/build_tarballs.jl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/H/hyper/build_tarballs.jl b/H/hyper/build_tarballs.jl index 0802ede2886..ed311fef207 100644 --- a/H/hyper/build_tarballs.jl +++ b/H/hyper/build_tarballs.jl @@ -14,7 +14,7 @@ sources = [ # Bash recipe for building across all platforms script = raw""" cd $WORKSPACE/srcdir/hyper*/ -RUSTFLAGS="--cfg hyper_unstable_ffi" cargo build --release --features client,http1,http2,ff +RUSTFLAGS="--cfg hyper_unstable_ffi" cargo build --release --features client,http1,http2,ffi install -Dm 755 target/${rust_target}/release/*hyper.${dlext} "${libdir}/libhyper.${dlext}" """ From 08af3868b45b4900ea60eea7aa6834bac7d61e0b Mon Sep 17 00:00:00 2001 From: Zihua Wu Date: Thu, 24 Mar 2022 18:55:12 +0800 Subject: [PATCH 3/6] [hyper] update to 0.14.18 --- H/hyper/build_tarballs.jl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/H/hyper/build_tarballs.jl b/H/hyper/build_tarballs.jl index ed311fef207..4bef26bd11d 100644 --- a/H/hyper/build_tarballs.jl +++ b/H/hyper/build_tarballs.jl @@ -3,7 +3,7 @@ using BinaryBuilder name = "hyper" -version = v"0.14.17" +version = v"0.14.18" # Collection of sources required to complete build sources = [ From bfee35e4010dae6d056e254f1b1536dbc4f0479c Mon Sep 17 00:00:00 2001 From: Zihua Wu Date: Thu, 24 Mar 2022 19:04:40 +0800 Subject: [PATCH 4/6] [hyper] update SHA256 sum --- H/hyper/build_tarballs.jl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/H/hyper/build_tarballs.jl b/H/hyper/build_tarballs.jl index 4bef26bd11d..d83f82a741c 100644 --- a/H/hyper/build_tarballs.jl +++ b/H/hyper/build_tarballs.jl @@ -8,7 +8,7 @@ version = v"0.14.18" # Collection of sources required to complete build sources = [ ArchiveSource("https://github.com/hyperium/hyper/archive/refs/tags/v$(version).tar.gz", - "64420fd550f43af09b0722b3504d4fd919de642d63f01ad54108aa854f5f5470"), + "6095636d02ea5af3ff5f06d80b9466f7b58ba76339f39813b33c3f24c663fdef"), ] # Bash recipe for building across all platforms From f27a7b33d0aa1fbe133699b5ae5b9e6594e095e8 Mon Sep 17 00:00:00 2001 From: Zihua Wu Date: Thu, 24 Mar 2022 19:54:48 +0800 Subject: [PATCH 5/6] [hyper] edit Cargo.toml to build dynamic library --- H/hyper/build_tarballs.jl | 1 + 1 file changed, 1 insertion(+) diff --git a/H/hyper/build_tarballs.jl b/H/hyper/build_tarballs.jl index d83f82a741c..870236e366e 100644 --- a/H/hyper/build_tarballs.jl +++ b/H/hyper/build_tarballs.jl @@ -14,6 +14,7 @@ sources = [ # Bash recipe for building across all platforms script = raw""" cd $WORKSPACE/srcdir/hyper*/ +sed '21 a [lib]\ncrate-type=["cdylib"]\n' -i Cargo.toml RUSTFLAGS="--cfg hyper_unstable_ffi" cargo build --release --features client,http1,http2,ffi install -Dm 755 target/${rust_target}/release/*hyper.${dlext} "${libdir}/libhyper.${dlext}" """ From fb035875b5b086981294975479e56de23e0020d2 Mon Sep 17 00:00:00 2001 From: Zihua Wu Date: Thu, 24 Mar 2022 20:46:35 +0800 Subject: [PATCH 6/6] Update build_tarballs.jl --- H/hyper/build_tarballs.jl | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/H/hyper/build_tarballs.jl b/H/hyper/build_tarballs.jl index 870236e366e..ed311fef207 100644 --- a/H/hyper/build_tarballs.jl +++ b/H/hyper/build_tarballs.jl @@ -3,18 +3,17 @@ using BinaryBuilder name = "hyper" -version = v"0.14.18" +version = v"0.14.17" # Collection of sources required to complete build sources = [ ArchiveSource("https://github.com/hyperium/hyper/archive/refs/tags/v$(version).tar.gz", - "6095636d02ea5af3ff5f06d80b9466f7b58ba76339f39813b33c3f24c663fdef"), + "64420fd550f43af09b0722b3504d4fd919de642d63f01ad54108aa854f5f5470"), ] # Bash recipe for building across all platforms script = raw""" cd $WORKSPACE/srcdir/hyper*/ -sed '21 a [lib]\ncrate-type=["cdylib"]\n' -i Cargo.toml RUSTFLAGS="--cfg hyper_unstable_ffi" cargo build --release --features client,http1,http2,ffi install -Dm 755 target/${rust_target}/release/*hyper.${dlext} "${libdir}/libhyper.${dlext}" """