asonix/magick-rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Fix pkg-config invocation in build.rs

Browse source 
It seems that pkg-config ignores the --max-version option when combined with
certain other options. As such, that check was not really working. Since the
pkg-config Rust crate always passes those certain other options, it is
necessary to invoke the pkg-config command directly from build.rs instead.

cargo test passes
This commit is contained in:
Nathan Fiedler 2017-07-10 21:32:59 -07:00
parent acabbafa08
commit 14f78e3734
1 changed files with 11 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
build.rs
View file

@ -20,6 +20,7 @@ use std::env;
use std::fs::File;
use std::io::prelude::*;
use std::path::{Path, PathBuf};
use std::process::Command;
const MIN_VERSION: &'static str = "6.9";
const MAX_VERSION: &'static str = "6.10";
@ -31,9 +32,18 @@ fn main() {
// since we are very dependent on the particulars of MagickWand.
pkg_config::Config::new()
.atleast_version(MIN_VERSION)
.arg(format!("--max-version={}", MAX_VERSION))
.probe("MagickWand")
.unwrap();
// Check the maximum version separately as pkg-config will ignore that
// option when combined with (certain) other options. And since the
// pkg-config crate always adds those other flags, we must run the
// command directly.
if !Command::new("pkg-config")
.arg(format!("--max-version={}", MAX_VERSION))
.arg("MagickWand")
.status().unwrap().success() {
panic!("MagickWand version must be no higher than 6.9");
}
// We have to split the version check and the cflags/libs check because
// you can't do both at the same time on RHEL (apparently).
let library = pkg_config::Config::new().probe("MagickWand").unwrap();