From 9d956493fc94016f967c55f17200170d985b7b27 Mon Sep 17 00:00:00 2001 From: Zeeshan Ali Date: Mon, 24 Sep 2018 17:05:30 +0200 Subject: CI: Fetch gettext & ModemManager from distro I'm not sure why we were building these from sources. --- .gitlab-ci.yml | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 1407a7f..a5bcd2a 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,11 +1,7 @@ before_script: - sed -i '/^#\sdeb-src /s/^#//' '/etc/apt/sources.list' - apt-get update && apt-get build-dep --yes geoclue-2.0 - - apt-get install --yes git gobject-introspection libmm-glib-dev wget libnotify-dev xsltproc gtk-doc-tools python3-pip ninja-build - # Further packages are installed as these are new dependencies for the latest source code, compared to the dependencies listed in the distribution version (`apt-get build-dep` always refers to the version which is built for the OS rather than the up-to-date source) - - wget https://ftp.gnu.org/gnu/gettext/gettext-0.19.8.1.tar.xz && tar xf gettext-0.19.8.1.tar.xz && cd gettext-0.19.8.1 && ./configure && make -j && make install && ldconfig && cd .. - # older Ubuntu systems require explicit `ldconfig` in order to avoid errors like `error while loading shared libraries: libgettextsrc-0.19.8.1.so: cannot open shared object file: No such file or directory` - - git clone --depth 50 --recurse-submodules https://github.com/freedesktop/ModemManager.git && cd ModemManager && ./autogen.sh --without-udev --without-mbim --without-qmi && make -j && make install && cd .. + - apt-get install --yes git gobject-introspection libmm-glib-dev wget libnotify-dev xsltproc gtk-doc-tools python3-pip ninja-build gettext modemmanager-dev - pip3 install meson # Ubuntu 14.04 is not supported, see README for details -- cgit v1.2.1