chore: static features for async-compression deps (#14711)

fix: update async-compression
databendlabs · Feb 23, 2024 · e845de9 · e845de9
1 parent 5d06510
commit e845de9
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 7 deletions.
diff --git a/.github/actions/build_linux/action.yml b/.github/actions/build_linux/action.yml
@@ -108,8 +108,12 @@ runs:
         done
         ls -lh ./target/${{ inputs.target }}/${{ env.BUILD_PROFILE }}/databend-$artifact
 
-    - shell: bash
-      run: readelf -p .comment ./target/${{ inputs.target }}/${{ env.BUILD_PROFILE }}/databend-query
+    - name: Check Binary Info
+      shell: bash
+      continue-on-error: true
+      run: |
+        readelf -p .comment ./target/${{ inputs.target }}/${{ env.BUILD_PROFILE }}/databend-query
+        ldd ./target/${{ inputs.target }}/${{ env.BUILD_PROFILE }}/databend-query
 
     # - name: Compress Binaries with UPX
     #   if: env.BUILD_PROFILE == 'debug'

diff --git a/.github/actions/build_linux_sanitizer/action.yml b/.github/actions/build_linux_sanitizer/action.yml
@@ -57,8 +57,10 @@ runs:
         done
         ls -lh ./target/${{ inputs.target }}/${{ env.BUILD_PROFILE }}/databend-*
 
-    - name: Read elf
+    - name: Check Binary Info
       if: env.BUILD_PROFILE == 'debug' && endsWith(inputs.target, '-gnu')
       shell: bash
+      continue-on-error: true
       run: |
         readelf -p .comment ./target/${{ inputs.target }}/${{ env.BUILD_PROFILE }}/databend-query
+        ldd ./target/${{ inputs.target }}/${{ env.BUILD_PROFILE }}/databend-query
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/docker/build-tool/base/Dockerfile b/docker/build-tool/base/Dockerfile
@@ -25,11 +25,14 @@ RUN chmod +x /build/scripts/setup/dev_setup.sh && \
 
 RUN ln -s $(readlink -f `which javac` | sed "s:/bin/javac::") /opt/java
 
-RUN curl -sSfLo /tmp/mold.tar.gz https://github.com/rui314/mold/releases/download/v2.0.0/mold-2.0.0-$(uname -m)-linux.tar.gz && \
+RUN curl -sSfLo /tmp/mold.tar.gz https://github.com/rui314/mold/releases/download/v2.4.0/mold-2.4.0-$(uname -m)-linux.tar.gz && \
     tar --strip-components=1 -xzf /tmp/mold.tar.gz -C /usr/local && \
     rm -rf /tmp/mold.tar.gz && \
     ln -sf /usr/local/bin/mold /usr/bin/$(uname -m)-linux-gnu-ld
 
+ENV LIBZ_SYS_STATIC=1
+ENV LZMA_API_STATIC=1
+
 ENV JAVA_HOME /opt/java
 ENV LD_LIBRARY_PATH /opt/java/lib/server
 ENV RUSTUP_HOME /opt/rust/rustup

diff --git a/scripts/setup/dev_setup.sh b/scripts/setup/dev_setup.sh
@@ -630,7 +630,6 @@ fi
 
 if [[ "$INSTALL_CHECK_TOOLS" == "true" ]]; then
 	if [[ -f scripts/setup/rust-tools.txt ]]; then
-		export RUSTFLAGS="-C target-feature=-crt-static"
 		while read -r tool; do
 			# Use cargo install to prevent downloading the tools with incompatible GLIBC
 			cargo install "$tool"

diff --git a/src/common/compress/Cargo.toml b/src/common/compress/Cargo.toml
@@ -8,7 +8,7 @@ edition = { workspace = true }
 
 [dependencies]
 # Temp workaround, should come back to tagged version after https://github.com/Nemo157/async-compression/issues/150 resolved.
-async-compression = { git = "https://github.com/youngsofun/async-compression", rev = "1568ceafd", features = [
+async-compression = { git = "https://github.com/everpcpc/async-compression", rev = "dc81082", features = [
     "futures-io",
     "all-algorithms",
 ] }