Merge branch 'master' into experimentalgensln

.github/workflows/macos.yml

@@ -69,9 +69,15 @@ jobs:
     - uses: actions/checkout@v2
     # Avoid picking up an older version of LLVM that does not work.
     - run: brew update
+    # github actions overwrites brew's python. Force it to reassert itself, by running in a separate step.
+    - name: unbreak python in github actions
+      run: |
+        find /usr/local/bin -lname '*/Library/Frameworks/Python.framework/*' -delete
+        sudo rm -rf /Library/Frameworks/Python.framework/
+        brew install --force python3 && brew unlink python3 && brew unlink python3 && brew link --overwrite python3
     # use python3 from homebrew because it is a valid framework, unlike the actions one:
     # https://github.com/actions/setup-python/issues/58
-    - run: brew install pkg-config ninja llvm qt@5 boost ldc hdf5 openmpi lapack scalapack sdl2 python3 boost-python3 gtk-doc
+    - run: brew install pkg-config ninja llvm qt@5 boost ldc hdf5 openmpi lapack scalapack sdl2 boost-python3 gtk-doc
     - run: |
         python3 -m pip install --upgrade setuptools
         python3 -m pip install --upgrade pip

docs/markdown/Builtin-options.md

@@ -146,7 +146,7 @@ The value of `b_sanitize` can be one of: `none`, `address`, `thread`,
 compilers might not support all of them. For example Visual Studio
 only supports the address sanitizer.
 
-* < 0 means disable, == 0 means automatic selection, > 0 sets a specific number to use
+\* < 0 means disable, == 0 means automatic selection, > 0 sets a specific number to use
 
 LLVM supports `thin` lto, for more discussion see [LLVM's documentation](https://clang.llvm.org/docs/ThinLTO.html)
 

test cases/python/2 extmodule/meson.build

@@ -34,10 +34,17 @@ py.install_sources(blaster, subdir: 'pure')
 
 py3_pkg_dep = dependency('python3', method: 'pkg-config', required : false)
 if py3_pkg_dep.found()
-  python_lib_dir = py3_pkg_dep.get_pkgconfig_variable('libdir')
-
-  # Check we can apply a version constraint
-  dependency('python3', version: '>=@0@'.format(py_dep.version()))
+  py3_dep_majver = py3_pkg_dep.version().split('.')
+  py3_dep_majver = py3_dep_majver[0] + '.' + py3_dep_majver[1]
+  message(f'got two pythons: pkg-config is @py3_dep_majver@, and module is', py.language_version())
+  if py3_dep_majver != py.language_version()
+    message('skipped python3 pkg-config test because the default python3 is different from Meson\'s')
+  else
+    python_lib_dir = py3_pkg_dep.get_pkgconfig_variable('libdir')
+
+    # Check we can apply a version constraint
+    dependency('python3', version: '>=@0@'.format(py_dep.version()))
+  endif
 else
-  message('Skipped python3 pkg-config test')
+  message('Skipped python3 pkg-config test because it was not found')
 endif

test cases/python3/3 cython/meson.build

@@ -6,8 +6,14 @@ py3_dep = dependency('python3', required : false)
 
 if cython.found() and py3_dep.found()
   py3_dep = dependency('python3')
+  py3_dep_majver = py3_dep.version().split('.')
+  py3_dep_majver = py3_dep_majver[0] + '.' + py3_dep_majver[1]
   py3_mod = import('python3')
   py3 = py3_mod.find_python()
+  if py3_dep_majver != py3_mod.language_version()
+      v = py3_mod.language_version()
+      error('MESON_SKIP_TEST: deprecated python3 module is non-functional when default python3 is different from Meson\'s', v)
+  endif
   subdir('libdir')
 
   test('cython tester',