Try to force libquadmath as static lib

Signed-off-by: Alexis Jeandet <alexis.jeandet@member.fsf.org>
LaboratoryOfPlasmaPhysics · Mar 10, 2022 · 024f433 · 024f433
1 parent 587b985
commit 024f433
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 9 deletions.
diff --git a/.github/workflows/pythonpublish-linux.yml b/.github/workflows/pythonpublish-linux.yml
@@ -11,18 +11,26 @@ jobs:
     container: quay.io/pypa/manylinux2014_x86_64
     steps:
       - name: install deps
-        run: yum install -y libcurl-devel && /opt/python/cp310-cp310/bin/pip install twine
+        run: yum install -y libcurl-devel && /opt/python/cp310-cp310/bin/pip install twine ninja
       - uses: actions/checkout@v1
         with:
           submodules: true
       - name: Build for Python 3.7
-        run: /opt/python/cp37-cp37m/bin/python -m build .
+        run: |
+            /opt/python/cp37-cp37m/bin/pip install meson ninja
+            /opt/python/cp37-cp37m/bin/python -m build .
       - name: Build for Python 3.8
-        run: /opt/python/cp38-cp38/bin/python -m build .
+        run: |
+            /opt/python/cp38-cp38/bin/pip install meson ninja
+            /opt/python/cp38-cp38/bin/python -m build .
       - name: Build for Python 3.9
-        run: /opt/python/cp39-cp39/bin/python -m build .
+        run: |
+            /opt/python/cp39-cp39/bin/pip install meson ninja
+            /opt/python/cp39-cp39/bin/python -m build .
       - name: Build for Python 3.10
-        run: /opt/python/cp310-cp310/bin/python -m build .
+        run: |
+            /opt/python/cp310-cp310/bin/pip install meson ninja
+            /opt/python/cp310-cp310/bin/python -m build .
       - name: Make wheels universal
         run: for wheel in $(ls dist/*.whl); do auditwheel repair $wheel; done
       - name: Publish on PyPi

diff --git a/.github/workflows/pythonpublish-osx.yml b/.github/workflows/pythonpublish-osx.yml
@@ -20,7 +20,7 @@ jobs:
           python-version: ${{ matrix.python-version }}
           architecture: x64
       - run: |
-          pip install --upgrade twine build auditwheel
+          pip install --upgrade twine build auditwheel ninja meson
           FC=gfortran-11 CC=gcc-11 CXX=g++-11 python -m build .
       - name: Publish on PyPi
         env:

diff --git a/.github/workflows/pythonpublish-win.yml b/.github/workflows/pythonpublish-win.yml
@@ -8,7 +8,7 @@ jobs:
   build:
     runs-on: windows-latest
     strategy:
-      max-parallel: 1
+      max-parallel: 4
       matrix:
         python-version: ['3.7', '3.8', '3.9', '3.10']
     name: Python ${{ matrix.python-version }}

diff --git a/meson.build b/meson.build
@@ -1,7 +1,7 @@
 project(
   'py_tsyganenko',
   'cpp', 'c', 'fortran',
-  version : '0.1.3',
+  version : '0.1.4',
   default_options : ['warning_level=2', 'cpp_std=c++17', 'fortran_std=legacy'],
   license : 'GPL3'
 )
@@ -20,7 +20,7 @@ tsyganenko = static_library('tsyganenko','src/Geopack-2008_dp.for','src/T96.for'
                         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')
+libquadmath = meson.get_compiler('fortran').find_library('quadmath', static:true)
 
 srcs = [
   'wrapper/wrapper.cpp'