From 628b7f7c0fdb7836dfead1017424570f4f564ddf Mon Sep 17 00:00:00 2001 From: Alexis Jeandet Date: Tue, 1 Mar 2022 18:36:53 +0100 Subject: [PATCH] Static link libgfortran Signed-off-by: Alexis Jeandet --- .github/workflows/pythonpublish-linux.yml | 2 +- .github/workflows/pythonpublish-osx.yml | 2 +- .github/workflows/pythonpublish-win.yml | 2 +- meson.build | 5 +++-- 4 files changed, 6 insertions(+), 5 deletions(-) diff --git a/.github/workflows/pythonpublish-linux.yml b/.github/workflows/pythonpublish-linux.yml index 28f7aeb..9664c62 100644 --- 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 index 7208e9e..4428af4 100644 --- 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 index 760a2c0..1e26bf1 100644 --- 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 index 5fd6896..de6d450 100644 --- 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')