Skip to content

Commit e3241f3

Browse files
authored
Merge pull request #8 from LKedward/installer-updates
Updates to the installer
2 parents 36c2ba8 + 2287b27 commit e3241f3

File tree

2 files changed

+12
-2
lines changed

2 files changed

+12
-2
lines changed

.github/workflows/make_installer.yml

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,11 @@ on:
88

99
env:
1010
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"
11+
GCC_DIGEST: "61118ef6740579b4d3afb6ccce0d60cc651c19d27e11d79fd5b94047384b9d14"
1112
GIT_DOWNLOAD: "https://github.com/git-for-windows/git/releases/download/v2.35.2.windows.1/MinGit-2.35.2-64-bit.zip"
13+
GIT_DIGEST: "61f0f2d9abd7d54fbb81b30519d4aad8be66268e67cfc9d47871010d340821c5"
1214
ENVAR_DOWNLOAD: "https://github.com/GsNSIS/EnVar/releases/download/v0.3.1/EnVar-Plugin.zip"
15+
ENVAR_DIGEST: "e5b337fcad68252d18282f7259a0306053626e41b9480fa09df3fab012b85e00"
1316

1417
jobs:
1518
make_installer:
@@ -32,6 +35,7 @@ jobs:
3235
shell: msys2 {0}
3336
run: |
3437
wget $GCC_DOWNLOAD -O mingw-w64.zip
38+
echo $GCC_DIGEST mingw-w64.zip | sha256sum --check
3539
unzip mingw-w64.zip
3640
3741
- name: Add Mingw-w64 to path to build fpm
@@ -63,12 +67,14 @@ jobs:
6367
shell: msys2 {0}
6468
run: |
6569
wget $GIT_DOWNLOAD -O MinGit.zip
70+
echo $GIT_DIGEST MinGit.zip | sha256sum --check
6671
unzip MinGit.zip -d MinGit
6772
6873
- name: Fetch EnVar Plugin for NSIS
6974
shell: msys2 {0}
7075
run: |
7176
wget $ENVAR_DOWNLOAD -O EnVar-Plugin.zip
77+
echo $ENVAR_DIGEST EnVar-Plugin.zip | sha256sum --check
7278
mkdir -p nsis-plugins/EnVar_plugin
7379
unzip EnVar-Plugin.zip -d nsis-plugins/EnVar_plugin
7480
@@ -79,6 +85,10 @@ jobs:
7985
cp /mingw64/bin/libopenblas.dll ./mingw64/bin/
8086
cp -r /mingw64/include/OpenBLAS ./mingw64/include
8187
cp -r /mingw64/lib/libopenblas.* ./mingw64/lib/
88+
cp ./mingw64/lib/libopenblas.a ./mingw64/lib/libblas.a
89+
cp ./mingw64/lib/libopenblas.a ./mingw64/lib/liblapack.a
90+
cp ./mingw64/lib/libopenblas.dll.a ./mingw64/lib/libblas.dll.a
91+
cp ./mingw64/lib/libopenblas.dll.a ./mingw64/lib/liblapack.dll.a
8292
mkdir ./mingw64/share/licenses
8393
cp -r /mingw64/share/licenses/OpenBLAS ./mingw64/share/licenses/
8494

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -64,11 +64,11 @@ currently detect existing GFortran or Intel fortran installations.__
6464
### How do I compile with BLAS/LAPACK?
6565

6666
The optimized OpenBLAS library is included with the GCC installation.
67-
Use the link flag `-lopenblas` or add the following to your `fpm.toml` file:
67+
Use the link flags `-llapack -lblas` or add the following to your `fpm.toml` file:
6868

6969
```toml
7070
[build]
71-
link = "openblas"
71+
link = ["lapack", "blas"]
7272
```
7373

7474
### How do I uninstall?

0 commit comments

Comments
 (0)