diff options
| author | Emmanuele Bassi <ebassi@gmail.com> | 2018-10-05 10:19:45 +0000 |
|---|---|---|
| committer | Emmanuele Bassi <ebassi@gmail.com> | 2018-10-05 10:19:45 +0000 |
| commit | 947c85cd2a390e32dd1c0644bbce0a85357ebbc7 (patch) | |
| tree | 8d6230346479f4cd1597bc3b6d389217acc522ab /gdk-pixbuf | |
| parent | 9435ec5ccc0d8002cb9bec021b419d57732d334b (diff) | |
| parent | 2335d2191d599cb539a97a64bd76735cf0e9ec85 (diff) | |
| download | gdk-pixbuf-947c85cd2a390e32dd1c0644bbce0a85357ebbc7.tar.gz | |
Merge branch 'workaround-modules-osx' into 'master'
Workaround to install modules with .so suffix on osx
See merge request GNOME/gdk-pixbuf!19
Diffstat (limited to 'gdk-pixbuf')
| -rw-r--r-- | gdk-pixbuf/meson.build | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/gdk-pixbuf/meson.build b/gdk-pixbuf/meson.build index 9a1083a93..166d23140 100644 --- a/gdk-pixbuf/meson.build +++ b/gdk-pixbuf/meson.build @@ -243,6 +243,12 @@ foreach l: loaders sources = l[1] cond = l.get(2, true) cflags = l.get(3, []) + name_suffix = [] + + # FIXME: workaround for https://gitlab.gnome.org/GNOME/glib/issues/1413 + if host_system == 'darwin' + name_suffix = 'so' + endif if cond and not (builtin_loaders.contains(name) or builtin_all_loaders) mod = shared_module('pixbufloader-@0@'.format(name), @@ -250,6 +256,7 @@ foreach l: loaders dependencies: loaders_deps + gdk_pixbuf_deps + [ gdkpixbuf_dep ], include_directories: [ root_inc, gdk_pixbuf_inc ], c_args: common_cflags + gdk_pixbuf_cflags + cflags, + name_suffix: name_suffix, install: true, install_dir: gdk_pixbuf_loaderdir) |