From a8f41bb87da7eb00f6918b3dead4ea509bf62015 Mon Sep 17 00:00:00 2001 From: Jonas Nick Date: Wed, 26 Jun 2019 12:36:15 +0000 Subject: [PATCH 1/4] Relax cc dependency requirements, bump secp256k1 to 0.13 and bump version to 0.16.5 --- Cargo.toml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 9e126960c5..f56162abfa 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "bitcoinconsensus" -version = "0.16.4" +version = "0.16.5" authors = ["Tamas Blummer "] license = "Apache-2.0" homepage = "https://github.com/rust-bitcoin/rust-bitcoinconsensus/" @@ -19,8 +19,8 @@ path = "src/lib.rs" libc="0.2" [build-dependencies] -cc = "=1.0.26" +cc = ">= 1.0.28, <= 1.0.35" [dev-dependencies] rustc-serialize = "0.3" -secp256k1 = "0.12" +secp256k1 = "0.13" From 312d3106da4563c197ef317d5ff23ee48bff3f23 Mon Sep 17 00:00:00 2001 From: Jonas Nick Date: Wed, 26 Jun 2019 22:19:33 +0000 Subject: [PATCH 2/4] Update travis and appveyor to use minimum rustc version 1.22.0 required by secp256k1 0.13 --- .travis.yml | 2 +- appveyor.yml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 5d4df6d66a..5db19a1d83 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,5 +3,5 @@ rust: - stable - beta - nightly - - 1.14.0 + - 1.22.0 diff --git a/appveyor.yml b/appveyor.yml index c43975805c..4eb2697f61 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -4,9 +4,9 @@ os: Visual Studio 2015 environment: matrix: - - channel: 1.14.0 + - channel: 1.22.0 target: x86_64-pc-windows-msvc - - channel: 1.14.0 + - channel: 1.22.0 target: i686-pc-windows-msvc - channel: stable From 7106a2ab9078b7f849fd0fa8936bd67dc79716e8 Mon Sep 17 00:00:00 2001 From: Matt Corallo Date: Wed, 26 Dec 2018 17:31:53 -0500 Subject: [PATCH 3/4] Add WIN32 define for Windows target, remove endianness decls. --- build.rs | 19 +++---------------- 1 file changed, 3 insertions(+), 16 deletions(-) diff --git a/build.rs b/build.rs index ae8736b090..a03d38bbb2 100644 --- a/build.rs +++ b/build.rs @@ -3,7 +3,6 @@ extern crate cc; use std::env; fn main() { - let target = env::var("TARGET").unwrap(); let mut base_config = cc::Build::new(); base_config .cpp(true) @@ -19,22 +18,10 @@ fn main() { } else if tool.is_like_clang() || tool.is_like_gnu() { base_config.flag("-std=c++11").flag("-Wno-unused-parameter"); } - - if target == "x86_64-unknown-linux-gnu" { + #[cfg(target_os = "windows")] + { base_config - .define("HAVE_ENDIAN_H", Some("1")) - .define("HAVE_DECL_HTOBE16", Some("1")) - .define("HAVE_DECL_HTOLE16", Some("1")) - .define("HAVE_DECL_BE16TOH", Some("1")) - .define("HAVE_DECL_LE16TOH", Some("1")) - .define("HAVE_DECL_HTOBE32", Some("1")) - .define("HAVE_DECL_HTOLE32", Some("1")) - .define("HAVE_DECL_BE32TOH", Some("1")) - .define("HAVE_DECL_LE32TOH", Some("1")) - .define("HAVE_DECL_HTOBE64", Some("1")) - .define("HAVE_DECL_HTOLE64", Some("1")) - .define("HAVE_DECL_BE64TOH", Some("1")) - .define("HAVE_DECL_LE64TOH", Some("1")); + .define("WIN32", Some("1")); } base_config .file("bitcoin/src/utilstrencodings.cpp") From 5d9d51d0a27a20a153cfedf39f58ca4c7e83de2f Mon Sep 17 00:00:00 2001 From: Jonas Nick Date: Sun, 14 Jul 2019 21:50:27 +0000 Subject: [PATCH 4/4] Relax cc requirements, bump secp256k1 to 0.15 and bump version to 0.17.0 --- Cargo.toml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index f56162abfa..66647f82c5 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "bitcoinconsensus" -version = "0.16.5" +version = "0.17.0" authors = ["Tamas Blummer "] license = "Apache-2.0" homepage = "https://github.com/rust-bitcoin/rust-bitcoinconsensus/" @@ -19,8 +19,8 @@ path = "src/lib.rs" libc="0.2" [build-dependencies] -cc = ">= 1.0.28, <= 1.0.35" +cc = ">= 1.0.36" [dev-dependencies] rustc-serialize = "0.3" -secp256k1 = "0.13" +secp256k1 = { version = "0.15", features = ["recovery"] }