From d3233ce8b679fb89e63ca922e010f75f305c33f1 Mon Sep 17 00:00:00 2001
From: Jason Volk <jason@zemos.net>
Date: Sat, 31 May 2025 00:26:53 +0000
Subject: [PATCH] docker: Add build-overrides for custom external rocksdb.

Signed-off-by: Jason Volk <jason@zemos.net>
---
 docker/Dockerfile.ingredients |   4 +-
 docker/Dockerfile.rocksdb     |   1 -
 docker/bake.hcl               | 103 +++++++++++++++++++++++++++++-----
 3 files changed, 91 insertions(+), 17 deletions(-)

diff --git a/docker/Dockerfile.ingredients b/docker/Dockerfile.ingredients
index f0a288a9..6da28e6f 100644
--- a/docker/Dockerfile.ingredients
+++ b/docker/Dockerfile.ingredients
@@ -27,7 +27,7 @@ ARG CARGO_TERM_VERBOSE=0
 ARG RUST_BACKTRACE
 ARG JEMALLOC_OVERRIDE
 #ARG ZSTD_SYS_USE_PKG_CONFIG=0
-#ARG ROCKSDB_LIB_DIR
+ARG ROCKSDB_LIB_DIR
 
 WORKDIR /
 COPY --link --from=input . .
@@ -39,7 +39,7 @@ ENV CARGO_TERM_VERBOSE="${CARGO_TERM_VERBOSE}"
 ENV RUST_BACKTRACE="${RUST_BACKTRACE}"
 ENV JEMALLOC_OVERRIDE="${JEMALLOC_OVERRIDE}"
 #ENV ZSTD_SYS_USE_PKG_CONFIG="${ZSTD_SYS_USE_PKG_CONFIG}"
-#ENV ROCKSDB_LIB_DIR="${ROCKSDB_LIB_DIR}"
+ENV ROCKSDB_LIB_DIR="${ROCKSDB_LIB_DIR}"
 RUN \
 --mount=type=cache,dst=${RUSTUP_HOME},sharing=locked \
 --mount=type=cache,dst=${CARGO_HOME},sharing=locked \
diff --git a/docker/Dockerfile.rocksdb b/docker/Dockerfile.rocksdb
index af2db43e..12dd1638 100644
--- a/docker/Dockerfile.rocksdb
+++ b/docker/Dockerfile.rocksdb
@@ -42,7 +42,6 @@ RUN \
 <<EOF
     set -eux
 
-    LDFLAGS="-Wl,--strip-all" \
     cmake -H. -Bbuild \
         "-DCMAKE_RULE_MESSAGES:BOOL=${rocksdb_make_rule_messages}" \
         "-DCMAKE_VERBOSE_MAKEFILE:BOOL=${rocksdb_make_verbose}" \
diff --git a/docker/bake.hcl b/docker/bake.hcl
index 0343254d..b01f0009 100644
--- a/docker/bake.hcl
+++ b/docker/bake.hcl
@@ -136,28 +136,50 @@ nightly_rustflags = [
     "--allow=unstable-features",
     "-Zcrate-attr=feature(test)",
     "-Zenforce-type-length-limit",
+    #"-Ztime-passes",
+    #"-Ztime-llvm-passes",
+]
+
+static_rustflags = [
+    "-Crelocation-model=static",
+    "-Ctarget-feature=+crt-static",
+    "-Clink-arg=--verbose",
+    "-Clink-arg=-Wl,--gc-sections",
+    "-Clink-arg=-L/usr/lib/gcc/x86_64-linux-gnu/14",     # FIXME
+    "-Clink-arg=-l:libstdc++.a",
+    "-Clink-arg=-l:libc.a",
+    "-Clink-arg=-l:libm.a",
+]
+
+dynamic_rustflags = [
+    "-Crelocation-model=pic",
+    "-Ctarget-feature=-crt-static",
+    "-Clink-arg=--verbose",
+    "-Clink-arg=-Wl,--gc-sections",
+    "-Clink-arg=-Wl,--as-needed",
+    "-Clink-arg=-lstdc++",
+    "-Clink-arg=-lc",
+    "-Clink-arg=-lm",
+]
+
+static_nightly_rustflags = [
+    "-Ztls-model=local-exec",
 ]
 
 rmp_rustflags = [
     "-Ctarget-cpu=native",
     "-Ztune-cpu=native",
-    "-Ctarget-feature=+crt-static",
-    "-Crelocation-model=static",
-    "-Ztls-model=local-exec",
     "-Zinline-mir=true",
     "-Zmir-opt-level=3",
-    "-Clink-arg=-Wl,--gc-sections",
-    #"-Ztime-passes",
-    #"-Ztime-llvm-passes",
 ]
 
