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=58

Browse Source
This commit is contained in:
Alexei Sorokin 2017-09-08 12:27:05 +00:00 committed by Git OBS Bridge
parent 692f026ef9
commit 0121c2c915
4 changed files with 10 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
meson-fix-gcc48.patch
View File

@ -1,15 +1,14 @@
diff -ur meson-0.42.0/mesonbuild/compilers/cpp.py meson-0.42.patched/mesonbuild/compilers/cpp.py --- a/mesonbuild/compilers/cpp.py
--- meson-0.42.0/mesonbuild/compilers/cpp.py 2017-08-13 20:43:17.000000000 +0200 +++ b/mesonbuild/compilers/cpp.py
+++ meson-0.42.patched/mesonbuild/compilers/cpp.py 2017-08-15 12:42:07.216511972 +0200
@@ -75,9 +75,13 @@ @@ -75,9 +75,13 @@
'3': default_warn_args + ['-Wextra', '-Wpedantic']} '3': default_warn_args + ['-Wextra', '-Wpedantic']}
def get_options(self): def get_options(self):
+ c_stds = ['c++03', 'c++11'] + c_stds = ['c++03', 'c++11']
+ g_stds = ['gnu++11'] + g_stds = ['gnu++11']
+ if mesonlib.version_compare(self.version, '>=5.0.0'): + if version_compare(self.version, '>=5.0.0'):
+ c_stds += ['c++14', 'c++1z'] + c_stds += ['c++14', 'c++1z']
+ g_stds += ['gnu++14', 'gnu++1z'] + g_stds += ['gnu++14', 'gnu++1z']
return {'cpp_std': coredata.UserComboOption('cpp_std', 'C++ language standard to use', return {'cpp_std': coredata.UserComboOption('cpp_std', 'C++ language standard to use',
- ['none', 'c++03', 'c++11', 'c++14', 'c++1z', - ['none', 'c++03', 'c++11', 'c++14', 'c++1z',
- 'gnu++11', 'gnu++14', 'gnu++1z'], - 'gnu++11', 'gnu++14', 'gnu++1z'],

3
meson-testsuite.spec
View File

@ -152,8 +152,6 @@ python3 run_tests.py
%endif %endif
%files %files
%defattr(-,root,root)
%doc contributing.txt COPYING %doc contributing.txt COPYING
%if !%{testsuite} %if !%{testsuite}
%{_bindir}/meson %{_bindir}/meson
@ -173,7 +171,6 @@ python3 run_tests.py
%if !%{testsuite} %if !%{testsuite}
%files vim %files vim
%defattr(-,root,root)
%doc syntax-highlighting/vim/README %doc syntax-highlighting/vim/README
%dir %{vim_data_dir} %dir %{vim_data_dir}
%dir %{vim_data_dir}/site %dir %{vim_data_dir}/site

5
meson.changes
View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Fri Sep 8 12:22:38 UTC 2017 - sor.alexei@meowr.ru
- Rebase meson-fix-gcc48.patch (boo#1057701).
------------------------------------------------------------------- -------------------------------------------------------------------
Tue Aug 15 11:00:02 UTC 2017 - dimstar@opensuse.org Tue Aug 15 11:00:02 UTC 2017 - dimstar@opensuse.org

3
meson.spec
View File

@ -152,8 +152,6 @@ python3 run_tests.py
%endif %endif
%files %files
%defattr(-,root,root)
%doc contributing.txt COPYING %doc contributing.txt COPYING
%if !%{testsuite} %if !%{testsuite}
%{_bindir}/meson %{_bindir}/meson
@ -173,7 +171,6 @@ python3 run_tests.py
%if !%{testsuite} %if !%{testsuite}
%files vim %files vim
%defattr(-,root,root)
%doc syntax-highlighting/vim/README %doc syntax-highlighting/vim/README
%dir %{vim_data_dir} %dir %{vim_data_dir}
%dir %{vim_data_dir}/site %dir %{vim_data_dir}/site