rpm/meson
SHA256
1
0
Fork 0
forked from pool/meson
Code Pull Requests Activity

OBS-URL: https://build.opensuse.org/package/show/devel:tools:building/meson?expand=0&rev=88

Browse Source
This commit is contained in:
Alexei Sorokin 2018-03-22 00:26:26 +00:00 committed by Git OBS Bridge
parent 6e97a6edde
commit 535492b86c
1 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
meson-fix-gcc48.patch
View File

@ -1,14 +1,12 @@
--- a/mesonbuild/compilers/cpp.py --- a/mesonbuild/compilers/cpp.py
+++ b/mesonbuild/compilers/cpp.py +++ b/mesonbuild/compilers/cpp.py
@@ -102,9 +102,13 @@ class GnuCPPCompiler(GnuCompiler, CPPCom @@ -102,9 +102,11 @@ class GnuCPPCompiler(GnuCompiler, CPPCom
'3': default_warn_args + ['-Wextra', '-Wpedantic']} '3': default_warn_args + ['-Wextra', '-Wpedantic']}
def get_options(self): def get_options(self):
+ cpp_stds = ['c++98', 'c++03', 'c++11', 'gnu++03', 'gnu++11'] + cpp_stds = ['c++98', 'c++03', 'c++11', 'c++1y', 'gnu++03', 'gnu++11', 'gnu++1y']
+ if version_compare(self.version, '>=5.0.0'): + if version_compare(self.version, '>=5.0.0'):
+ cpp_stds += ['c++14', 'c++17', 'c++1z', 'gnu++14', 'gnu++17', 'gnu++1z'] + cpp_stds += ['c++14', 'c++17', 'c++1z', 'gnu++14', 'gnu++17', 'gnu++1z']
+ else:
+ cpp_stds += ['c++1y', 'gnu++1y']
opts = {'cpp_std': coredata.UserComboOption('cpp_std', 'C++ language standard to use', 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', - ['none', 'c++98', 'c++03', 'c++11', 'c++14', 'c++17', 'c++1z',
- 'gnu++03', 'gnu++11', 'gnu++14', 'gnu++17', 'gnu++1z'], - 'gnu++03', 'gnu++11', 'gnu++14', 'gnu++17', 'gnu++1z'],
@ -18,11 +16,22 @@
'STL debug mode', 'STL debug mode',
--- a/mesonbuild/minit.py --- a/mesonbuild/minit.py
+++ b/mesonbuild/minit.py +++ b/mesonbuild/minit.py
@@ -124,7 +124,7 @@ int main(int argc, char **argv) {{ @@ -123,8 +123,7 @@ int main(int argc, char **argv) {{
hello_c_meson_template = '''project('{project_name}', 'c', hello_c_meson_template = '''project('{project_name}', 'c',
version : '{version}', version : '{version}',
default_options : ['warning_level=3', - default_options : ['warning_level=3',
- 'cpp_std=c++14']) - 'cpp_std=c++14'])
+ default_options : ['warning_level=3'])
exe = executable('{exe_name}', '{source_name}',
install : true)
@@ -148,7 +147,8 @@ int main(int argc, char **argv) {{
hello_cpp_meson_template = '''project('{project_name}', 'cpp',
version : '{version}',
- default_options : ['warning_level=3'])
+ default_options : ['warning_level=3',
+ 'cpp_std=c++1y']) + 'cpp_std=c++1y'])
exe = executable('{exe_name}', '{source_name}', exe = executable('{exe_name}', '{source_name}',