From 2f09edab598e204faac394cf9ec5dc5c2941b7f2 Mon Sep 17 00:00:00 2001 From: Charlie Marsh Date: Thu, 18 Jan 2024 13:12:17 -0500 Subject: [PATCH] Temporary stuff --- .github/workflows/build-binaries.yml | 15 +++++++++++++++ Cargo.toml | 2 +- 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build-binaries.yml b/.github/workflows/build-binaries.yml index 3b3f566ff72d6..5aefddd5ffa90 100644 --- a/.github/workflows/build-binaries.yml +++ b/.github/workflows/build-binaries.yml @@ -223,6 +223,21 @@ jobs: target: ${{ matrix.target }} manylinux: auto args: --release --locked --out dist + # See: https://github.com/sfackler/rust-openssl/issues/2036#issuecomment-1724324145 + before-script-linux: | + # If we're running on rhel centos, install needed packages. + if command -v yum &> /dev/null; then + yum update -y && yum install -y perl-core openssl openssl-devel pkgconfig libatomic + + # If we're running on i686 we need to symlink libatomic + # in order to build openssl with -latomic flag. + if [[ ! -d "/usr/lib64" ]]; then + ln -s /usr/lib/libatomic.so.1 /usr/lib/libatomic.so + fi + else + # If we're running on debian-based system. + apt update -y && apt-get install -y libssl-dev openssl pkg-config + fi - name: "Test wheel" if: ${{ startsWith(matrix.target, 'x86_64') }} run: | diff --git a/Cargo.toml b/Cargo.toml index 7dfce4976b157..8e35ae318eba6 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -34,7 +34,7 @@ dirs = { version = "5.0.1" } # This tells flate2 (and all libraries that depend on it, including async_compression # and async_zip) to use zlib-ng, which about 2x faster than the default flate2 backend # at decompression. See https://github.com/rust-lang/flate2-rs#backends -flate2 = { version = "1.0.28", features = ["zlib-ng"], default-features = false } +# flate2 = { version = "1.0.28", features = ["zlib-ng"], default-features = false } fs-err = { version = "2.11.0" } fs2 = { version = "0.4.3" } futures = { version = "0.3.30" }