Merge pull request #5 from rgommers/unvendor

Merge Meson 1.2.3

Author: rgommers

.github/workflows/msys2.yml

@@ -51,9 +51,6 @@ jobs:
             TOOLCHAIN: clang
     env:
       MESON_CI_JOBNAME: msys2-${{ matrix.NAME }}
-      # XXX: For some reason enabling jit debugging "fixes" random python crashes
-      # see https://github.com/msys2/MINGW-packages/issues/11864
-      MSYS: "winjitdebug"
 
     defaults:
       run:

README.md

@@ -15,6 +15,11 @@ build system.
  - [Python](https://python.org) (version 3.7 or newer)
  - [Ninja](https://ninja-build.org) (version 1.8.2 or newer)
 
+Latest Meson version supporting previous Python versions:
+- Python 3.6: **0.61.5**
+- Python 3.5: **0.56.2**
+- Python 3.4: **0.45.1**
+
 #### Installing from source
 
 Meson is available on [PyPi](https://pypi.python.org/pypi/meson), so

ci/ciimage/build.py

@@ -137,13 +137,14 @@ def copy_meson(self) -> None:
         shutil.copytree(
             self.meson_root,
             self.temp_dir / 'meson',
+            symlinks=True,
             ignore=shutil.ignore_patterns(
                 '.git',
                 '*_cache',
                 '__pycache__',
                 # 'work area',
                 self.temp_dir.name,
-            )
+            ),
         )
 
     def do_test(self, tty: bool = False) -> None:
@@ -175,7 +176,7 @@ def do_test(self, tty: bool = False) -> None:
             else:
                 test_cmd = [
                     self.docker, 'run', '--rm', '-t', 'meson_test_image',
-                    '/bin/bash', '-c', 'source /ci/env_vars.sh; cd meson; ./run_tests.py $CI_ARGS'
+                    '/bin/bash', '-xc', 'source /ci/env_vars.sh; cd meson; ./run_tests.py $CI_ARGS'
                 ]
 
             if subprocess.run(test_cmd).returncode != 0 and not tty:

ci/ciimage/common.sh

@@ -39,11 +39,11 @@ dub_fetch() {
 }
 
 install_minimal_python_packages() {
-  rm -f /usr/lib/python3.*/EXTERNALLY-MANAGED
+  rm -f /usr/lib*/python3.*/EXTERNALLY-MANAGED
   python3 -m pip install "${base_python_pkgs[@]}" $*
 }
 
 install_python_packages() {
-  rm -f /usr/lib/python3.*/EXTERNALLY-MANAGED
+  rm -f /usr/lib*/python3.*/EXTERNALLY-MANAGED
   python3 -m pip install "${base_python_pkgs[@]}" "${python_pkgs[@]}" $*
 }

ci/ciimage/opensuse/install.sh

@@ -9,7 +9,7 @@ pkgs=(
   ninja make git autoconf automake patch libjpeg-devel
   elfutils gcc gcc-c++ gcc-fortran gcc-objc gcc-obj-c++ vala rust bison flex curl lcov
   mono-core gtkmm3-devel gtest gmock protobuf-devel wxGTK3-3_2-devel gobject-introspection-devel
-  itstool gtk3-devel java-15-openjdk-devel gtk-doc llvm-devel clang-devel libSDL2-devel graphviz-devel zlib-devel zlib-devel-static
+  itstool gtk3-devel java-17-openjdk-devel gtk-doc llvm-devel clang-devel libSDL2-devel graphviz-devel zlib-devel zlib-devel-static
   #hdf5-devel netcdf-devel libscalapack2-openmpi3-devel libscalapack2-gnu-openmpi3-hpc-devel openmpi3-devel
   doxygen vulkan-devel vulkan-validationlayers openssh mercurial gtk-sharp3-complete gtk-sharp2-complete libpcap-devel libgpgme-devel
   libqt5-qtbase-devel libqt5-qttools-devel libqt5-linguist libqt5-qtbase-private-headers-devel

cross/armclang-linux.txt

@@ -22,7 +22,7 @@ c = ['/opt/arm/developmentstudio-2019.0/sw/ARMCompiler6.12/bin/armclang', '--tar
 #cpp = '/usr/bin/arm-linux-gnueabihf-g++'
 ar = '/opt/arm/developmentstudio-2019.0/sw/ARMCompiler6.12/bin/armar'
 #strip = '/usr/arm-linux-gnueabihf/bin/strip'
-#pkgconfig = '/usr/bin/arm-linux-gnueabihf-pkg-config'
+#pkg-config = '/usr/bin/arm-linux-gnueabihf-pkg-config'
 
 [host_machine]
 system = 'baremetal'

cross/linux-mingw-w64-32bit.txt

@@ -4,7 +4,7 @@ cpp = '/usr/bin/i686-w64-mingw32-g++'
 objc = '/usr/bin/i686-w64-mingw32-gcc'
 ar = '/usr/bin/i686-w64-mingw32-ar'
 strip = '/usr/bin/i686-w64-mingw32-strip'
-pkgconfig = '/usr/bin/i686-w64-mingw32-pkg-config'
+pkg-config = '/usr/bin/i686-w64-mingw32-pkg-config'
 windres = '/usr/bin/i686-w64-mingw32-windres'
 exe_wrapper = 'wine'
 ld = '/usr/bin/i686-w64-mingw32-ld'

cross/linux-mingw-w64-64bit.txt

@@ -4,9 +4,9 @@ cpp = '/usr/bin/x86_64-w64-mingw32-g++'
 objc = '/usr/bin/x86_64-w64-mingw32-gcc'
 ar = '/usr/bin/x86_64-w64-mingw32-ar'
 strip = '/usr/bin/x86_64-w64-mingw32-strip'
-pkgconfig = '/usr/bin/x86_64-w64-mingw32-pkg-config'
+pkg-config = '/usr/bin/x86_64-w64-mingw32-pkg-config'
 windres = '/usr/bin/x86_64-w64-mingw32-windres'
-exe_wrapper = 'wine64'
+exe_wrapper = 'wine'
 cmake = '/usr/bin/cmake'
 
 [properties]

cross/none.txt

@@ -15,5 +15,5 @@ fc = ['false']
 objc = ['false']
 objcpp = ['false']
 ar = ['false']
-pkgconfig = ['false']
+pkg-config = ['false']
 cmake = ['false']

cross/ubuntu-armhf.txt

@@ -6,7 +6,7 @@ cpp = ['/usr/bin/arm-linux-gnueabihf-g++']
 rust = ['rustc', '--target', 'arm-unknown-linux-gnueabihf', '-C', 'linker=/usr/bin/arm-linux-gnueabihf-gcc-7']
 ar = '/usr/arm-linux-gnueabihf/bin/ar'
 strip = '/usr/arm-linux-gnueabihf/bin/strip'
-pkgconfig = '/usr/bin/arm-linux-gnueabihf-pkg-config'
+pkg-config = '/usr/bin/arm-linux-gnueabihf-pkg-config'
 ld = '/usr/bin/arm-linux/gnueabihf-ld'
 
 [built-in options]