[gimp/wip/schumaml/gegl-goes-meson: 3/3] build: .gitlab-ci.yml: GEGL is switching to meson exclusively
- From: Jehan <jehanp src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gimp/wip/schumaml/gegl-goes-meson: 3/3] build: .gitlab-ci.yml: GEGL is switching to meson exclusively
- Date: Fri, 16 Aug 2019 19:11:29 +0000 (UTC)
commit 48290730ba673e38667757b2c29b64bd370ff80b
Author: Michael Schumacher <schumaml gmx de>
Date: Fri Aug 16 19:39:33 2019 +0200
build: .gitlab-ci.yml: GEGL is switching to meson exclusively
.gitlab-ci.yml | 14 ++++++++------
1 file changed, 8 insertions(+), 6 deletions(-)
---
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 183d56e360..cb298031cc 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -84,15 +84,17 @@ babl-git-meson:
- cd _gegl
- mkdir _build
-gegl-git-autotools:
+gegl-git-meson:
extends: .gegl-base
variables:
GIT_STRATEGY: none
script:
- - cd _build
- - PKG_CONFIG_PATH="$INSTALL_PREFIX/lib/pkgconfig" ../autogen.sh --prefix="$INSTALL_PREFIX"
$CONFIG_OPTIONS
- - LD_LIBRARY_PATH="$INSTALL_PREFIX/lib:$LD_LIBRARY_PATH" make -j `nproc`
- - LD_LIBRARY_PATH="$INSTALL_PREFIX/lib:$LD_LIBRARY_PATH" make install
+ - export PKG_CONFIG_PATH="$INSTALL_PREFIX/lib/pkgconfig"
+ - export LD_LIBRARY_PATH="$INSTALL_PREFIX/lib:$LD_LIBRARY_PATH"
+ - export XDG_DATA_DIRS="$INSTALL_PREFIX/share:$XDG_DATA_DIRS"
+ - meson -Dprefix="$INSTALL_PREFIX" _build
+ - ninja -C _build
+ - ninja -C _build install
.gimp-base:
stage: gimp
@@ -197,7 +199,7 @@ build-all-git:
extends: .build-all
dependencies:
- babl-git-meson
- - gegl-git-autotools
+ - gegl-git-meson
# build-all-git-meson:
# extends: .build-all
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]