From acabbafa08dd6504d63e92e749d57bf07c9fe632 Mon Sep 17 00:00:00 2001 From: Nathan Fiedler Date: Sat, 8 Jul 2017 21:30:42 -0700 Subject: [PATCH] Downgrade rust-bindgen to 0.25.5 There is an issue when building on Linux when using 0.26.0 or higher, so keep to a version that still works on Mac and Linux. cargo test passes --- CHANGELOG.md | 4 ++++ Cargo.toml | 5 +++-- build.rs | 1 + 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index d2550ce..cee4c9a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,10 @@ All notable changes to this project will be documented in this file. This project adheres to [Semantic Versioning](http://semver.org/). +## [0.6.6] - 2017-07-08 +### Changed +- Downgrade to version 0.25.5 of `bindgen` library to avoid errors on Linux. + ## [0.6.5] - 2017-07-07 ### Changed - Add `compare_images()` method to `MagickWand` type. diff --git a/Cargo.toml b/Cargo.toml index fe1a553..68cc838 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "magick_rust" -version = "0.6.5" +version = "0.6.6" authors = ["Nathan Fiedler "] description = "Selection of Rust bindings for the ImageMagick library." homepage = "https://github.com/nlfiedler/magick-rust" @@ -14,5 +14,6 @@ build = "build.rs" libc = ">=0.2" [build-dependencies] -bindgen = "0.26.2" +# bindgen 0.26.x results in "already been defined in this module" errors (bug #687) +bindgen = "0.25.5" pkg-config = "0.3.9" diff --git a/build.rs b/build.rs index 715fe5a..f20fd31 100644 --- a/build.rs +++ b/build.rs @@ -50,6 +50,7 @@ fn main() { // Geneate the bindings. let mut builder = bindgen::Builder::default() + .no_unstable_rust() .emit_builtins() .ctypes_prefix("libc") .raw_line("extern crate libc;")