prep: Fix libdnf-sys linking and add workspace lints

cgwalters · cgwalters · commit 88218c82dd17 · 2025-11-01T11:52:23.000-04:00
Fix static library linking order in libdnf-sys build script.
The C++ wrapper (libdnfcxx.a) depends on both libdnf and glib,
but cargo's link order requires dependencies to come after
dependents. Re-emit link directives after compiling the wrapper
to ensure symbols are available.

This was causing undefined reference errors for g_strndup, g_free,
and hy_split_nevra when building tests.

Also add workspace-level lints to Cargo.toml and minor Rust cleanups.

Assisted-by: Claude Code (Sonnet 4.5)
Signed-off-by: Colin Walters &lt;walters@verbum.org&gt;
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/rust/libdnf-sys/Cargo.toml b/rust/libdnf-sys/Cargo.toml
@@ -18,6 +18,7 @@ cmake = "0.1.54"
 system-deps = "7.0"
 anyhow = "1.0"
 cxx-build = "1.0.158"
+pkg-config = "0.3"
 
 # This currently needs to duplicate the libraries from libdnf
 [package.metadata.system-deps]
diff --git a/rust/libdnf-sys/build.rs b/rust/libdnf-sys/build.rs
@@ -7,6 +7,10 @@ fn main() -> Result<()> {
     let with_zck: u8 = libs.get_by_name("zck").is_some().into();
     let with_rhsm = std::env::var_os("CARGO_FEATURE_RHSM").is_some();
 
+    // Query pkg-config for glib's full link flags (including transitive dependencies)
+    // We'll need this later to ensure proper linking of the C++ wrapper.
+    let glib_libs = pkg_config::Config::new().probe("glib-2.0")?;
+
     // first, the submodule proper
     let libdnf = cmake::Config::new("../../libdnf")
         // Needed for hardened builds
@@ -61,5 +65,19 @@ fn main() -> Result<()> {
     libdnfcxx.includes(libs.all_include_paths());
     libdnfcxx.compile("libdnfcxx.a");
 
+    // The C++ wrapper (libdnfcxx.a) uses both glib functions (g_strndup, g_free)
+    // and libdnf functions (hy_split_nevra). Due to static library linking order,
+    // we need to ensure these libraries come after libdnfcxx in the link order.
+    // Even though system_deps already emitted link directives earlier, cargo's
+    // link order matters - we re-emit them here to ensure symbols are available.
+
+    // First, link libdnf again (for hy_split_nevra and other libdnf symbols)
+    println!("cargo:rustc-link-lib=static=dnf");
+
+    // Then, link glib and all its transitive dependencies (for g_strndup, g_free, etc.)
+    for lib in &glib_libs.libs {
+        println!("cargo:rustc-link-lib={}", lib);
+    }
+
     Ok(())
 }
diff --git a/rust/src/builtins/apply_live.rs b/rust/src/builtins/apply_live.rs
@@ -1,4 +1,3 @@
-//!
 // SPDX-License-Identifier: LGPL-2.1-or-later
 
 use crate::cxxrsutil::*;
diff --git a/rust/src/importer.rs b/rust/src/importer.rs
@@ -221,7 +221,7 @@ impl RpmImporter {
     }
 
     pub fn rpmfi_overrides_contains(self: &RpmImporter, path: &str) -> bool {
-        self.rpmfi_overrides.get(path).is_some()
+        self.rpmfi_overrides.contains_key(path)
     }
 
     pub fn rpmfi_overrides_get(&self, path: &str) -> u64 {

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,3 @@`
`1`		`-//!`
`2`	`1`	`// SPDX-License-Identifier: LGPL-2.1-or-later`
`3`	`2`
`4`	`3`	`use crate::cxxrsutil::*;`
Original file line number	Diff line number	Diff line change
`@@ -221,7 +221,7 @@ impl RpmImporter {`
`221`	`221`	`}`
`222`	`222`
`223`	`223`	`pub fn rpmfi_overrides_contains(self: &RpmImporter, path: &str) -> bool {`
`224`		`- self.rpmfi_overrides.get(path).is_some()`
	`224`	`+ self.rpmfi_overrides.contains_key(path)`
`225`	`225`	`}`
`226`	`226`
`227`	`227`	`pub fn rpmfi_overrides_get(&self, path: &str) -> u64 {`