diff options
| author | Martin Herkt <lachs0r@srsfckn.biz> | 2018-09-11 01:26:28 +0200 |
|---|---|---|
| committer | Jan Ekström <jeebjp@gmail.com> | 2018-09-29 22:22:20 +0300 |
| commit | 6a57e1a29830b36fd08ae6318aec08c17a3fdc4a (patch) | |
| tree | 0d51a611b31188f29ce1b8c75f3fe834fa0e5245 | |
| parent | 0e316d7032c6781a3ae43d072cd990398244d437 (diff) | |
| download | mpv-6a57e1a29830b36fd08ae6318aec08c17a3fdc4a.tar.bz2 mpv-6a57e1a29830b36fd08ae6318aec08c17a3fdc4a.tar.xz | |
ci: explicitly call waf with python3
Python 2 may not be present in the CI images in the future,
but waf’s shebang line still uses its executable name.
Explicitly call the right major version of the interpreter.
(cherry picked from commit 6eb59fea2fca348a72b0cc8a84ccb7dcfe2f8fe6)
| -rwxr-xr-x | ci/build-mingw64.sh | 4 | ||||
| -rwxr-xr-x | ci/build-tumbleweed.sh | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/ci/build-mingw64.sh b/ci/build-mingw64.sh index 3be2d9d9ad..b957ae1cf1 100755 --- a/ci/build-mingw64.sh +++ b/ci/build-mingw64.sh @@ -16,7 +16,7 @@ export RANLIB=$TARGET-ranlib export CFLAGS="-O2 -mtune=intel -g -ggdb -pipe -Wall --param=ssp-buffer-size=4 -mms-bitfields -fmessage-length=0 -D_FORTIFY_SOURCE=2 -fexceptions -fasynchronous-unwind-tables -fstack-protector-strong -fno-ident" export LDFLAGS="-Wl,--no-keep-memory -fstack-protector-strong" -./waf configure \ +python3 ./waf configure \ --enable-static-build \ --enable-libmpv-shared \ --enable-lua \ @@ -31,4 +31,4 @@ export LDFLAGS="-Wl,--no-keep-memory -fstack-protector-strong" --enable-shaderc \ --enable-rubberband \ --enable-lcms2 -./waf build --verbose +python3 ./waf build --verbose diff --git a/ci/build-tumbleweed.sh b/ci/build-tumbleweed.sh index c626aff660..5f1c3e4a6f 100755 --- a/ci/build-tumbleweed.sh +++ b/ci/build-tumbleweed.sh @@ -1,7 +1,7 @@ #!/bin/sh set -e -./waf configure \ +python3 ./waf configure \ --enable-cdda \ --enable-dvbin \ --enable-dvdnav \ @@ -13,4 +13,4 @@ set -e --enable-shaderc \ --enable-vulkan \ --enable-zsh-comp -./waf build --verbose +python3 ./waf build --verbose |