CI: fix macos unbreaking python

.github/workflows/macos.yml

@@ -40,16 +40,16 @@ jobs:
         python -m pip install pytest pytest-xdist pytest-subtests fastjsonschema coverage
     - run: brew install pkg-config ninja llvm qt@5
     - env:
-        CPPFLAGS: "-I/usr/local/include"
-        LDFLAGS: "-L/usr/local/lib"
+        CPPFLAGS: "-I/opt/homebrew/include"
+        LDFLAGS: "-L/opt/homebrew/lib"
         MESON_CI_JOBNAME: unittests-appleclang
         MESON_UNIT_TEST_BACKEND: ninja
         HOMEBREW_NO_AUTO_UPDATE: 1
         # These cannot evaluate anything, so we cannot set PATH or SDKROOT here
       run: |
         export SDKROOT="$(xcodebuild -version -sdk macosx Path)"
-        export PATH="$HOME/tools:/usr/local/opt/qt@5/bin:$PATH:$(brew --prefix llvm)/bin"
-        export PKG_CONFIG_PATH="/usr/local/opt/qt@5/lib/pkgconfig:$PKG_CONFIG_PATH"
+        export PATH="$HOME/tools:/opt/homebrew/opt/qt@5/bin:/opt/homebrew/opt/llvm/bin:$PATH"
+        export PKG_CONFIG_PATH="/opt/homebrew/opt/qt@5/lib/pkgconfig:$PKG_CONFIG_PATH"
         ./tools/run_with_cov.py ./run_unittests.py
 
     - name: Aggregate coverage reports
@@ -93,25 +93,25 @@ jobs:
         # Delete nonsensical PEP 668 breakage. It is the wrong solution to the problem and isn't designed to be
         # productive -- only victim blaming -- however it bites particularly badly because this is a container/VM
         # See commit 5c479d7a13a518c18ccb4dc3b6bdd7bfc2a9bdb5 for a more thorough analysis.
-        find /usr/local/Cellar/python* -name EXTERNALLY-MANAGED -print0 | xargs -0 rm -vf
+        find /opt/homebrew/Cellar/python* -name EXTERNALLY-MANAGED -print0 | xargs -0 rm -vf
     # 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 boost-python3 gtk-doc
+    - run: brew install pkg-config ninja llvm qt@5 boost ldc hdf5 openmpi lapack scalapack sdl2 boost-python3 gtk-doc zstd ncurses
     - run: |
         python3 -m pip install --upgrade setuptools
         python3 -m pip install --upgrade pip
         python3 -m pip install cython coverage
     - env:
-        CPPFLAGS: "-I/usr/local/include"
-        LDFLAGS: "-L/usr/local/lib"
+        CPPFLAGS: "-I/opt/homebrew/include"
+        LDFLAGS: "-L/opt/homebrew/lib"
         MESON_ARGS: --unity=${{ matrix.unity }}
+        XML_CATALOG_FILES: "/opt/homebrew/etc/xml/catalog"
         CI: 1
         # These cannot evaluate anything, so we cannot set PATH or SDKROOT here
       run: |
         export SDKROOT="$(xcodebuild -version -sdk macosx Path)"
-        export PATH="$HOME/tools:/usr/local/opt/qt@5/bin:$PATH:$(brew --prefix llvm)/bin"
-        export PKG_CONFIG_PATH="/usr/local/opt/qt@5/lib/pkgconfig:$PKG_CONFIG_PATH"
-        export XML_CATALOG_FILES="/usr/local/etc/xml/catalog"
+        export PATH="$HOME/tools:/opt/homebrew/opt/qt@5/bin:/opt/homebrew/opt/llvm/bin:/opt/homebrew/opt/ncurses/bin:$PATH"
+        export PKG_CONFIG_PATH="/opt/homebrew/opt/qt@5/lib/pkgconfig:/opt/homebrew/opt/lapack/lib/pkgconfig:/opt/homebrew/opt/ncurses/lib/pkgconfig:$PKG_CONFIG_PATH"
         ./tools/run_with_cov.py ./run_project_tests.py --backend=ninja
 
     - name: Aggregate coverage reports
@@ -126,7 +126,9 @@ jobs:
         verbose: true
 
   Qt4macos:
-    runs-on: macos-latest
+    # This job only works on Intel Macs, because OpenSSL 1.0 doesn't build on
+    # Apple ARM
+    runs-on: macos-13
     env:
       HOMEBREW_NO_AUTO_UPDATE: 1
     steps:

mesonbuild/dependencies/boost.py

@@ -665,8 +665,9 @@ def detect_roots(self) -> None:
         inc_paths = [x.resolve() for x in inc_paths]
         roots += inc_paths
 
+        m = self.env.machines[self.for_machine]
         # Add system paths
-        if self.env.machines[self.for_machine].is_windows():
+        if m.is_windows():
             # Where boost built from source actually installs it
             c_root = Path('C:/Boost')
             if c_root.is_dir():
@@ -688,8 +689,12 @@ def detect_roots(self) -> None:
             tmp: T.List[Path] = []
 
             # Add some default system paths
+            if m.is_darwin():
+                tmp.extend([
+                    Path('/opt/homebrew/'),        # for Apple Silicon MacOS
+                    Path('/usr/local/opt/boost'),  # for Intel Silicon MacOS
+                ])
             tmp += [Path('/opt/local')]
-            tmp += [Path('/usr/local/opt/boost')]
             tmp += [Path('/usr/local')]
             tmp += [Path('/usr')]
 

test cases/common/103 has header symbol/meson.build

@@ -1,7 +1,10 @@
+# SPDX-License-Identifier: Apache-2.0
+# Copyright © 2024 Intel Corporation
+
 project(
   'has header symbol',
   'c', 'cpp',
-  default_options : ['cpp_std=c++11'],
+  default_options : ['cpp_std=c++14'],
 )
 
 cc = meson.get_compiler('c')