diff options
| author | Nirbheek Chauhan <nirbheek@centricular.com> | 2017-11-21 21:31:50 +0530 |
|---|---|---|
| committer | Nirbheek Chauhan <nirbheek@centricular.com> | 2018-03-10 19:05:19 +0530 |
| commit | c2b2a76b00ec0a994426509ccd6b9dedd077f19b (patch) | |
| tree | e05b46527dbe8b2162df0a5a02e27a540021e51d | |
| parent | a9471d491425cc6b815f8b95614b6acfc0c7ff77 (diff) | |
| download | gobject-introspection-c2b2a76b00ec0a994426509ccd6b9dedd077f19b.tar.gz | |
meson: Add fallbacks for all dependencies
Also add wrap files in subprojects/
| -rw-r--r-- | meson.build | 15 | ||||
| -rw-r--r-- | subprojects/.gitignore | 4 | ||||
| -rw-r--r-- | subprojects/glib.wrap | 5 | ||||
| -rw-r--r-- | subprojects/libffi.wrap | 4 | ||||
| -rw-r--r-- | subprojects/proxy-libintl.wrap | 4 | ||||
| -rw-r--r-- | subprojects/zlib.wrap | 4 |
6 files changed, 31 insertions, 5 deletions
diff --git a/meson.build b/meson.build index d9f9d2a7..b117dd15 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 00000000..c472ccfb --- /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 00000000..2ba08bdf --- /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 00000000..3d15e2a8 --- /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 00000000..f32522ee --- /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 00000000..de1e861e --- /dev/null +++ b/subprojects/zlib.wrap @@ -0,0 +1,4 @@ +[wrap-git] +directory=zlib +url=https://github.com/centricular/zlib.git +revision=meson |