File meson-fix-gcc48.patch of Package meson

Overview Repositories Revisions Requests Users Attributes Meta

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

Currently displaying revision 037c79ebef255c9dbece5e2b78d5eadc , Show latest

--- a/mesonbuild/compilers/cpp.py
+++ b/mesonbuild/compilers/cpp.py
@@ -104,9 +104,11 @@ class GnuCPPCompiler(GnuCompiler, CPPCom
                           '3': default_warn_args + ['-Wextra', '-Wpedantic']}
 
     def get_options(self):
+        cpp_stds = ['c++98', 'c++03', 'c++11', 'c++1y', 'gnu++03', 'gnu++11', 'gnu++1y']
+        if version_compare(self.version, '>=5.0.0'):
+            cpp_stds += ['c++14', 'c++17', 'c++1z', 'gnu++14', 'gnu++17', 'gnu++1z']
         opts = {'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++03', 'gnu++11', 'gnu++14', 'gnu++17', 'gnu++1z'],
+                                                    ['none'] + cpp_stds,
                                                     'none'),
                 'cpp_debugstl': coredata.UserBooleanOption('cpp_debugstl',
                                                            'STL debug mode',
--- a/mesonbuild/minit.py
+++ b/mesonbuild/minit.py
@@ -149,7 +149,7 @@ int main(int argc, char **argv) {{
 hello_cpp_meson_template = '''project('{project_name}', 'cpp',
   version : '{version}',
   default_options : ['warning_level=3',
-                     'cpp_std=c++14'])
+                     'cpp_std=c++1y'])
 
 exe = executable('{exe_name}', '{source_name}',
   install : true)
@@ -220,7 +220,7 @@ int main(int argc, char **argv) {{
 
 lib_cpp_meson_template = '''project('{project_name}', 'cpp',
   version : '{version}',
-  default_options : ['warning_level=3', 'cpp_std=c++14'])
+  default_options : ['warning_level=3', 'cpp_std=c++1y'])
 
 # These arguments are only used to build the shared library
 # not the executables that use the library.
@@ -416,7 +416,7 @@ def create_meson_build(options):
     default_options = ['warning_level=3']
     if options.language == 'cpp':
         # This shows how to set this very common option.
-        default_options += ['cpp_std=c++14']
+        default_options += ['cpp_std=c++1y']
     # If we get a meson.build autoformatter one day, this code could
     # be simplified quite a bit.
     formatted_default_options = ', '.join("'{}'".format(x) for x in default_options)
--- "a/test cases/unit/16 prebuilt shared/patron.c"
+++ "b/test cases/unit/16 prebuilt shared/patron.c"
@@ -5,4 +5,5 @@ int main(int argc, char **argv) {
     printf("You are standing outside the Great Library of Alexandria.\n");
     printf("You decide to go inside.\n\n");
     alexandria_visit();
+    return 0;
 }

Places

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

Places