diff --git a/.github/cargo-blacklist.txt b/.github/cargo-blacklist.txt index 32e7878a86db..d2f071130ee9 100644 --- a/.github/cargo-blacklist.txt +++ b/.github/cargo-blacklist.txt @@ -1,2 +1,3 @@ native-tls openssl +aws-lc-sys diff --git a/.github/workflows/develop.yml b/.github/workflows/develop.yml index 80a4f042c0f7..6eccbe65b811 100644 --- a/.github/workflows/develop.yml +++ b/.github/workflows/develop.yml @@ -269,13 +269,6 @@ jobs: - name: Install cargo-gc-bin shell: bash run: cargo install cargo-gc-bin - - name: Check aws-lc-sys will not build - shell: bash - run: | - if cargo tree -i aws-lc-sys -e features | grep -q aws-lc-sys; then - echo "Found aws-lc-sys, which has compilation problems on older gcc versions. Please replace it with ring until its building experience improves." - exit 1 - fi - name: Build greptime bianry shell: bash # `cargo gc` will invoke `cargo build` with specified args diff --git a/Cargo.lock b/Cargo.lock index 177625a65955..628c6a582418 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -798,21 +798,6 @@ dependencies = [ "cc", ] -[[package]] -name = "aws-lc-sys" -version = "0.21.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b3ddc4a5b231dd6958b140ff3151b6412b3f4321fab354f399eec8f14b06df62" -dependencies = [ - "bindgen 0.69.4", - "cc", - "cmake", - "dunce", - "fs_extra", - "libc", - "paste", -] - [[package]] name = "axum" version = "0.6.20" @@ -993,29 +978,6 @@ dependencies = [ "serde", ] -[[package]] -name = "bindgen" -version = "0.69.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a00dc851838a2120612785d195287475a3ac45514741da670b735818822129a0" -dependencies = [ - "bitflags 2.6.0", - "cexpr", - "clang-sys", - "itertools 0.12.1", - "lazy_static", - "lazycell", - "log", - "prettyplease", - "proc-macro2", - "quote", - "regex", - "rustc-hash 1.1.0", - "shlex", - "syn 2.0.90", - "which", -] - [[package]] name = "bindgen" version = "0.70.1" @@ -3719,12 +3681,6 @@ version = "1.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "75b325c5dbd37f80359721ad39aca5a29fb04c89279657cffdda8736d0c0b9d2" -[[package]] -name = "dunce" -version = "1.0.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "92773504d58c093f6de2459af4af33faa518c13451eb8f2b5698ed3d36e7c813" - [[package]] name = "duration-str" version = "0.11.2" @@ -4314,12 +4270,6 @@ dependencies = [ "windows-sys 0.52.0", ] -[[package]] -name = "fs_extra" -version = "1.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "42703706b716c37f96a77aea830392ad231f44c9e9a67872fa5548707e11b11c" - [[package]] name = "fsevent-sys" version = "4.1.0" @@ -5955,12 +5905,6 @@ dependencies = [ "spin 0.9.8", ] -[[package]] -name = "lazycell" -version = "1.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55" - [[package]] name = "levenshtein_automata" version = "0.2.1" @@ -6966,7 +6910,7 @@ checksum = "06f19e4cfa0ab5a76b627cec2d81331c49b034988eaf302c3bafeada684eadef" dependencies = [ "base64 0.21.7", "bigdecimal 0.4.5", - "bindgen 0.70.1", + "bindgen", "bitflags 2.6.0", "bitvec", "btoi", @@ -7005,7 +6949,7 @@ checksum = "478b0ff3f7d67b79da2b96f56f334431aef65e15ba4b29dd74a4236e29582bdc" dependencies = [ "base64 0.21.7", "bigdecimal 0.4.5", - "bindgen 0.70.1", + "bindgen", "bitflags 2.6.0", "bitvec", "btoi", @@ -10876,7 +10820,6 @@ dependencies = [ "arrow-schema", "async-trait", "auth", - "aws-lc-sys", "axum", "axum-macros", "base64 0.21.7", diff --git a/src/servers/Cargo.toml b/src/servers/Cargo.toml index c01560724931..ddfeaf27bd45 100644 --- a/src/servers/Cargo.toml +++ b/src/servers/Cargo.toml @@ -139,11 +139,6 @@ tokio-test = "0.4" [target.'cfg(unix)'.dev-dependencies] pprof = { version = "0.13", features = ["criterion", "flamegraph"] } -[target.'cfg(windows)'.dependencies] -aws-lc-sys = { version = "0.21.0", features = [ - "prebuilt-nasm", -] } # use prebuilt nasm on windows per https://github.com/aws/aws-lc-rs/blob/main/aws-lc-sys/README.md#use-of-prebuilt-nasm-objects - [build-dependencies] common-version.workspace = true