Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: adjust liboqs pkgconfig version detection to new scheme #246

Merged
merged 1 commit into from
Oct 19, 2023
Merged

fix: adjust liboqs pkgconfig version detection to new scheme #246

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 10 additions & 16 deletions oqs-sys/build.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,15 +128,6 @@ fn includedir_from_source() -> PathBuf {
outdir.join("build").join("include")
}

fn trim_wrapped_patch_version(patch: &str) -> &str {
let len = patch.len();
if len < 3 {
return patch;
}

&patch[..len - 2]
}

fn probe_includedir() -> PathBuf {
if cfg!(feature = "vendored") {
return includedir_from_source();
Expand All @@ -145,14 +136,17 @@ fn probe_includedir() -> PathBuf {
println!("cargo:rerun-if-env-changed=LIBOQS_NO_VENDOR");
let force_no_vendor = std::env::var_os("LIBOQS_NO_VENDOR").map_or(false, |v| v != "0");

let major_version: usize = env!("CARGO_PKG_VERSION_MAJOR").parse().unwrap();
let minor_version: usize = env!("CARGO_PKG_VERSION_MINOR").parse().unwrap();
let patch_version = env!("CARGO_PKG_VERSION_PATCH");
let patch_trimmed = trim_wrapped_patch_version(patch_version);
let lower_bound = format!("{}.{}.{}", major_version, minor_version, patch_trimmed);
let upper_bound = format!("{}.{}.0", major_version, minor_version + 1);
let version = env!("CARGO_PKG_VERSION");
let (_, liboqs_version) = version.split_once("+liboqs-").unwrap();
let &[major_version, minor_version, _] =
liboqs_version.split('.').collect::<Vec<_>>().as_slice()
else {
panic!("Failed to parse target liboqs version");
};
let minor_num: usize = minor_version.parse().unwrap();
let upper_bound = format!("{}.{}.0", major_version, minor_num + 1);
let config = pkg_config::Config::new()
.range_version(lower_bound.as_str()..upper_bound.as_str())
.range_version(liboqs_version..upper_bound.as_str())
.probe("liboqs");

match config {
Expand Down