[jhbuild] meson: Support installing within jhbuild



commit e10b72226f853c1a2a0e40d727ad4a66ece40828
Author: Patrick Griffis <tingping tingping se>
Date:   Tue Mar 21 01:04:37 2017 -0400

    meson: Support installing within jhbuild
    
    ninja is still a sysdep for now
    
    https://bugzilla.gnome.org/show_bug.cgi?id=780339

 jhbuild/moduleset.py                           |    1 -
 modulesets/gnome-suites-core-deps-3.24.modules |    7 +++++++
 2 files changed, 7 insertions(+), 1 deletions(-)
---
diff --git a/jhbuild/moduleset.py b/jhbuild/moduleset.py
index 35437af..2d5a2b4 100644
--- a/jhbuild/moduleset.py
+++ b/jhbuild/moduleset.py
@@ -56,7 +56,6 @@ virtual_sysdeps = [
     'hg',
     'libtool',
     'make',
-    'meson',
     'pkg-config',
     'svn',
     'xmlcatalog'
diff --git a/modulesets/gnome-suites-core-deps-3.24.modules b/modulesets/gnome-suites-core-deps-3.24.modules
index ee71dde..41b68ba 100644
--- a/modulesets/gnome-suites-core-deps-3.24.modules
+++ b/modulesets/gnome-suites-core-deps-3.24.modules
@@ -1496,6 +1496,13 @@
     <branch/>
   </autotools>
 
+  <distutils id="meson" python3="1">
+    <branch repo="github.com" module="mesonbuild/meson.git" revision="0.39.1"/>
+    <dependencies>
+      <dep package="ninja"/>
+    </dependencies>
+  </distutils>
+
   <cmake id="mir" cmakeargs="-DMIR_ENABLE_TESTS=0 -DMIR_PLATFORM=mesa">
     <branch repo="mir"
             module="0.8/${version}/+download/mir-${version}.tar.bz2"


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]