From a93816b6baa918d321e3a896b3f910408a2ae386 Mon Sep 17 00:00:00 2001 From: Toshiki Teramura Date: Sat, 24 Dec 2022 20:11:50 +0900 Subject: [PATCH 1/2] Drop outdated exclude in openblas-src/Cargo.toml --- openblas-src/Cargo.toml | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/openblas-src/Cargo.toml b/openblas-src/Cargo.toml index dbccac4..d6d38e5 100644 --- a/openblas-src/Cargo.toml +++ b/openblas-src/Cargo.toml @@ -22,18 +22,6 @@ categories = ["science"] keywords = ["linear-algebra"] build = "build.rs" links = "openblas" -exclude = [ - "source/benchmark/*", - "source/ctest/*", - "source/lapack-netlib/BLAS/TESTING/*", - "source/lapack-netlib/CBLAS/testing/*", - "source/lapack-netlib/TESTING/*.in", - "source/lapack-netlib/TESTING/EIG/*", - "source/lapack-netlib/TESTING/LIN/*", - "source/reference/*", - "source/test/*", - "source/utest/*", -] [features] default = ["cblas", "lapacke"] From e0450faa6a8ce58e93ea2c01d5fa24c3e450e354 Mon Sep 17 00:00:00 2001 From: Toshiki Teramura Date: Sat, 24 Dec 2022 23:14:08 +0900 Subject: [PATCH 2/2] Use OUT_DIR instead of CARGO_MANIFEST_DIR to expand tar.gz --- openblas-src/build.rs | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/openblas-src/build.rs b/openblas-src/build.rs index adcd2d5..3d7a5c2 100644 --- a/openblas-src/build.rs +++ b/openblas-src/build.rs @@ -160,13 +160,13 @@ fn build() { ); } - let source = - PathBuf::from(env!("CARGO_MANIFEST_DIR")).join(format!("OpenBLAS-{}", OPENBLAS_VERSION)); + let source = output.join(format!("OpenBLAS-{}", OPENBLAS_VERSION)); if !source.exists() { + let crate_root = PathBuf::from(env!("CARGO_MANIFEST_DIR")); Command::new("tar") .arg("xf") - .arg(format!("OpenBLAS-{}.tar.gz", OPENBLAS_VERSION)) - .current_dir(env!("CARGO_MANIFEST_DIR")) + .arg(crate_root.join(format!("OpenBLAS-{}.tar.gz", OPENBLAS_VERSION))) + .current_dir(&output) .status() .expect("tar command not found"); }