From b3c899d295e688ba16749d72ac830bf62a6b152e Mon Sep 17 00:00:00 2001 From: Xavier Claessens Date: Fri, 9 Nov 2018 13:23:43 -0500 Subject: [PATCH 1/2] Meson: Fix build error in gdbus-example-objectmanager test_c_args is defined in the root meson.build with unfiltered list of compiler flags, then redefined in gio/tests/meson.build after the subdir() call. Move it before. --- gio/tests/meson.build | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/gio/tests/meson.build b/gio/tests/meson.build index b71f61704..7021f03e9 100644 --- a/gio/tests/meson.build +++ b/gio/tests/meson.build @@ -5,6 +5,13 @@ common_gio_tests_deps = [ libgio_dep, ] +test_c_args = [ + '-DG_LOG_DOMAIN="GLib-GIO"', + '-DTEST_SERVICES="@0@/gio/tests/services"'.format(meson.build_root()), + '-DGLIB_MKENUMS="@0@"'.format(glib_mkenums), + '-DGLIB_COMPILE_SCHEMAS="@0@"'.format(glib_compile_schemas.full_path()), +] + if host_machine.system() == 'windows' common_gio_tests_deps += [iphlpapi_dep, winsock2, cc.find_library ('secur32')] endif @@ -85,13 +92,6 @@ test_env.set('G_TEST_BUILDDIR', meson.current_build_dir()) test_env.set('GIO_MODULE_DIR', '') test_env.set('GIO_LAUNCH_DESKTOP', meson.build_root() + '/gio/gio-launch-desktop') -test_c_args = [ - '-DG_LOG_DOMAIN="GLib-GIO"', - '-DTEST_SERVICES="@0@/gio/tests/services"'.format(meson.build_root()), - '-DGLIB_MKENUMS="@0@"'.format(glib_mkenums), - '-DGLIB_COMPILE_SCHEMAS="@0@"'.format(glib_compile_schemas.full_path()), -] - # Check for libdbus1 - Optional - is only used in the GDBus test cases # 1.2.14 required for dbus_message_set_serial dbus1_dep = dependency('dbus-1', required : false, version : '>= 1.2.14') From ba2c51981941517c24b560cfe6c63fad7545cd44 Mon Sep 17 00:00:00 2001 From: Xavier Claessens Date: Wed, 14 Nov 2018 09:38:33 -0500 Subject: [PATCH 2/2] Meson: Rename test_c_args to avoid confusion with gio tests c_args --- meson.build | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/meson.build b/meson.build index a801b396a..3d7840c40 100644 --- a/meson.build +++ b/meson.build @@ -345,7 +345,7 @@ endforeach # Compiler flags if cc.get_id() == 'gcc' or cc.get_id() == 'clang' - test_c_args = [ + warning_c_args = [ '-Wall', '-Wduplicated-branches', '-Wimplicit-fallthrough', @@ -363,18 +363,18 @@ if cc.get_id() == 'gcc' or cc.get_id() == 'clang' '-Werror=missing-prototypes', '-Werror=pointer-arith', ] - test_c_link_args = [ + warning_c_link_args = [ '-Wl,-z,nodelete', ] if get_option('bsymbolic_functions') - test_c_link_args += ['-Wl,-Bsymbolic-functions'] + warning_c_link_args += ['-Wl,-Bsymbolic-functions'] endif else - test_c_args = [] - test_c_link_args = [] + warning_c_args = [] + warning_c_link_args = [] endif -add_project_arguments(cc.get_supported_arguments(test_c_args), language: 'c') +add_project_arguments(cc.get_supported_arguments(warning_c_args), language: 'c') # FIXME: We cannot build some of the GResource tests with -z nodelete, which # means we cannot use that flag in add_project_link_arguments(), and must add @@ -382,7 +382,7 @@ add_project_arguments(cc.get_supported_arguments(test_c_args), language: 'c') # because that is what the autotools build did. # See https://github.com/mesonbuild/meson/pull/3520 for a way to eventually # improve this. -glib_link_flags = cc.get_supported_link_arguments(test_c_link_args) +glib_link_flags = cc.get_supported_link_arguments(warning_c_link_args) # Windows Support (7+) if host_system == 'windows'