From 01ebe27a8277d9f1acd88462d0643683608ca9e9 Mon Sep 17 00:00:00 2001 From: Emmanuele Bassi Date: Tue, 14 Jan 2020 11:09:45 +0000 Subject: build: Use find_program() Do not rely on the shebang line and the executable bit; we should use find_program(), instead, which lets Meson run a script in the appropriate environment, portably. --- meson.build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meson.build b/meson.build index 029798c..47d3997 100644 --- a/meson.build +++ b/meson.build @@ -197,7 +197,7 @@ if host_system == 'windows' endif # Generates the dispatch tables -gen_dispatch_py = files('src/gen_dispatch.py') +gen_dispatch_py = find_program('src/gen_dispatch.py') gl_registry = files('registry/gl.xml') egl_registry = files('registry/egl.xml') -- cgit v1.2.1 From 1c650934169a9663f76576d7430da0599e365e3e Mon Sep 17 00:00:00 2001 From: Emmanuele Bassi Date: Tue, 14 Jan 2020 11:17:51 +0000 Subject: ci: Unlink python2 on macOS Otherwise installing Python3 will break horribly. --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index 52c043e..0fe6610 100644 --- a/.travis.yml +++ b/.travis.yml @@ -28,6 +28,7 @@ before_install: - | if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew update + brew unlink python@2 brew install python@3 meson # Use a Ninja with QuLogic's patch: https://github.com/ninja-build/ninja/issues/1219 mkdir -p $HOME/tools; curl -L http://nirbheek.in/files/binaries/ninja/macos/ninja -o $HOME/tools/ninja; chmod +x $HOME/tools/ninja -- cgit v1.2.1