From 49a87f766048a8d4c12c793eb2963d4782ead033 Mon Sep 17 00:00:00 2001 From: Simon Walker Date: Wed, 21 Dec 2022 12:07:12 +0000 Subject: [PATCH 1/3] Do not specify version of cfitsio on windows --- fitsio-sys-bindgen/build.rs | 9 ++++++++- fitsio-sys/build.rs | 9 ++++++++- 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/fitsio-sys-bindgen/build.rs b/fitsio-sys-bindgen/build.rs index 44dbc513..5bb0cd74 100644 --- a/fitsio-sys-bindgen/build.rs +++ b/fitsio-sys-bindgen/build.rs @@ -5,7 +5,14 @@ use std::io::Write; use std::path::PathBuf; fn main() { - let package_name = "cfitsio >= 3.37"; + // `msys2` does not report the version of cfitsio correctly, so ignore the version specifier for now. + let package_name = if cfg!(windows) { + let msg = "No version specifier available for pkg-config on windows, so the version of cfitsio used when compiling this program is unspecified"; + println!("cargo:warning={msg}"); + "cfitsio" + } else { + "cfitsio >= 3.37" + }; let mut config = pkg_config::Config::new(); config.print_system_libs(true); config.print_system_cflags(true); diff --git a/fitsio-sys/build.rs b/fitsio-sys/build.rs index d990c5bf..0048eda0 100644 --- a/fitsio-sys/build.rs +++ b/fitsio-sys/build.rs @@ -3,7 +3,14 @@ fn bind_cfitsio() { use pkg_config::Error; use std::io::Write; - let package_name = "cfitsio >= 3.37"; + // `msys2` does not report the version of cfitsio correctly, so ignore the version specifier for now. + let package_name = if cfg!(windows) { + let msg = "No version specifier available for pkg-config on windows, so the version of cfitsio used when compiling this program is unspecified"; + println!("cargo:warning={msg}"); + "cfitsio" + } else { + "cfitsio >= 3.37" + }; let mut config = pkg_config::Config::new(); config.print_system_libs(true); config.print_system_cflags(true); From 7e8f90e31800926f2cc9bee79662893b35cf8749 Mon Sep 17 00:00:00 2001 From: Simon Walker Date: Wed, 21 Dec 2022 14:12:47 +0000 Subject: [PATCH 2/3] add changelog entry [skip ci] --- CHANGELOG.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 15a031eb..ea6f544a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,9 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) a ## [Unreleased] ### Added ### Changed + +* `fitsio-sys`: do not specify the version for msys2 since it is not well represented + ### Removed ## [0.21.0] From d9aafc1dc10ed297d00fe90d3ea73071115d863f Mon Sep 17 00:00:00 2001 From: Simon Walker Date: Wed, 21 Dec 2022 17:04:47 +0000 Subject: [PATCH 3/3] update version of fitsio-sys [ci skip] --- fitsio-sys/Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fitsio-sys/Cargo.toml b/fitsio-sys/Cargo.toml index 38670591..21094de5 100644 --- a/fitsio-sys/Cargo.toml +++ b/fitsio-sys/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "fitsio-sys" -version = "0.5.0" +version = "0.5.1" edition = "2018" authors = ["Simon Walker "] description = "FFI wrapper around cfitsio"