diff options
| author | Nirbheek Chauhan <nirbheek@centricular.com> | 2021-07-14 19:08:45 +0530 |
|---|---|---|
| committer | Nirbheek Chauhan <nirbheek@centricular.com> | 2021-07-14 19:08:45 +0530 |
| commit | bd71f936b98fa0017cb8bcb64630566c9b2086d6 (patch) | |
| tree | 3734e453b83bae6ab56460301e0757f87e2d9c14 | |
| parent | 4383951b654f7873d128a358be000643d824feb6 (diff) | |
glib-networking: Update options and backport c_std=c99
C11 is only supported by very recent MSVC versions, and
glib-networking doesn't even use C11.
Part-of: <https://gitlab.freedesktop.org/gstreamer/cerbero/-/merge_requests/716>
| -rw-r--r-- | recipes/glib-networking.recipe | 7 | ||||
| -rw-r--r-- | recipes/glib-networking/0001-meson-use-c-std-c99.patch | 27 |
2 files changed, 32 insertions, 2 deletions
diff --git a/recipes/glib-networking.recipe b/recipes/glib-networking.recipe index 167ab839..4f3e3fb4 100644 --- a/recipes/glib-networking.recipe +++ b/recipes/glib-networking.recipe @@ -11,8 +11,11 @@ class Recipe(recipe.Recipe): btype = BuildType.MESON url = 'gnome://' tarball_checksum = '8ca1f86f23a76b5c7640624f7d5490705c78e81375e1741c9a1c41ce7f8f7ff7' - meson_options = {'ca_certificates_path': '', 'libproxy_support': 'false', - 'gnome_proxy_support': 'false', 'pkcs11_support': 'false', + + # Taken from upstream remove on bump + patches = [name + '/0001-meson-use-c-std-c99.patch'] + + meson_options = {'libproxy': 'disabled', 'gnome_proxy': 'disabled', 'gnutls': 'disabled', 'openssl': 'enabled', # Also build static modules on all platforms 'static_modules': 'true'} diff --git a/recipes/glib-networking/0001-meson-use-c-std-c99.patch b/recipes/glib-networking/0001-meson-use-c-std-c99.patch new file mode 100644 index 00000000..5206f3f5 --- /dev/null +++ b/recipes/glib-networking/0001-meson-use-c-std-c99.patch @@ -0,0 +1,27 @@ +From e4e1a00e2dc4ca94301750ccbc6f605906e2a85e Mon Sep 17 00:00:00 2001 +From: Ignacio Casal Quinteiro <qignacio@amazon.com> +Date: Thu, 26 Sep 2019 16:12:05 +0200 +Subject: [PATCH] meson: use c std c99 + +c11 is not supported on centos 6 nor on Visual Studio which +does not even fully supports c99 +--- + meson.build | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/meson.build b/meson.build +index d07d7fa..eac24fd 100644 +--- a/meson.build ++++ b/meson.build +@@ -3,7 +3,7 @@ project( + version: '2.62.3', + license: 'LGPL2.1+', + meson_version: '>= 0.50.0', +- default_options: ['c_std=c11'] ++ default_options: ['c_std=c99'] + ) + + prefix = get_option('prefix') +-- +2.31.1.windows.1 + |