summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAleksander Morgado <aleksander@aleksander.es>2021-08-06 10:43:54 +0200
committerAleksander Morgado <aleksander@aleksander.es>2021-08-06 15:18:20 +0200
commit73e403e26406b57a33a05a6ffc8a4b9304bba165 (patch)
treeb6744d28a3e925976ad2529e6753cc835e69dcad
parente26dd75c0160cc30de3e8ecc9a33901abb648314 (diff)
downloadlibqmi-qmi-1-28.tar.gz
ci: switch to build libqrtr-glib from git using mesonqmi-1-28
(cherry picked from commit d3bafc485f9a70ea469c0b815d33171a2a88e08a)
-rw-r--r--.gitlab-ci.yml14
1 files changed, 6 insertions, 8 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 0acd3bdc..b0f2e299 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -78,10 +78,9 @@ build-autotools-no-mbim:
script:
- git clone --depth 1 https://gitlab.freedesktop.org/mobile-broadband/libqrtr-glib.git
- pushd libqrtr-glib
- - NOCONFIGURE=1 ./autogen.sh
- - ./configure --prefix=/usr --disable-gtk-doc --disable-introspection
- - make
- - make install
+ - meson setup build --prefix=/usr -Dgtk_doc=false -Dintrospection=false
+ - ninja -C build
+ - ninja -C build install
- popd
- NOCONFIGURE=1 ./autogen.sh
- ./configure --prefix=/usr --disable-gtk-doc --disable-introspection --disable-mbim-qmux --enable-qrtr
@@ -202,10 +201,9 @@ build-autotools-default:
- popd
- git clone --depth 1 https://gitlab.freedesktop.org/mobile-broadband/libqrtr-glib.git
- pushd libqrtr-glib
- - NOCONFIGURE=1 ./autogen.sh
- - ./configure --prefix=/usr --enable-gtk-doc --enable-introspection
- - make
- - make install
+ - meson setup build --prefix=/usr -Dgtk_doc=false -Dintrospection=true
+ - ninja -C build
+ - ninja -C build install
- popd
- NOCONFIGURE=1 ./autogen.sh
- ./configure --prefix=/usr --enable-gtk-doc --enable-introspection --enable-mbim-qmux --enable-qrtr