fix

risingwavelabs · Sep 25, 2024 · bc0fc5d · bc0fc5d
1 parent 33f4a2e
commit bc0fc5d
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/ci/scripts/release.sh b/ci/scripts/release.sh
@@ -73,8 +73,8 @@ if [ "${ARCH}" == "aarch64" ]; then
   export JEMALLOC_SYS_WITH_LG_PAGE=16
 fi
 
-cargo build -p risingwave_cmd_all --features "rw-static-link" --features external-udf --features wasm-udf --features js-udf --features openssl-static-link --profile production
-cargo build -p risingwave_cmd --bin risectl --features "rw-static-link" --features openssl-static-link --profile production
+cargo build -p risingwave_cmd_all --features "rw-static-link" --features external-udf --features wasm-udf --features js-udf --features openssl-vendored --profile production
+cargo build -p risingwave_cmd --bin risectl --features "rw-static-link" --features openssl-vendored --profile production
 
 echo "--- check link info"
 check_link_info production

diff --git a/src/cmd/Cargo.toml b/src/cmd/Cargo.toml
@@ -10,7 +10,7 @@ repository = { workspace = true }
 [features]
 rw-static-link = ["workspace-config/rw-static-link"]
 rw-dynamic-link = ["workspace-config/rw-dynamic-link"]
-openssl-static-link = ["workspace-config/openssl-static-link"]
+openssl-vendored = ["workspace-config/openssl-vendored"]
 default = ["rw-static-link"]
 
 [package.metadata.cargo-machete]

diff --git a/src/cmd_all/Cargo.toml b/src/cmd_all/Cargo.toml
@@ -11,7 +11,7 @@ repository = { workspace = true }
 default = ["rw-static-link"]
 rw-static-link = ["workspace-config/rw-static-link"]
 rw-dynamic-link = ["workspace-config/rw-dynamic-link"]
-openssl-static-link = ["workspace-config/openssl-static-link"]
+openssl-vendored = ["workspace-config/openssl-vendored"]
 all-udf = ["external-udf", "wasm-udf", "js-udf", "python-udf"]
 external-udf = ["risingwave_expr_impl/external-udf"]
 wasm-udf = ["risingwave_expr_impl/wasm-udf"]

diff --git a/src/utils/workspace-config/Cargo.toml b/src/utils/workspace-config/Cargo.toml
@@ -11,7 +11,7 @@ repository = { workspace = true }
 [features]
 # some crates opt-in static linking, while some opt-in dynamic linking,
 # so they are two features :)
-openssl-static-link = ["static-openssl-sys"]
+openssl-vendored = ["vendored-openssl-sys"]
 rw-static-link = ["static-libz-sys", "static-lzma-sys", "static-sasl2-sys"]
 rw-dynamic-link = ["dynamic-zstd-sys"]
 
@@ -23,8 +23,8 @@ tracing = { version = "0.1", features = ["release_max_level_debug"] }
 # Static linking
 static-libz-sys = { package = "libz-sys", version = "1", optional = true, features = ["static"] }
 static-lzma-sys = { package = "lzma-sys", version = "0.1", optional = true, features = ["static"] }
-static-openssl-sys = { package = "openssl-sys", version = "0.9.96", optional = true, features = ["vendored"] }
 static-sasl2-sys = { package = "sasl2-sys", version = "0.1", optional = true, features = ["gssapi-vendored"] }
+vendored-openssl-sys = { package = "openssl-sys", version = "0.9.96", optional = true, features = ["vendored"] }
 
 # Dynamic linking
 dynamic-zstd-sys = { package = "zstd-sys", version = "2", optional = true, default-features = false, features = ["pkg-config"] }