shaba/virt-viewer
1
0
Fork 0
mirror of https://gitlab.com/virt-viewer/virt-viewer.git synced 2025-03-11 16:58:16 +03:00
Code Issues Projects Releases Wiki Activity

ci: adapt for meson 0.55 change in cross compilers

Browse Source 
Previously meson searched $PATH for libgcrypt-config, but it no longer
does this for cross-builds.

The dockerfile changes can be dropped when the following hits rawhide
container images:

  https://bugzilla.redhat.com/show_bug.cgi?id=1856446

Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
This commit is contained in:
Daniel P. Berrangé 2020-07-13 17:38:46 +01:00
parent 2f0d080179
commit 9562e0cbcd
3 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitlab-ci.yml
View File

@ -80,7 +80,6 @@ stages:
key: "$CI_JOB_NAME"
before_script:
- *script_variables
- export PATH=/usr/$ABI/sys-root/mingw/bin:$PATH
script:
- pushd "$PWD"
- mkdir -p "$SCRATCH_DIR"

3
ci/fedora-rawhide-cross-mingw32.Dockerfile
View File

@ -103,3 +103,6 @@ ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers"
ENV ABI "i686-w64-mingw32"
ENV CONFIGURE_OPTS "--host=i686-w64-mingw32"
ENV MESON_OPTS "--cross-file=/usr/share/mingw/toolchain-mingw32.meson"
# Hack until https://bugzilla.redhat.com/show_bug.cgi?id=1856446 hits rawhide
RUN perl -i -p -e "s,\[binaries\],[binaries]\nlibgcrypt-config = '/usr/i686-w64-mingw32/sys-root/mingw/bin/libgcrypt-config'," /usr/share/mingw/toolchain-mingw32.meson

3
ci/fedora-rawhide-cross-mingw64.Dockerfile
View File

@ -103,3 +103,6 @@ ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers"
ENV ABI "x86_64-w64-mingw32"
ENV CONFIGURE_OPTS "--host=x86_64-w64-mingw32"
ENV MESON_OPTS "--cross-file=/usr/share/mingw/toolchain-mingw64.meson"
# Hack until https://bugzilla.redhat.com/show_bug.cgi?id=1856446 hits rawhide
RUN perl -i -p -e "s,\[binaries\],[binaries]\nlibgcrypt-config = '/usr/x86_64-w64-mingw32/sys-root/mingw/bin/libgcrypt-config'," /usr/share/mingw/toolchain-mingw64.meson