diff options
| author | Dudemanguy <random342@airmail.cc> | 2023-10-23 13:51:14 -0500 |
|---|---|---|
| committer | Dudemanguy <random342@airmail.cc> | 2023-10-23 19:23:48 +0000 |
| commit | 1ea106bac0095a9eb8e7c2ff0d076816d546df10 (patch) | |
| tree | 85ffe4ad4e2a3a07c3e5cf849154636594959431 /ci | |
| parent | 71a497deee8f5cb47a9ea37bc14038ecdf238e21 (diff) | |
| download | mpv-1ea106bac0095a9eb8e7c2ff0d076816d546df10.tar.bz2 mpv-1ea106bac0095a9eb8e7c2ff0d076816d546df10.tar.xz | |
ci/freebsd: disable iconv
This actually started having a linking error a few days ago, but the ci
never actually actually exited 1 for some reason so it was never caught.
The actual commits where this started happening are unrelated (reverted
all of the them to be sure) and there's no other obvious things like a
meson update that would cause this. All I can assume is some other
package within BSD itself, but I can't be bothered to debug it. Anyways,
just disable iconv in the build for now so the CI stops failing.
Presumably there's something wrong in the environment with GNU's
libiconv and the built-in one clashing somehow. Also, sdl unbelievably
defines HAVE_ICONV in their public header so we have to disable that
too.
Diffstat (limited to 'ci')
| -rwxr-xr-x | ci/build-freebsd.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ci/build-freebsd.sh b/ci/build-freebsd.sh index c674f9fd7b..bc68a255fe 100755 --- a/ci/build-freebsd.sh +++ b/ci/build-freebsd.sh @@ -9,11 +9,11 @@ meson setup build \ --werror \ -Dlibplacebo:werror=false \ -Dc_args="-Wno-error=deprecated -Wno-error=deprecated-declarations" \ + -Diconv=disabled \ -Dlibmpv=true \ -Dlua=enabled \ -Degl-drm=enabled \ -Dopenal=enabled \ - -Dsdl2=enabled \ -Dsndio=enabled \ -Dtests=true \ -Dvdpau=enabled \ |