Merge branch 'master' into pr/63

Author: termoshtt

LICENSE.md

@@ -11,7 +11,7 @@ The following two notices apply to every file of the project.
 ## The Apache License
 
 ```
-Copyright 2015–2020 The openblas-src Developers
+Copyright 2015–2021 The openblas-src Developers
 
 Licensed under the Apache License, Version 2.0 (the “License”); you may not use
 this file except in compliance with the License. You may obtain a copy of the
@@ -28,7 +28,7 @@ specific language governing permissions and limitations under the License.
 ## The MIT License
 
 ```
-Copyright 2015–2020 The openblas-src Developers
+Copyright 2015–2021 The openblas-src Developers
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of
 this software and associated documentation files (the “Software”), to deal in

README.md

@@ -8,7 +8,7 @@ The package provides a source of [BLAS] and [LAPACK] via [OpenBLAS].
 
 The following Cargo features are supported:
 
-* `cache` to build in shared directory e.g. `$XDG_DATA_HOME/openblas_build/` instead of `target` (see below),
+* `cache` to build in a shared directory instead of `target` (see below),
 * `cblas` to build CBLAS (enabled by default),
 * `lapacke` to build LAPACKE (enabled by default),
 * `static` to link to OpenBLAS statically, and
@@ -17,16 +17,16 @@ The following Cargo features are supported:
 ## Caching
 
 The `cache` feature allows the OpenBLAS build products to be reused between
-crates that have different `target` directories.
-This avoids rebuilding OpenBLAS unnecessarily.
-However, this also prevents `cargo clean` from working properly,
+crates that have different `target` directories. This avoids rebuilding OpenBLAS
+unnecessarily. However, this also prevents `cargo clean` from working properly,
 since the aforementioned build products will not be removed by the command.
 
-The OpenBLAS binary will be placed at `$XDG_DATA_HOME/openblas_build/[hash of build configure object]`.
-For example, build with LAPACK and build without LAPACK will be placed on different directories.
-If you build OpenBLAS as a shared library, you need to add the above directory to
-`LD_LIBRARY_PATH` (for Linux) or `DYLD_LIBRARY_PATH` (for macOS).
-Since build from source is not supported on Windows (see next section), this feature is also not supported.
+The OpenBLAS binary will be placed at `${XDG_DATA_HOME}/openblas_build/[hash of
+build configure object]`. For example, build with LAPACK and build without
+LAPACK will be placed on different directories. If you build OpenBLAS as a
+shared library, you need to add the above directory to `LD_LIBRARY_PATH` (for
+Linux) or `DYLD_LIBRARY_PATH` (for macOS). Since build from source is not
+supported on Windows (see next section), this feature is also not supported.
 
 ## Windows and vcpkg
 

openblas-build/Cargo.toml

@@ -1,17 +1,19 @@
 [package]
 name = "openblas-build"
 version = "0.1.1"
-authors = ["Toshiki Teramura <toshiki.teramura@gmail.com>"]
+license = "Apache-2.0/MIT"
 edition = "2018"
-
-license = "MIT OR Apache-2.0"
-exclude = ["test_build/"]
-readme  = "../README.md"
-
-description   = "OpenBLAS build helper"
+authors = [
+    "Toshiki Teramura <toshiki.teramura@gmail.com>",
+]
+description = "The package provides a build helper for OpenBLAS."
 documentation = "https://docs.rs/openblas-build"
-homepage      = "https://github.com/blas-lapack-rs/openblas-src"
-repository    = "https://github.com/blas-lapack-rs/openblas-src"
+homepage = "https://github.com/blas-lapack-rs/openblas-src"
+repository = "https://github.com/blas-lapack-rs/openblas-src"
+readme  = "../README.md"
+exclude = [
+    "test_build/",
+]
 
 [dependencies]
 thiserror = "1.0.22"

openblas-src/Cargo.toml

@@ -1,14 +1,15 @@
 [package]
 name = "openblas-src"
-version = "0.10.2"
-license = "MIT OR Apache-2.0"
+version = "0.10.3"
+license = "Apache-2.0/MIT"
 edition = "2018"
 authors = [
     "Corey Richardson <corey@octayn.net>",
     "Ethan Smith <ethan@ethanhs.me>",
     "Ivan Ukhov <ivan.ukhov@gmail.com>",
     "Jim Turner <git@turner.link>",
     "Ken Elkabany <ken@elkabany.com>",
+    "Mitsutoshi Aoe <me@maoe.name>",
     "Steve Harris <steveOfAR@gmail.com>",
     "Toshiki Teramura <toshiki.teramura@gmail.com>",
 ]

openblas-src/build.rs

@@ -149,6 +149,7 @@ fn build() {
     let source = PathBuf::from(env!("CARGO_MANIFEST_DIR")).join("source");
     let deliv = cfg.build(&source, &output).unwrap();
 
+    println!("cargo:rustc-link-search={}", output.display());
     for search_path in &deliv.make_conf.c_extra_libs.search_paths {
         println!("cargo:rustc-link-search={}", search_path.display());
     }
@@ -161,7 +162,6 @@ fn build() {
     for lib in &deliv.make_conf.f_extra_libs.libs {
         println!("cargo:rustc-link-lib={}", lib);
     }
-    println!("cargo:rustc-link-search={}", output.display());
 }
 
 /// openblas-src 0.9.0 compatible `make` runner