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

Browse Source
This commit is contained in:
Alexei Sorokin 2017-03-17 13:58:10 +00:00 committed by Git OBS Bridge
parent 737411b4f5
commit fabac88c57
3 changed files with 30 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
meson-fix-gcc48.patch Normal file
View File

@ -0,0 +1,23 @@
--- a/mesonbuild/compilers.py
+++ b/mesonbuild/compilers.py
@@ -2403,13 +2403,18 @@ class GnuCPPCompiler(GnuCompiler, CPPCom
'3': default_warn_args + ['-Wextra', '-Wpedantic']}
def get_options(self):
+ c_stds = ['c++03', 'c++11']
+ g_stds = ['gnu++03', 'gnu++11']
+ if mesonlib.version_compare(self.version, '>=5.0.0'):
+ c_stds += ['c++14', 'c++1z']
+ g_stds += ['gnu++14', 'gnu++1z']
opts = {'cpp_std': coredata.UserComboOption('cpp_std', 'C++ language standard to use',
- ['none', 'c++03', 'c++11', 'c++14', 'c++1z',
- 'gnu++03', 'gnu++11', 'gnu++14', 'gnu++1z'],
+ ['none'] + c_stds + g_stds,
'none'),
'cpp_debugstl': coredata.UserBooleanOption('cpp_debugstl',
'STL debug mode',
False)}
+
if self.gcc_type == GCC_MINGW:
opts.update({
'cpp_winlibs': coredata.UserStringArrayOption('cpp_winlibs', 'Standard Win libraries to link against',

2
meson.changes
View File

@ -4,6 +4,8 @@ Thu Mar 16 11:04:13 UTC 2017 - sor.alexei@meowr.ru
- Update to version 0.39.1 (changes since 0.38.1): - Update to version 0.39.1 (changes since 0.38.1):
* Allow specifying extra arguments for tests. * Allow specifying extra arguments for tests.
* Bug fixes and minor polishes. * Bug fixes and minor polishes.
- Add meson-fix-gcc48.patch: fix GCC 4.8 handling for
openSUSE Leap 42.x.
------------------------------------------------------------------- -------------------------------------------------------------------
Sat Mar 4 14:50:28 UTC 2017 - dimstar@opensuse.org Sat Mar 4 14:50:28 UTC 2017 - dimstar@opensuse.org

6
meson.spec
View File

@ -27,10 +27,13 @@ Url: http://mesonbuild.com/
Source: https://github.com/%{_name}/%{name}/releases/download/%{version}/%{name}-%{version}.tar.gz Source: https://github.com/%{_name}/%{name}/releases/download/%{version}/%{name}-%{version}.tar.gz
Source1: https://github.com/%{_name}/%{name}/releases/download/%{version}/%{name}-%{version}.tar.gz.asc Source1: https://github.com/%{_name}/%{name}/releases/download/%{version}/%{name}-%{version}.tar.gz.asc
Source2: %{name}.keyring Source2: %{name}.keyring
# PATCH-FIX-OPENSUSE meson-suse-ify-macros.patch dimstar@opensuse.org -- Make the macros non-RetHat specific. So far we do not have sep. {C,CXX,F}FLAGS # PATCH-FIX-OPENSUSE meson-suse-ify-macros.patch dimstar@opensuse.org -- Make the macros non-RedHat specific: so far there are no separate {C,CXX,F}FLAGS.
Patch0: meson-suse-ify-macros.patch Patch0: meson-suse-ify-macros.patch
# PATCH-FIX-OPENSUSE meson-fix-gcc48.patch sor.alexei@meowr.ru -- Fix GCC 4.8 handling for openSUSE Leap 42.x.
Patch1: meson-fix-gcc48.patch
BuildRequires: bison BuildRequires: bison
BuildRequires: boost-devel BuildRequires: boost-devel
BuildRequires: doxygen
BuildRequires: flex BuildRequires: flex
BuildRequires: gcc-c++ BuildRequires: gcc-c++
BuildRequires: gcc-fortran BuildRequires: gcc-fortran
@ -74,6 +77,7 @@ Domain Specific Language.
%prep %prep
%setup -q %setup -q
%patch0 -p1 %patch0 -p1
%patch1 -p1
# Lack of gtest, gmock, gnustep. # Lack of gtest, gmock, gnustep.
rm -rf "test cases/frameworks/2 gtest" \ rm -rf "test cases/frameworks/2 gtest" \