From dd65a8cfdeafeb18b72d8d1eb676c7ca43ae505f Mon Sep 17 00:00:00 2001 From: Adam Duskett Date: Mon, 16 Sep 2019 10:12:38 -0700 Subject: [PATCH] remove cpp requirement The c++ test is necessary to ensure libglib doesn't accidentally use C++ reserved keywords in public headers. Because this is just a test, it isn't necessary to have a C++ compiler to build libglib2. Signed-off-by: Adam Duskett Upstream status: Denied (Buildroot specific) https://gitlab.gnome.org/GNOME/glib/issues/1748 --- glib/glibconfig.h.in | 1 - meson.build | 19 +------------------ 2 files changed, 1 insertion(+), 19 deletions(-) diff --git a/glib/glibconfig.h.in b/glib/glibconfig.h.in index e66748d95..2173d8be6 100644 --- a/glib/glibconfig.h.in +++ b/glib/glibconfig.h.in @@ -119,7 +119,6 @@ typedef unsigned @glib_intptr_type_define@ guintptr; @glib_vacopy@ @g_have_iso_c_varargs@ -@g_have_iso_cxx_varargs@ /* gcc-2.95.x supports both gnu style and ISO varargs, but if -ansi * is passed ISO vararg support is turned off, and there is no work diff --git a/meson.build b/meson.build index 48fdfe864..5df242e39 100644 --- a/meson.build +++ b/meson.build @@ -1,4 +1,4 @@ -project('glib', 'c', 'cpp', +project('glib', 'c', version : '2.72.3', # NOTE: We keep this pinned at 0.52 because that's what Debian Stable ships meson_version : '>= 0.52.0', @@ -10,7 +10,6 @@ project('glib', 'c', 'cpp', ) cc = meson.get_compiler('c') -cxx = meson.get_compiler('cpp') cc_can_run = not meson.is_cross_build() or meson.has_exe_wrapper() @@ -495,7 +494,6 @@ else endif add_project_arguments(cc.get_supported_arguments(warning_c_args), language: 'c') -add_project_arguments(cxx.get_supported_arguments(warning_cxx_args), language: 'cpp') # 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 @@ -1734,20 +1732,6 @@ if g_have_iso_c_varargs #endif''') endif -g_have_iso_cxx_varargs = cxx.compiles(''' - void some_func (void) { - int a(int p1, int p2, int p3); - #define call_a(...) a(1,__VA_ARGS__) - call_a(2,3); - }''', name : 'ISO C99 varargs macros in C++') - -if g_have_iso_cxx_varargs - glibconfig_conf.set('g_have_iso_cxx_varargs', ''' -#ifdef __cplusplus -# define G_HAVE_ISO_VARARGS 1 -#endif''') -endif - g_have_gnuc_varargs = cc.compiles(''' void some_func (void) { int a(int p1, int p2, int p3); @@ -2381,7 +2365,6 @@ subdir('gobject') subdir('gthread') subdir('gmodule') subdir('gio') -subdir('fuzzing') if build_tests subdir('tests') endif -- 2.34.1