-rmp_bo_rustflags = [
+override_rustflags = [
     "-Crelocation-model=pic",
     "-Ctarget-feature=-crt-static",
     "-Clink-arg=-Wl,--no-gc-sections",
 ]
 
-rmp_macro_rustflags = [
+macro_rustflags = [
     "-Crelocation-model=pic",
     "-Ctarget-feature=-crt-static",
 ]
@@ -1054,10 +1076,63 @@ target "deps-base" {
         CARGO_PROFILE_bench_CODEGEN_UNITS = "1"
         CARGO_BUILD_RUSTFLAGS = (
             cargo_profile == "release-max-perf"?
-                join(" ", [join(" ", nightly_rustflags), join(" ", rmp_rustflags)]):
+                join(" ", [
+                    join(" ", nightly_rustflags),
+                    contains(split(",", cargo_feat_sets[feat_set]), "zstd_compression")?
+                        "-Clink-arg=-l:libzstd.a": "",
+                    contains(split(",", cargo_feat_sets[feat_set]), "io_uring")?
+                        "-Clink-arg=-l:liburing.a": "",
+                    join(" ", static_rustflags),
+                    join(" ", static_nightly_rustflags),
+                    join(" ", rmp_rustflags),
+                ]):
+
+            cargo_profile == "release" && rust_toolchain == "nightly"?
+                join(" ", [
+                    join(" ", nightly_rustflags),
+                    contains(split(",", cargo_feat_sets[feat_set]), "zstd_compression")?
+                        "-Clink-arg=-l:libzstd.a": "",
+                    contains(split(",", cargo_feat_sets[feat_set]), "io_uring")?
+                        "-Clink-arg=-l:liburing.a": "",
+                    join(" ", static_rustflags),
+                    join(" ", static_nightly_rustflags),
+                ]):
+
+            cargo_profile == "release" || cargo_profile == "release-debuginfo"?
+                join(" ", [
+                    contains(split(",", cargo_feat_sets[feat_set]), "zstd_compression")?
+                        "-Clink-arg=-l:libzstd.a": "",
+                    contains(split(",", cargo_feat_sets[feat_set]), "io_uring")?
+                        "-Clink-arg=-l:liburing.a": "",
+                    join(" ", static_rustflags),
+                ]):
+
+            rust_toolchain == "stable"?
+                join(" ", [
+                    contains(split(",", cargo_feat_sets[feat_set]), "zstd_compression")?
+                        "-Clink-arg=-l:libzstd.a": "",
+                    contains(split(",", cargo_feat_sets[feat_set]), "io_uring")?
+                        "-Clink-arg=-l:liburing.a": "",
+                    join(" ", static_rustflags),
+                ]):
+
             rust_toolchain == "nightly"?
-                join(" ", nightly_rustflags):
-                ""
+                join(" ", [
+                    join(" ", nightly_rustflags),
+                    contains(split(",", cargo_feat_sets[feat_set]), "zstd_compression")?
+                        "-Clink-arg=-lzstd": "",
+                    contains(split(",", cargo_feat_sets[feat_set]), "io_uring")?
+                        "-Clink-arg=-luring": "",
+                    join(" ", dynamic_rustflags),
+                ]):
+
+            join(" ", [
+                contains(split(",", cargo_feat_sets[feat_set]), "zstd_compression")?
+                    "-Clink-arg=-lzstd": "",
+                contains(split(",", cargo_feat_sets[feat_set]), "io_uring")?
+                    "-Clink-arg=-luring": "",
+                join(" ", dynamic_rustflags),
+            ])
         )
     }
 }
@@ -1197,9 +1272,9 @@ target "ingredients" {
         RUST_BACKTRACE = "full"
         ROCKSDB_LIB_DIR="/usr/lib/${sys_target}"
         JEMALLOC_OVERRIDE="/usr/lib/${sys_target}/libjemalloc.a"
-        #ZSTD_SYS_USE_PKG_CONFIG = (
-        #    contains(split(",", cargo_feat_sets[feat_set]), "zstd_compression")? 1: 0
-        #)
+        ZSTD_SYS_USE_PKG_CONFIG = (
+            contains(split(",", cargo_feat_sets[feat_set]), "zstd_compression")? 1: 0
+        )
     }
 }