Static link libgfortran

Signed-off-by: Alexis Jeandet <[email protected]>
LaboratoryOfPlasmaPhysics · Mar 2, 2022 · 628b7f7 · 628b7f7
1 parent 40553b7
commit 628b7f7
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 5 deletions.
diff --git a/.github/workflows/pythonpublish-linux.yml b/.github/workflows/pythonpublish-linux.yml
@@ -29,4 +29,4 @@ jobs:
         env:
           TWINE_USERNAME: __token__
           TWINE_PASSWORD: ${{ secrets.PYPI_PASSWORD }}
-        run: /opt/python/cp310-cp310/bin/twine upload wheelhouse/*
+        run: /opt/python/cp310-cp310/bin/twine upload --skip-existing wheelhouse/*
diff --git a/.github/workflows/pythonpublish-osx.yml b/.github/workflows/pythonpublish-osx.yml
@@ -26,4 +26,4 @@ jobs:
         env:
           TWINE_USERNAME: __token__
           TWINE_PASSWORD: ${{ secrets.PYPI_PASSWORD }}
-        run: twine upload dist/*.whl
+        run: twine upload --skip-existing dist/*.whl
diff --git a/.github/workflows/pythonpublish-win.yml b/.github/workflows/pythonpublish-win.yml
@@ -26,4 +26,4 @@ jobs:
         env:
           TWINE_USERNAME: __token__
           TWINE_PASSWORD: ${{ secrets.PYPI_PASSWORD }}
-        run: twine upload dist/*
+        run: twine upload --skip-existing dist/*.whl
diff --git a/meson.build b/meson.build
@@ -1,7 +1,7 @@
 project(
   'py_tsyganenko',
   'cpp', 'c', 'fortran',
-  version : '0.1.0',
+  version : '0.1.1',
   default_options : ['warning_level=2', 'cpp_std=c++17', 'fortran_std=legacy'],
   license : 'GPL3'
 )
@@ -17,7 +17,8 @@ extra_files = ['setup.py', 'pyproject.toml', 'README.md',
 
 tsyganenko = static_library('tsyganenko','src/Geopack-2008_dp.for','src/T96.for',
                         extra_files: extra_files,
-                        fortran_args:['-fdollar-ok', '-ffixed-form', '-fdefault-double-8', '-fdefault-real-8'])
+                        fortran_args:['-fdollar-ok', '-ffixed-form', '-fdefault-double-8', '-fdefault-real-8', '-static-libgfortran'],
+                        link_args: ['-static-libgfortran'])
 
 libquadmath = meson.get_compiler('fortran').find_library('quadmath')