File meson-fix-gcc48.patch of Package meson

Overview Repositories Revisions Requests Users Attributes Meta

File meson-fix-gcc48.patch of Package meson (Revision 369f65d189e31b6b7257eab46cb3b004)

Currently displaying revision 369f65d189e31b6b7257eab46cb3b004 , Show latest

--- a/mesonbuild/compilers.py
+++ b/mesonbuild/compilers.py
@@ -2403,9 +2403,13 @@ class GnuCPPCompiler(GnuCompiler, CPPCom
                           '3': default_warn_args + ['-Wextra', '-Wpedantic']}
 
     def get_options(self):
+        c_stds = ['c++03', 'c++11']
+        g_stds = ['gnu++03', 'gnu++11']
+        if mesonlib.version_compare(self.version, '>=5.0.0'):
+            c_stds += ['c++14', 'c++1z']
+            g_stds += ['gnu++14', 'gnu++1z']
         opts = {'cpp_std': coredata.UserComboOption('cpp_std', 'C++ language standard to use',
-                                                    ['none', 'c++03', 'c++11', 'c++14', 'c++1z',
-                                                     'gnu++03', 'gnu++11', 'gnu++14', 'gnu++1z'],
+                                                    ['none'] + c_stds + g_stds,
                                                     'none'),
                 'cpp_debugstl': coredata.UserBooleanOption('cpp_debugstl',
                                                            'STL debug mode',

Places

File meson-fix-gcc48.patch of Package meson (Revision 369f65d189e31b6b7257eab46cb3b004)

Places