98 lines
3.6 KiB
Diff
98 lines
3.6 KiB
Diff
From eca59b67b3350d3b49db5844eb143b428c95ca37 Mon Sep 17 00:00:00 2001
|
|
From: Luca BRUNO <luca.bruno@coreos.com>
|
|
Date: Wed, 2 Jun 2021 12:40:44 +0000
|
|
Subject: [PATCH 1/2] libdnf-sys/build: gracefully handle older gpgme versions
|
|
|
|
This tries to gracefully handle environments where gpgme
|
|
library cannot be directly discovered via pkg-config.
|
|
Older gpgme versions (including 1.13) do not provide a
|
|
.pc file, so in that case the build-script attempts to
|
|
fallback to hardcoded library flags.
|
|
---
|
|
rust/libdnf-sys/Cargo.toml | 3 ++-
|
|
rust/libdnf-sys/build.rs | 5 +++++
|
|
2 files changed, 7 insertions(+), 1 deletion(-)
|
|
|
|
diff --git a/rust/libdnf-sys/Cargo.toml b/rust/libdnf-sys/Cargo.toml
|
|
index 8695ad8c08..e20f04d0c8 100644
|
|
--- a/rust/libdnf-sys/Cargo.toml
|
|
+++ b/rust/libdnf-sys/Cargo.toml
|
|
@@ -26,7 +26,8 @@ rpm = "4"
|
|
librepo = "1"
|
|
libsolv = "0.7"
|
|
libsolvext = "0.7"
|
|
-gpgme = "1"
|
|
+# Older libgpgme did not provide a pkg-config file
|
|
+gpgme = { version = "1", optional = true }
|
|
openssl = "1"
|
|
libcurl = "7"
|
|
sqlite3 = "3"
|
|
diff --git a/rust/libdnf-sys/build.rs b/rust/libdnf-sys/build.rs
|
|
index 43f61a3544..ec86ca6a6f 100644
|
|
--- a/rust/libdnf-sys/build.rs
|
|
+++ b/rust/libdnf-sys/build.rs
|
|
@@ -3,6 +3,7 @@ use anyhow::Result;
|
|
|
|
fn main() -> Result<()> {
|
|
let libs = system_deps::Config::new().probe()?;
|
|
+ let has_gpgme_pkgconfig = libs.get_by_name("gpgme").is_some();
|
|
|
|
// first, the submodule proper
|
|
let libdnf = cmake::Config::new("../../libdnf")
|
|
@@ -31,6 +32,10 @@ fn main() -> Result<()> {
|
|
.always_configure(false)
|
|
.build_target("all")
|
|
.build();
|
|
+ // NOTE(lucab): consider using `gpgme-config` it this stops working.
|
|
+ if !has_gpgme_pkgconfig {
|
|
+ println!("cargo:rustc-link-lib=gpgme");
|
|
+ }
|
|
println!(
|
|
"cargo:rustc-link-search=native={}/build/libdnf",
|
|
libdnf.display()
|
|
|
|
From d874de293c27f2ed762f212ab65fb054a8006fc3 Mon Sep 17 00:00:00 2001
|
|
From: Luca BRUNO <luca.bruno@coreos.com>
|
|
Date: Wed, 2 Jun 2021 13:10:24 +0000
|
|
Subject: [PATCH 2/2] libdnf-sys/build: auto-enable zchunk if present
|
|
|
|
This adds an optional dependencies on the `zck` library (zchunk),
|
|
and automatically forwards it to libdnf configuration.
|
|
It allows to gracefully degrade in older environments where zchunk
|
|
is not present, and also matches autoconf behavior.
|
|
---
|
|
rust/libdnf-sys/Cargo.toml | 1 +
|
|
rust/libdnf-sys/build.rs | 3 +++
|
|
2 files changed, 4 insertions(+)
|
|
|
|
diff --git a/rust/libdnf-sys/Cargo.toml b/rust/libdnf-sys/Cargo.toml
|
|
index e20f04d0c8..13e0eca318 100644
|
|
--- a/rust/libdnf-sys/Cargo.toml
|
|
+++ b/rust/libdnf-sys/Cargo.toml
|
|
@@ -34,3 +34,4 @@ sqlite3 = "3"
|
|
modulemd = { name = "modulemd-2.0", version = "2" }
|
|
jsonc = { name = "json-c", version = "0" }
|
|
glib = { name = "glib-2.0", version = "2" }
|
|
+zck = { version = "0.9", optional = true }
|
|
diff --git a/rust/libdnf-sys/build.rs b/rust/libdnf-sys/build.rs
|
|
index ec86ca6a6f..df07cc7cb7 100644
|
|
--- a/rust/libdnf-sys/build.rs
|
|
+++ b/rust/libdnf-sys/build.rs
|
|
@@ -4,6 +4,7 @@ use anyhow::Result;
|
|
fn main() -> Result<()> {
|
|
let libs = system_deps::Config::new().probe()?;
|
|
let has_gpgme_pkgconfig = libs.get_by_name("gpgme").is_some();
|
|
+ let with_zck: u8 = libs.get_by_name("zck").is_some().into();
|
|
|
|
// first, the submodule proper
|
|
let libdnf = cmake::Config::new("../../libdnf")
|
|
@@ -24,6 +25,8 @@ fn main() -> Result<()> {
|
|
// We don't need docs
|
|
.define("WITH_HTML:BOOL", "0")
|
|
.define("WITH_MAN:BOOL", "0")
|
|
+ // Auto-enable zchunk, if present
|
|
+ .define("WITH_ZCHUNK:BOOL", format!("{}", with_zck))
|
|
// Don't need bindings
|
|
.define("WITH_BINDINGS:BOOL", "0")
|
|
// Needed in Koji at least because timestamps(?)
|