From be391a380c2f3d8b0dbb7273d86607b7563991d80c3caeda9ca3abbca546a112 Mon Sep 17 00:00:00 2001
From: Alexei Sorokin <sor.alexei@meowr.ru>
Date: Sun, 16 Dec 2018 22:31:04 +0000
Subject: [PATCH] OBS-URL:
 https://build.opensuse.org/package/show/devel:tools:building/meson?expand=0&rev=120

---
 meson-fix-gcc48.patch | 48 +++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 48 insertions(+)

diff --git a/meson-fix-gcc48.patch b/meson-fix-gcc48.patch
index b77d57b..0708037 100644
--- a/meson-fix-gcc48.patch
+++ b/meson-fix-gcc48.patch
@@ -1,5 +1,53 @@
 --- a/mesonbuild/minit.py
 +++ b/mesonbuild/minit.py
+@@ -140,8 +140,8 @@ class ClangCPPCompiler(ClangCompiler, CP
+     def get_options(self):
+         opts = CPPCompiler.get_options(self)
+         opts.update({'cpp_std': coredata.UserComboOption('cpp_std', 'C++ language standard to use',
+-                                                         ['none', 'c++98', 'c++03', 'c++11', 'c++14', 'c++17', 'c++1z', 'c++2a',
+-                                                          'gnu++11', 'gnu++14', 'gnu++17', 'gnu++1z', 'gnu++2a'],
++                                                         ['none', 'c++98', 'c++03', 'c++11', 'c++1y', 'c++14', 'c++17', 'c++1z', 'c++2a',
++                                                          'gnu++11', 'gnu++1y', 'gnu++14', 'gnu++17', 'gnu++1z', 'gnu++2a'],
+                                                          'none')})
+         return opts
+ 
+@@ -171,8 +171,8 @@ class ArmclangCPPCompiler(ArmclangCompil
+     def get_options(self):
+         opts = CPPCompiler.get_options(self)
+         opts.update({'cpp_std': coredata.UserComboOption('cpp_std', 'C++ language standard to use',
+-                                                         ['none', 'c++98', 'c++03', 'c++11', 'c++14', 'c++17',
+-                                                          'gnu++98', 'gnu++03', 'gnu++11', 'gnu++14', 'gnu++17'],
++                                                         ['none', 'c++98', 'c++03', 'c++11', 'c++1y', 'c++14', 'c++17',
++                                                          'gnu++98', 'gnu++03', 'gnu++11', 'gnu++1y', 'gnu++14', 'gnu++17'],
+                                                          'none')})
+         return opts
+ 
+@@ -197,10 +197,12 @@ 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++11', 'gnu++1y']
++        if version_compare(self.version, '>=5.0.0'):
++            cpp_stds += ['c++14', 'c++17', 'c++1z', 'c++2a', 'gnu++14', 'gnu++17', 'gnu++1z', 'gnu++2a']
+         opts = CPPCompiler.get_options(self)
+         opts.update({'cpp_std': coredata.UserComboOption('cpp_std', 'C++ language standard to use',
+-                                                         ['none', 'c++98', 'c++03', 'c++11', 'c++14', 'c++17', 'c++1z', 'c++2a',
+-                                                          'gnu++03', 'gnu++11', 'gnu++14', 'gnu++17', 'gnu++1z', 'gnu++2a'],
++                                                         ['none'] + cpp_stds,
+                                                          'none'),
+                      'cpp_debugstl': coredata.UserBooleanOption('cpp_debugstl',
+                                                                 'STL debug mode',
+@@ -276,7 +278,7 @@ class IntelCPPCompiler(IntelCompiler, CP
+         c_stds = ['c++98', 'c++03']
+         g_stds = ['gnu++98', 'gnu++03']
+         if version_compare(self.version, '>=15.0.0'):
+-            c_stds += ['c++11', 'c++14']
++            c_stds += ['c++11', 'c++1y', 'c++14']
+             g_stds += ['gnu++11']
+         if version_compare(self.version, '>=16.0.0'):
+             c_stds += ['c++17']
+--- a/mesonbuild/minit.py
++++ b/mesonbuild/minit.py
 @@ -143,7 +143,7 @@ int main(int argc, char **argv) {{
  hello_cpp_meson_template = '''project('{project_name}', 'cpp',
    version : '{version}',