Merge pull request #8 from LKedward/installer-updates

Updates to the installer
LKedward · Oct 8, 2022 · e3241f3 · e3241f3
2 parents 36c2ba8 + 2287b27
commit e3241f3
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 2 deletions.
diff --git a/.github/workflows/make_installer.yml b/.github/workflows/make_installer.yml
@@ -8,8 +8,11 @@ on:
 
 env:
  GCC_DOWNLOAD: "https://github.com/brechtsanders/winlibs_mingw/releases/download/11.2.0-9.0.0-msvcrt-r6/winlibs-x86_64-posix-seh-gcc-11.2.0-mingw-w64-9.0.0-r6.zip"
+ GCC_DIGEST: "61118ef6740579b4d3afb6ccce0d60cc651c19d27e11d79fd5b94047384b9d14"
  GIT_DOWNLOAD: "https://github.com/git-for-windows/git/releases/download/v2.35.2.windows.1/MinGit-2.35.2-64-bit.zip"
+ GIT_DIGEST: "61f0f2d9abd7d54fbb81b30519d4aad8be66268e67cfc9d47871010d340821c5"
  ENVAR_DOWNLOAD: "https://github.com/GsNSIS/EnVar/releases/download/v0.3.1/EnVar-Plugin.zip"
+ ENVAR_DIGEST: "e5b337fcad68252d18282f7259a0306053626e41b9480fa09df3fab012b85e00"
 
 jobs:
  make_installer:
@@ -32,6 +35,7 @@ jobs:
  shell: msys2 {0}
  run: |
  wget $GCC_DOWNLOAD -O mingw-w64.zip
+ echo $GCC_DIGEST mingw-w64.zip | sha256sum --check
  unzip mingw-w64.zip
 
  - name: Add Mingw-w64 to path to build fpm
@@ -63,12 +67,14 @@ jobs:
  shell: msys2 {0}
  run: |
  wget $GIT_DOWNLOAD -O MinGit.zip
+ echo $GIT_DIGEST MinGit.zip | sha256sum --check
  unzip MinGit.zip -d MinGit
 
  - name: Fetch EnVar Plugin for NSIS
  shell: msys2 {0}
  run: |
  wget $ENVAR_DOWNLOAD -O EnVar-Plugin.zip
+ echo $ENVAR_DIGEST EnVar-Plugin.zip | sha256sum --check
  mkdir -p nsis-plugins/EnVar_plugin
  unzip EnVar-Plugin.zip -d nsis-plugins/EnVar_plugin
 
@@ -79,6 +85,10 @@ jobs:
  cp /mingw64/bin/libopenblas.dll ./mingw64/bin/
  cp -r /mingw64/include/OpenBLAS ./mingw64/include
  cp -r /mingw64/lib/libopenblas.* ./mingw64/lib/
+ cp ./mingw64/lib/libopenblas.a ./mingw64/lib/libblas.a
+ cp ./mingw64/lib/libopenblas.a ./mingw64/lib/liblapack.a
+ cp ./mingw64/lib/libopenblas.dll.a ./mingw64/lib/libblas.dll.a
+ cp ./mingw64/lib/libopenblas.dll.a ./mingw64/lib/liblapack.dll.a
  mkdir ./mingw64/share/licenses
  cp -r /mingw64/share/licenses/OpenBLAS ./mingw64/share/licenses/
 

diff --git a/README.md b/README.md
@@ -64,11 +64,11 @@ currently detect existing GFortran or Intel fortran installations.__
 ### How do I compile with BLAS/LAPACK?
 
 The optimized OpenBLAS library is included with the GCC installation.
-Use the link flag `-lopenblas` or add the following to your `fpm.toml` file:
+Use the link flags `-llapack -lblas` or add the following to your `fpm.toml` file:
 
 ```toml
 [build]
-link = "openblas"
+link = ["lapack", "blas"]
 ```
 
 ### How do I uninstall?