From 1e9bf08551b91cbac5033b5a19e22f100e9b2682 Mon Sep 17 00:00:00 2001 From: Nirbheek Chauhan Date: Wed, 1 Jul 2020 07:21:30 +0530 Subject: meson: Get rid of outdated version_compare checks --- meson.build | 54 ++++++++++++++++++++++++------------------------------ 1 file changed, 24 insertions(+), 30 deletions(-) (limited to 'meson.build') diff --git a/meson.build b/meson.build index 3b6c6b7..674af96 100644 --- a/meson.build +++ b/meson.build @@ -26,10 +26,8 @@ cdata = configuration_data() # config.h pkg = import('pkgconfig') # -Bsymbolic-functions -if meson.version().version_compare('>= 0.46.0') - if cc.has_link_argument('-Wl,-Bsymbolic-functions') - add_project_link_arguments('-Wl,-Bsymbolic-functions', language : 'c') - endif +if cc.has_link_argument('-Wl,-Bsymbolic-functions') + add_project_link_arguments('-Wl,-Bsymbolic-functions', language : 'c') endif # Symbol visibility @@ -192,30 +190,26 @@ install_data('orc.m4', install_dir : 'share/aclocal') configure_file(output : 'config.h', configuration : cdata) # summary -if meson.version().version_compare('>= 0.53') - summary({ - 'SSE': 'sse' in enabled_backends, - 'MMX': 'mmx' in enabled_backends, - 'NEON': 'neon' in enabled_backends, - 'MIPS': 'mips' in enabled_backends, - 'c64x': 'c64x' in enabled_backends, - 'Altivec': 'altivec' in enabled_backends, - }, section: 'Backends', bool_yn: true) - - # meson 0.53 will print two lines for two args (and warn about list_sep kwarg) - # meson 0.54 will print one line if list_sep is specified - if not have_docs - doc_summary = [have_docs, gtk_doc_disabled_reason] - else - doc_summary = have_docs - endif - - summary({ - 'Tools': not opt_tools.disabled(), - 'Tests': not opt_tests.disabled(), - 'Examples': not opt_examples.disabled(), - 'Benchmarks': not opt_benchmarks.disabled(), - 'Documentation': doc_summary, - 'Orc-test library': not opt_orctest.disabled(), - }, section: 'Build options', bool_yn: true, list_sep: ' ') +summary({ + 'SSE': 'sse' in enabled_backends, + 'MMX': 'mmx' in enabled_backends, + 'NEON': 'neon' in enabled_backends, + 'MIPS': 'mips' in enabled_backends, + 'c64x': 'c64x' in enabled_backends, + 'Altivec': 'altivec' in enabled_backends, + }, section: 'Backends', bool_yn: true) + +if not have_docs + doc_summary = [have_docs, gtk_doc_disabled_reason] +else + doc_summary = have_docs endif + +summary({ + 'Tools': not opt_tools.disabled(), + 'Tests': not opt_tests.disabled(), + 'Examples': not opt_examples.disabled(), + 'Benchmarks': not opt_benchmarks.disabled(), + 'Documentation': doc_summary, + 'Orc-test library': not opt_orctest.disabled(), + }, section: 'Build options', bool_yn: true, list_sep: ' ') -- cgit v1.2.1