File meson-fix-gcc48.patch of Package meson

Overview Repositories Revisions Requests Users Attributes Meta

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

Currently displaying revision a5e3ef0a0496f5eb95b5f5d673fcbb97 , Show latest

Index: meson-0.44.0/mesonbuild/compilers/cpp.py
===================================================================
--- meson-0.44.0.orig/mesonbuild/compilers/cpp.py
+++ meson-0.44.0/mesonbuild/compilers/cpp.py
@@ -75,9 +75,13 @@ class ClangCPPCompiler(ClangCompiler, CP
                           '3': default_warn_args + ['-Wextra', '-Wpedantic']}
 
     def get_options(self):
+        c_stds = ['c++98', 'c++03', 'c++11']
+        g_stds = ['gnu++11']
+        if version_compare(self.version, '>=5.0.0'):
+            c_stds += ['c++14', 'c++17', 'c++1z']
+            g_stds += ['gnu++14', 'gnu++17', 'gnu++1z']
         return {'cpp_std': coredata.UserComboOption('cpp_std', 'C++ language standard to use',
-                                                    ['none', 'c++98', 'c++03', 'c++11', 'c++14', 'c++17', 'c++1z',
-                                                     'gnu++11', 'gnu++14', 'gnu++17', 'gnu++1z'],
+                                                    ['none'] + c_stds + g_stds,
                                                     'none')}
 
     def get_option_compile_args(self, options):

Places

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

Places