package/libglib2/0002-remove-cpp-requirement.patch

3 Date: Mon, 16 Sep 2019 10:12:38 -0700
6 The c++ test is necessary to ensure libglib doesn't accidentally use C++
7 reserved keywords in public headers. Because this is just a test, it isn't
8 necessary to have a C++ compiler to build libglib2.
10 Signed-off-by: Adam Duskett <Aduskett@gmail.com>
13 ---
14  glib/glibconfig.h.in |  1 -
15  meson.build          | 18 +-----------------
16  tests/meson.build    |  5 -----
17  3 files changed, 1 insertion(+), 23 deletions(-)
19 diff --git a/glib/glibconfig.h.in b/glib/glibconfig.h.in
21 --- a/glib/glibconfig.h.in
23 @@ -117,7 +117,6 @@ typedef unsigned @glib_intptr_type_define@ guintptr;
27 -@g_have_iso_cxx_varargs@
29  /* gcc-2.95.x supports both gnu style and ISO varargs, but if -ansi
30   * is passed ISO vararg support is turned off, and there is no work
31 diff --git a/meson.build b/meson.build
33 --- a/meson.build
34 +++ b/meson.build
35 @@ -1,4 +1,4 @@
36 -project('glib', 'c', 'cpp',
41 @@ -10,7 +10,6 @@ project('glib', 'c', 'cpp',
44  cc = meson.get_compiler('c')
45 -cxx = meson.get_compiler('cpp')
47  cc_can_run = not meson.is_cross_build() or meson.has_exe_wrapper()
49 @@ -1679,20 +1678,6 @@ if g_have_iso_c_varargs
53 -g_have_iso_cxx_varargs = cxx.compiles('''
54 -  void some_func (void) {
55 -    int a(int p1, int p2, int p3);
56 -    #define call_a(...) a(1,__VA_ARGS__)
57 -    call_a(2,3);
58 -  }''', name : 'ISO C99 varargs macros in C++')
59 -
60 -if g_have_iso_cxx_varargs
61 -  glibconfig_conf.set('g_have_iso_cxx_varargs', '''
62 -#ifdef __cplusplus
63 -# define G_HAVE_ISO_VARARGS 1
64 -#endif''')
65 -endif
66 -
70 @@ -2330,7 +2315,6 @@ subdir('gobject')
74 -subdir('fuzzing')
78 diff --git a/tests/meson.build b/tests/meson.build
80 --- a/tests/meson.build
81 +++ b/tests/meson.build
82 @@ -55,11 +55,6 @@ tests = {
83      'source': 'module-test.c',
84      'c_args': ['-DMODULE_TYPE="plugin"'],
86 -  'cxx-test' : {
87 -    'source' : 'cxx-test.cpp',
88 -    'include_directories' : gmoduleinc,
89 -    'dependencies' : [libgio_dep],
90 -  },
94 --