WIP: #213

Cargo.toml

@@ -39,5 +39,6 @@ panic = "abort"
 # upstream, we can remove our fork.
 #
 [patch.crates-io.pq-sys]
-git = 'https://github.com/oxidecomputer/pq-sys'
-branch = "oxide"
+#git = 'https://github.com/oxidecomputer/pq-sys'
+#branch = "oxide"
+path = "../pq-sys-dynamic"

omicron-bootstrap-agent/Cargo.toml

@@ -6,6 +6,8 @@ edition = "2018"
 [dependencies]
 http = "0.2.0"
 hyper = "0.14"
+# See build.rs for more about the "pq-sys" dependency.
+pq-sys = "0.4"
 serde_json = "1.0"
 smf = "0.2"
 structopt = "0.3"

omicron-bootstrap-agent/build.rs

@@ -0,0 +1,8 @@
+// XXX comment and keep in sync with omicron-nexus
+fn main() {
+    if let Some(rpaths) = std::env::var_os("DEP_PQ_LIBDIRS") {
+        for p in std::env::split_paths(&rpaths) {
+            println!("cargo:rustc-link-arg=-Wl,-R{}", p.to_string_lossy());
+        }
+    }
+}

omicron-common/Cargo.toml

@@ -14,6 +14,8 @@ hyper = "0.14"
 libc = "0.2.98"
 propolis-server = { git = "https://github.com/oxidecomputer/propolis", rev = "b6da043d" }
 postgres-protocol = "0.6.1"
+# See build.rs for more about the "pq-sys" dependency.
+pq-sys = "0.4"
 rayon = "1.5"
 reqwest = { version = "0.11", default-features = false, features = ["rustls-tls"] }
 ring = "0.16"

omicron-common/build.rs

@@ -0,0 +1,8 @@
+// XXX comment and keep in sync with omicron-nexus
+fn main() {
+    if let Some(rpaths) = std::env::var_os("DEP_PQ_LIBDIRS") {
+        for p in std::env::split_paths(&rpaths) {
+            println!("cargo:rustc-link-arg=-Wl,-R{}", p.to_string_lossy());
+        }
+    }
+}

omicron-nexus/Cargo.toml

@@ -17,6 +17,8 @@ ipnetwork = "0.18"
 lazy_static = "1.4.0"
 libc = "0.2.98"
 newtype_derive = "0.1.6"
+# See build.rs for more about the "pq-sys" dependency.
+pq-sys = "0.4"
 serde_json = "1.0"
 serde_with = "1.9.4"
 structopt = "0.3"

omicron-nexus/build.rs

@@ -0,0 +1,7 @@
+fn main() {
+    if let Some(rpaths) = std::env::var_os("DEP_PQ_LIBDIRS") {
+        for p in std::env::split_paths(&rpaths) {
+            println!("cargo:rustc-link-arg=-Wl,-R{}", p.to_string_lossy());
+        }
+    }
+}

omicron-sled-agent/Cargo.toml

@@ -13,6 +13,8 @@ http = "0.2.0"
 hyper = "0.14"
 ipnet = "2.3"
 omicron-common = { path = "../omicron-common" }
+# See build.rs for more about the "pq-sys" dependency.
+pq-sys = "0.4"
 propolis-client = { git = "https://github.com/oxidecomputer/propolis", rev = "3d58a6398" }
 schemars = { version = "0.8", features = [ "chrono", "uuid" ] }
 serde = { version = "1.0", features = [ "derive" ] }

omicron-sled-agent/build.rs

@@ -0,0 +1,8 @@
+// XXX comment and keep in sync with omicron-nexus
+fn main() {
+    if let Some(rpaths) = std::env::var_os("DEP_PQ_LIBDIRS") {
+        for p in std::env::split_paths(&rpaths) {
+            println!("cargo:rustc-link-arg=-Wl,-R{}", p.to_string_lossy());
+        }
+    }
+}

oximeter/oximeter/Cargo.toml

@@ -13,6 +13,8 @@ num-traits = "0.2.14"
 hyper = "0.14.10"
 oximeter-macro-impl = { path = "../oximeter-macro-impl" }
 omicron-common = { path = "../../omicron-common" }
+# See build.rs for more about the "pq-sys" dependency.
+pq-sys = "0.4"
 reqwest = { version = "0.11.4", features = [ "json" ] }
 schemars = { version = "0.8.3", features = [ "uuid", "bytes", "chrono" ] }
 serde = { version = "1", features = [ "derive" ] }

oximeter/oximeter/build.rs

@@ -0,0 +1,8 @@
+// XXX comment and keep in sync with omicron-nexus
+fn main() {
+    if let Some(rpaths) = std::env::var_os("DEP_PQ_LIBDIRS") {
+        for p in std::env::split_paths(&rpaths) {
+            println!("cargo:rustc-link-arg=-Wl,-R{}", p.to_string_lossy());
+        }
+    }
+}