try to find out why building with static does not work on linux

mimran1980 · Jan 14, 2025 · 0a087de · 0a087de
1 parent a13292d
commit 0a087de
Show file tree

Hide file tree

Showing 9 changed files with 39 additions and 12 deletions.
diff --git a/rusteron-archive/aeron b/rusteron-archive/aeron
diff --git a/rusteron-archive/build.rs b/rusteron-archive/build.rs
@@ -26,7 +26,13 @@ impl LinkType {
     fn link_lib(&self) -> &'static str {
         match self {
             LinkType::Dynamic => "dylib=",
-            LinkType::Static => "static=",
+            LinkType::Static => {
+                if cfg!(target_os = "linux") {
+                    "" // TODO not sure why I need to do this static= should work on linux based on documentation
+                } else {
+                    "static="
+                }
+            }
         }
     }
 

diff --git a/rusteron-client/aeron b/rusteron-client/aeron
diff --git a/rusteron-client/build.rs b/rusteron-client/build.rs
@@ -23,7 +23,13 @@ impl LinkType {
     fn link_lib(&self) -> &'static str {
         match self {
             LinkType::Dynamic => "dylib=",
-            LinkType::Static => "static=",
+            LinkType::Static => {
+                if cfg!(target_os = "linux") {
+                    "" // TODO not sure why I need to do this static= should work on linux based on documentation
+                } else {
+                    "static="
+                }
+            }
         }
     }
 

diff --git a/rusteron-docker-samples/rusteron-dummy-example/Cargo.toml b/rusteron-docker-samples/rusteron-dummy-example/Cargo.toml
@@ -7,11 +7,14 @@ edition = "2021"
 websocket-lite = "0.5"
 tokio = { version = "1", features = ["full"] }
 futures-util = "0.3"
-rusteron-archive = { version = "0.1.57"}
-rusteron-media-driver = { version = "0.1.57"}
+rusteron-archive = { version = "0.1.59", features = ["static"]}
+rusteron-media-driver = { version = "0.1.59", features = ["static"]}
 serde = { version = "1", features = ["derive"] }
 serde_json = "1"
 futures = "0.3"
 log = "0.4"
 env_logger = "0.11"
-signal-hook = "0.3"
+signal-hook = "0.3"
+
+[features]
+static = []
diff --git a/rusteron-docker-samples/rusteron-dummy-example/Dockerfile b/rusteron-docker-samples/rusteron-dummy-example/Dockerfile
@@ -28,6 +28,6 @@ ARG BUILD_DIR_NAME=release
 
 COPY --from=builder /usr/src/app/target/${BUILD_DIR_NAME}/ticker_reader /usr/local/bin/ticker_reader
 COPY --from=builder /usr/src/app/target/${BUILD_DIR_NAME}/ticker_writer /usr/local/bin/ticker_writer
-COPY --from=builder /usr/src/app/target/${BUILD_DIR_NAME}/build/rusteron-archive-*/out/build/lib/*.so /usr/lib
-COPY --from=builder /usr/src/app/target/${BUILD_DIR_NAME}/build/rusteron-media-driver-*/out/build/lib/*.so /usr/lib
+#COPY --from=builder /usr/src/app/target/${BUILD_DIR_NAME}/build/rusteron-archive-*/out/build/lib/*.so /usr/lib
+#COPY --from=builder /usr/src/app/target/${BUILD_DIR_NAME}/build/rusteron-media-driver-*/out/build/lib/*.so /usr/lib
 
diff --git a/rusteron-media-driver/aeron b/rusteron-media-driver/aeron
diff --git a/rusteron-media-driver/build.rs b/rusteron-media-driver/build.rs
@@ -23,7 +23,13 @@ impl LinkType {
     fn link_lib(&self) -> &'static str {
         match self {
             LinkType::Dynamic => "dylib=",
-            LinkType::Static => "static=",
+            LinkType::Static => {
+                if cfg!(target_os = "linux") {
+                    "" // TODO not sure why I need to do this static= should work on linux based on documentation
+                } else {
+                    "static="
+                }
+            }
         }
     }
 

diff --git a/rusteron-rb/build.rs b/rusteron-rb/build.rs
@@ -23,7 +23,13 @@ impl LinkType {
     fn link_lib(&self) -> &'static str {
         match self {
             LinkType::Dynamic => "dylib=",
-            LinkType::Static => "static=",
+            LinkType::Static => {
+                if cfg!(target_os = "linux") {
+                    "" // TODO not sure why I need to do this static= should work on linux based on documentation
+                } else {
+                    "static="
+                }
+            }
         }
     }
+21 −1		aeron-archive/src/main/java/io/aeron/archive/ArchiveMarkFile.java
+5 −1		aeron-archive/src/main/resources/archive/aeron-archive-mark-codecs.xml
+188 −9		aeron-archive/src/test/java/io/aeron/archive/ArchiveMarkFileTest.java
+67 −28		build.gradle