From 696b8359117d53ae6fae83fa6bf3fc5f9228055f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= <berrange@redhat.com>
Date: Tue, 12 Jan 2021 18:34:27 +0000
Subject: [PATCH] gitlab: convert to use meson for libvirt-glib
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

https://gitlab.com/libvirt/libvirt-glib/-/issues/2
Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
---
 .gitlab-ci.yml | 16 ++++++----------
 1 file changed, 6 insertions(+), 10 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index efb77c2..4d8ab94 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -55,11 +55,9 @@ stages:
     - meson build -Ddriver_libvirtd=disabled "--prefix=$VROOT" "--libdir=$LIBDIR"
     - ninja -C build install
     - cd ../libvirt-glib
-    - mkdir build
-    - cd build
-    - ../autogen.sh --prefix="$VROOT" --libdir="$LIBDIR"
-    - $MAKE install
-    - cd ../../gtk-vnc
+    - meson build --prefix="$VROOT" --libdir="$LIBDIR" -Ddocs=disabled
+    - $NINJA -C build install
+    - cd ../gtk-vnc
     - git submodule update --init
     - meson build --prefix="$VROOT" --libdir="$LIBDIR"
     - $NINJA -C build install
@@ -90,11 +88,9 @@ stages:
     - meson build -Ddriver_libvirtd=disabled "--prefix=$VROOT" "--libdir=$LIBDIR" $MESON_OPTS
     - ninja -C build install
     - cd ../libvirt-glib
-    - mkdir build
-    - cd build
-    - ../autogen.sh $CONFIGURE_OPTS --prefix="$VROOT" --libdir="$LIBDIR"
-    - $MAKE install
-    - cd ../../gtk-vnc
+    - meson build --prefix="$VROOT" --libdir="$LIBDIR" -Ddocs=disabled $MESON_OPTS
+    - $NINJA -C build install
+    - cd ../gtk-vnc
     - git submodule update --init
     - meson build $MESON_OPTS --prefix="$VROOT" --libdir="$LIBDIR" -Dintrospection=disabled
     - $NINJA -C build install