From 7a88ef5741385c84855c95f6d33132883e34867d Mon Sep 17 00:00:00 2001 From: Emmanuele Bassi Date: Thu, 4 Oct 2018 18:05:58 +0200 Subject: [PATCH 1/2] Update minimum Meson version We're using functionality introduced after 0.44, so we might as well update to a more recent version of Meson. --- meson.build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meson.build b/meson.build index 640f17c..e95de48 100644 --- a/meson.build +++ b/meson.build @@ -5,7 +5,7 @@ project('libepoxy', 'c', version: '1.5.3', 'warning_level=1', ], license: 'MIT', - meson_version: '>= 0.44.0') + meson_version: '>= 0.47.0') epoxy_version = meson.project_version().split('.') epoxy_major_version = epoxy_version[0].to_int() From bf531d104299f5074a6f22cc353221cc7c7708fa Mon Sep 17 00:00:00 2001 From: Emmanuele Bassi Date: Thu, 4 Oct 2018 18:07:34 +0200 Subject: [PATCH 2/2] build: Drop conditional use of get_supported_link_arguments() Meson complains even in the face of a version check. --- src/meson.build | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/src/meson.build b/src/meson.build index 466fc0d..fe092d1 100644 --- a/src/meson.build +++ b/src/meson.build @@ -50,11 +50,7 @@ epoxy_sources = sources + gen_sources common_ldflags = [] if host_system == 'linux' and cc.get_id() == 'gcc' - if meson.version().version_compare('>= 0.46.0') - common_ldflags += cc.get_supported_link_arguments([ '-Wl,-Bsymbolic-functions', '-Wl,-z,relro' ]) - else - common_ldflags += [ '-Wl,-Bsymbolic-functions', '-Wl,-z,relro', ] - endif + common_ldflags += cc.get_supported_link_arguments([ '-Wl,-Bsymbolic-functions', '-Wl,-z,relro' ]) endif # Maintain compatibility with autotools; see: https://github.com/anholt/libepoxy/issues/108