[gobject-introspection/wip/meson: 5/23] meson: Add fallbacks for all dependencies
- From: Nirbheek Chauhan <nirbheekc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gobject-introspection/wip/meson: 5/23] meson: Add fallbacks for all dependencies
- Date: Tue, 28 Nov 2017 12:37:12 +0000 (UTC)
commit d172d6ca8bc05835bb847422d6efbdffd481e8d7
Author: Nirbheek Chauhan <nirbheek centricular com>
Date: Tue Nov 21 21:31:50 2017 +0530
meson: Add fallbacks for all dependencies
Also add wrap files in subprojects/
meson.build | 15 ++++++++++-----
subprojects/.gitignore | 4 ++++
subprojects/glib.wrap | 5 +++++
subprojects/libffi.wrap | 4 ++++
subprojects/proxy-libintl.wrap | 4 ++++
subprojects/zlib.wrap | 4 ++++
6 files changed, 31 insertions(+), 5 deletions(-)
---
diff --git a/meson.build b/meson.build
index d9f9d2a..b117dd1 100644
--- a/meson.build
+++ b/meson.build
@@ -52,11 +52,16 @@ endif
# Always bumped to match our version
glib_version = '>=2.@0@.@1@'.format(gi_versions[1], gi_versions[2])
-gobject_dep = dependency('gobject-2.0', version : glib_version)
-gio_dep = dependency('gio-2.0', version : glib_version)
-gmodule_dep = dependency('gmodule-2.0', version : glib_version)
-giounix_dep = dependency('gio-unix-2.0', version : glib_version, required: false)
-libffi_dep = dependency('libffi')
+gobject_dep = dependency('gobject-2.0', version : glib_version,
+ fallback: ['glib', 'libgobject_dep'])
+gio_dep = dependency('gio-2.0', version : glib_version,
+ fallback: ['glib', 'libgio_dep'])
+gmodule_dep = dependency('gmodule-2.0', version : glib_version,
+ fallback: ['glib', 'libgmodule_dep'])
+giounix_dep = dependency('gio-unix-2.0', version : glib_version,
+ fallback: ['glib', 'libgio_dep'], required: false)
+libffi_dep = dependency('libffi',
+ fallback : ['libffi', 'ffi_dep'])
gir_build = get_option('gir_build')
subdir('girepository')
diff --git a/subprojects/.gitignore b/subprojects/.gitignore
new file mode 100644
index 0000000..c472ccf
--- /dev/null
+++ b/subprojects/.gitignore
@@ -0,0 +1,4 @@
+glib
+libffi
+proxy-libintl
+zlib
diff --git a/subprojects/glib.wrap b/subprojects/glib.wrap
new file mode 100644
index 0000000..2ba08bd
--- /dev/null
+++ b/subprojects/glib.wrap
@@ -0,0 +1,5 @@
+[wrap-git]
+directory=glib
+url=git://git.gnome.org/glib
+push-url=ssh://git.gnome.org/git/glib
+revision=origin/master
diff --git a/subprojects/libffi.wrap b/subprojects/libffi.wrap
new file mode 100644
index 0000000..3d15e2a
--- /dev/null
+++ b/subprojects/libffi.wrap
@@ -0,0 +1,4 @@
+[wrap-git]
+directory=libffi
+url=https://github.com/centricular/libffi.git
+revision=meson
diff --git a/subprojects/proxy-libintl.wrap b/subprojects/proxy-libintl.wrap
new file mode 100644
index 0000000..f32522e
--- /dev/null
+++ b/subprojects/proxy-libintl.wrap
@@ -0,0 +1,4 @@
+[wrap-git]
+directory=proxy-libintl
+url=https://github.com/centricular/proxy-libintl.git
+revision=master
diff --git a/subprojects/zlib.wrap b/subprojects/zlib.wrap
new file mode 100644
index 0000000..de1e861
--- /dev/null
+++ b/subprojects/zlib.wrap
@@ -0,0 +1,4 @@
+[wrap-git]
+directory=zlib
+url=https://github.com/centricular/zlib.git
+revision=meson
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]