diff -Nru rust-cmake-0.1.42/Cargo.toml rust-cmake-0.1.44/Cargo.toml --- rust-cmake-0.1.42/Cargo.toml 1970-01-01 00:00:00.000000000 +0000 +++ rust-cmake-0.1.44/Cargo.toml 2020-05-18 13:47:34.000000000 +0000 @@ -12,7 +12,7 @@ [package] name = "cmake" -version = "0.1.42" +version = "0.1.44" authors = ["Alex Crichton "] description = "A build dependency for running `cmake` to build a native library\n" homepage = "https://github.com/alexcrichton/cmake-rs" diff -Nru rust-cmake-0.1.42/Cargo.toml.orig rust-cmake-0.1.44/Cargo.toml.orig --- rust-cmake-0.1.42/Cargo.toml.orig 2019-08-27 19:37:50.000000000 +0000 +++ rust-cmake-0.1.44/Cargo.toml.orig 2020-05-18 13:47:10.000000000 +0000 @@ -1,6 +1,6 @@ [package] name = "cmake" -version = "0.1.42" +version = "0.1.44" authors = ["Alex Crichton "] license = "MIT/Apache-2.0" readme = "README.md" diff -Nru rust-cmake-0.1.42/.cargo_vcs_info.json rust-cmake-0.1.44/.cargo_vcs_info.json --- rust-cmake-0.1.42/.cargo_vcs_info.json 1970-01-01 00:00:00.000000000 +0000 +++ rust-cmake-0.1.44/.cargo_vcs_info.json 2020-05-18 13:47:34.000000000 +0000 @@ -1,5 +1,5 @@ { "git": { - "sha1": "7fdc5d12f0bf7e4f486a341d5c2614f3cab83b73" + "sha1": "3d60fcb781c7ef8750a043fc3846bf980694bb7d" } } diff -Nru rust-cmake-0.1.42/debian/cargo-checksum.json rust-cmake-0.1.44/debian/cargo-checksum.json --- rust-cmake-0.1.42/debian/cargo-checksum.json 2019-11-12 16:45:34.000000000 +0000 +++ rust-cmake-0.1.44/debian/cargo-checksum.json 2020-06-14 13:16:12.000000000 +0000 @@ -1 +1 @@ -{"package":"81fb25b677f8bf1eb325017cb6bb8452f87969db0fedb4f757b297bee78a7c62","files":{}} +{"package":"0e56268c17a6248366d66d4a47a3381369d068cce8409bb1716ed77ea32163bb","files":{}} diff -Nru rust-cmake-0.1.42/debian/changelog rust-cmake-0.1.44/debian/changelog --- rust-cmake-0.1.42/debian/changelog 2019-11-12 16:45:34.000000000 +0000 +++ rust-cmake-0.1.44/debian/changelog 2020-06-14 13:16:12.000000000 +0000 @@ -1,3 +1,9 @@ +rust-cmake (0.1.44-1) unstable; urgency=medium + + * Package cmake 0.1.44 from crates.io using debcargo 2.4.3 + + -- Wolfgang Silbermayr Sun, 14 Jun 2020 15:16:12 +0200 + rust-cmake (0.1.42-1) unstable; urgency=medium * Package cmake 0.1.42 from crates.io using debcargo 2.4.0 diff -Nru rust-cmake-0.1.42/debian/control rust-cmake-0.1.44/debian/control --- rust-cmake-0.1.42/debian/control 2019-11-12 16:45:34.000000000 +0000 +++ rust-cmake-0.1.44/debian/control 2020-06-14 13:16:12.000000000 +0000 @@ -12,7 +12,7 @@ Uploaders: Ximin Luo , Wolfgang Silbermayr -Standards-Version: 4.2.0 +Standards-Version: 4.4.1 Vcs-Git: https://salsa.debian.org/rust-team/debcargo-conf.git [src/cmake] Vcs-Browser: https://salsa.debian.org/rust-team/debcargo-conf/tree/master/src/cmake Homepage: https://github.com/alexcrichton/cmake-rs @@ -30,8 +30,8 @@ librust-cmake-0+default-dev (= ${binary:Version}), librust-cmake-0.1-dev (= ${binary:Version}), librust-cmake-0.1+default-dev (= ${binary:Version}), - librust-cmake-0.1.42-dev (= ${binary:Version}), - librust-cmake-0.1.42+default-dev (= ${binary:Version}) + librust-cmake-0.1.44-dev (= ${binary:Version}), + librust-cmake-0.1.44+default-dev (= ${binary:Version}) Description: Build dependency for running cmake to build a native library - Rust source code This package contains the source for the Rust cmake crate, packaged by debcargo for use with cargo and dh-cargo. diff -Nru rust-cmake-0.1.42/debian/copyright rust-cmake-0.1.44/debian/copyright --- rust-cmake-0.1.42/debian/copyright 2019-11-12 16:45:34.000000000 +0000 +++ rust-cmake-0.1.44/debian/copyright 2020-06-14 13:16:12.000000000 +0000 @@ -4,14 +4,14 @@ Source: https://github.com/alexcrichton/cmake-rs Files: * -Copyright: 2014-2019 Alex Crichton +Copyright: 2014-2020 Alex Crichton License: MIT or Apache-2.0 Files: debian/* Copyright: - 2018-2019 Debian Rust Maintainers - 2018-2019 Ximin Luo - 2018-2019 Wolfgang Silbermayr + 2018-2020 Debian Rust Maintainers + 2018-2020 Ximin Luo + 2018-2020 Wolfgang Silbermayr License: MIT or Apache-2.0 License: Apache-2.0 diff -Nru rust-cmake-0.1.42/debian/copyright.debcargo.hint rust-cmake-0.1.44/debian/copyright.debcargo.hint --- rust-cmake-0.1.42/debian/copyright.debcargo.hint 2019-11-12 16:45:34.000000000 +0000 +++ rust-cmake-0.1.44/debian/copyright.debcargo.hint 2020-06-14 13:16:12.000000000 +0000 @@ -21,9 +21,9 @@ Files: debian/* Copyright: - 2018-2019 Debian Rust Maintainers - 2018-2019 Ximin Luo - 2018-2019 Wolfgang Silbermayr + 2018-2020 Debian Rust Maintainers + 2018-2020 Ximin Luo + 2018-2020 Wolfgang Silbermayr License: MIT or Apache-2.0 License: Apache-2.0 diff -Nru rust-cmake-0.1.42/debian/tests/control rust-cmake-0.1.44/debian/tests/control --- rust-cmake-0.1.42/debian/tests/control 2019-11-12 16:45:34.000000000 +0000 +++ rust-cmake-0.1.44/debian/tests/control 2020-06-14 13:16:12.000000000 +0000 @@ -1,7 +1,9 @@ -Test-Command: /usr/share/cargo/bin/cargo-auto-test cmake 0.1.42 --all-targets --all-features +Test-Command: /usr/share/cargo/bin/cargo-auto-test cmake 0.1.44 --all-targets --all-features +Features: test-name=@ Depends: dh-cargo (>= 18), @ Restrictions: allow-stderr, skip-not-installable -Test-Command: /usr/share/cargo/bin/cargo-auto-test cmake 0.1.42 --all-targets --no-default-features -Depends: dh-cargo (>= 18), librust-cmake-dev +Test-Command: /usr/share/cargo/bin/cargo-auto-test cmake 0.1.44 --all-targets --no-default-features +Features: test-name=librust-cmake-dev +Depends: dh-cargo (>= 18), @ Restrictions: allow-stderr, skip-not-installable diff -Nru rust-cmake-0.1.42/debian/watch rust-cmake-0.1.44/debian/watch --- rust-cmake-0.1.42/debian/watch 2019-11-12 16:45:34.000000000 +0000 +++ rust-cmake-0.1.44/debian/watch 2020-06-14 13:16:12.000000000 +0000 @@ -2,4 +2,3 @@ opts=filenamemangle=s/.*\/(.*)\/download/cmake-$1\.tar\.gz/g,\ uversionmangle=s/(\d)[_\.\-\+]?((RC|rc|pre|dev|beta|alpha)\d*)$/$1~$2/ \ https://qa.debian.org/cgi-bin/fakeupstream.cgi?upstream=crates.io/cmake .*/crates/cmake/@ANY_VERSION@/download - diff -Nru rust-cmake-0.1.42/src/lib.rs rust-cmake-0.1.44/src/lib.rs --- rust-cmake-0.1.42/src/lib.rs 2019-08-27 19:37:37.000000000 +0000 +++ rust-cmake-0.1.44/src/lib.rs 2020-05-18 13:46:55.000000000 +0000 @@ -60,6 +60,7 @@ generator: Option, cflags: OsString, cxxflags: OsString, + asmflags: OsString, defines: Vec<(OsString, OsString)>, deps: Vec, target: Option, @@ -75,6 +76,7 @@ no_build_target: bool, verbose_cmake: bool, verbose_make: bool, + pic: Option, } /// Builds the native library rooted at `path` with the default cmake options. @@ -106,6 +108,7 @@ generator: None, cflags: OsString::new(), cxxflags: OsString::new(), + asmflags: OsString::new(), defines: Vec::new(), deps: Vec::new(), profile: None, @@ -121,9 +124,16 @@ no_build_target: false, verbose_cmake: false, verbose_make: false, + pic: None, } } + /// Sets flag for PIC. Otherwise use cc::Build platform default + pub fn pic(&mut self, explicit_flag: bool) -> &mut Config { + self.pic = Some(explicit_flag); + self + } + /// Sets the build-tool generator (`-G`) for this compilation. pub fn generator>(&mut self, generator: T) -> &mut Config { self.generator = Some(generator.as_ref().to_owned()); @@ -146,6 +156,14 @@ self } + /// Adds a custom flag to pass down to the ASM compiler, supplementing those + /// that this library already passes. + pub fn asmflag>(&mut self, flag: P) -> &mut Config { + self.asmflags.push(" "); + self.asmflags.push(flag.as_ref()); + self + } + /// Adds a new `-D` flag to pass to cmake during the generation step. pub fn define(&mut self, k: K, v: V) -> &mut Config where @@ -335,8 +353,13 @@ c_cfg.static_crt(static_crt); cxx_cfg.static_crt(static_crt); } + if let Some(explicit_flag) = self.pic { + c_cfg.pic(explicit_flag); + cxx_cfg.pic(explicit_flag); + } let c_compiler = c_cfg.get_compiler(); let cxx_compiler = cxx_cfg.get_compiler(); + let asm_compiler = c_cfg.get_compiler(); let dst = self .out_dir @@ -650,6 +673,7 @@ set_compiler("C", &c_compiler, &self.cflags); set_compiler("CXX", &cxx_compiler, &self.cxxflags); + set_compiler("ASM", &asm_compiler, &self.asmflags); } if !self.defined("CMAKE_BUILD_TYPE") {