diff options
| author | Nirbheek Chauhan <nirbheek@centricular.com> | 2018-06-11 07:04:11 +0530 |
|---|---|---|
| committer | Nirbheek Chauhan <nirbheek@centricular.com> | 2018-06-11 07:12:28 +0530 |
| commit | 1c9106aef141c05693cf8a8d5ed771ea19bad086 (patch) | |
| tree | 7fb51d0bbba27048e8c21ba6dfe56d8a3d3a5adc /recipes/glib | |
| parent | c14f76890cbc8a818c0744bfe62e68c16830a85d (diff) | |
glib.recipe: Use autotools value for G_MODULE_SUFFIX
This was changed in Meson, but it's a bad idea because then we can't
find plugins built with Autotools.
Upstream bug: https://gitlab.gnome.org/GNOME/glib/issues/1413
Also remove a useless post_install from gstreamer-1.0.recipe with
the nice side-effect of rebuilding it which is needed for this to
work.
Diffstat (limited to 'recipes/glib')
| -rw-r--r-- | recipes/glib/0001-meson-Always-set-G_MODULE_SUFFIX-to-so-on-macOS.patch | 32 |
1 files changed, 32 insertions, 0 deletions
diff --git a/recipes/glib/0001-meson-Always-set-G_MODULE_SUFFIX-to-so-on-macOS.patch b/recipes/glib/0001-meson-Always-set-G_MODULE_SUFFIX-to-so-on-macOS.patch new file mode 100644 index 00000000..58a4677b --- /dev/null +++ b/recipes/glib/0001-meson-Always-set-G_MODULE_SUFFIX-to-so-on-macOS.patch @@ -0,0 +1,32 @@ +From 2ab85db846c79b8f3ab710e7af44490c9734f057 Mon Sep 17 00:00:00 2001 +From: Nirbheek Chauhan <nirbheek@centricular.com> +Date: Mon, 11 Jun 2018 07:02:08 +0530 +Subject: [PATCH] meson: Always set G_MODULE_SUFFIX to so on macOS + +This is what Autotools does, and it's what the entire world expects. + +https://gitlab.gnome.org/GNOME/glib/issues/1413 +--- + meson.build | 4 +--- + 1 file changed, 1 insertion(+), 3 deletions(-) + +diff --git a/meson.build b/meson.build +index 91b8721a1..07ff90174 100644 +--- a/meson.build ++++ b/meson.build +@@ -1227,11 +1227,9 @@ glibconfig_conf.set('glongbits', long_size * 8) + glibconfig_conf.set('gsizebits', sizet_size * 8) + glibconfig_conf.set('gssizebits', ssizet_size * 8) + +-# FIXME: maybe meson should tell us the libsuffix? ++# XXX: https://gitlab.gnome.org/GNOME/glib/issues/1413 + if host_system == 'windows' + g_module_suffix = 'dll' +-elif host_system == 'darwin' +- g_module_suffix = 'dylib' + else + g_module_suffix = 'so' + endif +-- +2.17.0 + |