pool/meson
SHA256
2
0
Fork 2
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Alexei Sorokin 2018-03-22 18:47:28 +00:00 committed by Git OBS Bridge
parent 535492b86c
commit ea3c72be46
5 changed files with 29 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
meson-suse-fix-llvm-3.8.patch
View File

@ -19,7 +19,7 @@
else: else:
raise DependencyException( raise DependencyException(
'Could not find a dynamically linkable library for LLVM.') 'Could not find a dynamically linkable library for LLVM.')
+ """ + """
def check_components(self, modules, required=True): def check_components(self, modules, required=True):
"""Check for llvm components (modules in meson terms). """Check for llvm components (modules in meson terms).

7
meson-testsuite.changes
View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Wed Mar 21 23:46:12 UTC 2018 - sor.alexei@meowr.ru
- Only apply meson-suse-fix-llvm-3.8.patch,
meson-restore-python3.4.patch, meson-fix-gcc48.patch on Leap 42.x
or older.
------------------------------------------------------------------- -------------------------------------------------------------------
Wed Mar 21 10:20:37 UTC 2018 - sor.alexei@meowr.ru Wed Mar 21 10:20:37 UTC 2018 - sor.alexei@meowr.ru

11
meson-testsuite.spec
View File

@ -35,12 +35,12 @@ Source1: https://github.com/%{_name}/meson/releases/download/%{version}/m
Source2: meson.keyring Source2: meson.keyring
# 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. # 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. # PATCH-FIX-OPENSUSE meson-suse-fix-llvm-3.8.patch -- Fix LLVM 3.8 tests.
Patch1: meson-fix-gcc48.patch Patch1: meson-suse-fix-llvm-3.8.patch
# PATCH-FIX-OPENSUSE meson-restore-python3.4.patch -- Restore Python 3.4 support (reverts commit 0538009). # PATCH-FIX-OPENSUSE meson-restore-python3.4.patch -- Restore Python 3.4 support (reverts commit 0538009).
Patch2: meson-restore-python3.4.patch Patch2: meson-restore-python3.4.patch
# PATCH-FIX-OPENSUSE meson-suse-fix-llvm-3.8.patch -- Fix LLVM 3.8 tests. # PATCH-FIX-OPENSUSE meson-fix-gcc48.patch sor.alexei@meowr.ru -- Fix GCC 4.8 handling for openSUSE Leap 42.x.
Patch3: meson-suse-fix-llvm-3.8.patch Patch3: meson-fix-gcc48.patch
# PATCH-FIX-OPENSUSE meson-test-installed-bin.patch dimstar@opensuse.org -- We want the test suite to run against /usr/bin/meson coming from our meson package. # PATCH-FIX-OPENSUSE meson-test-installed-bin.patch dimstar@opensuse.org -- We want the test suite to run against /usr/bin/meson coming from our meson package.
Patch100: meson-test-installed-bin.patch Patch100: meson-test-installed-bin.patch
BuildRequires: python3 BuildRequires: python3
@ -128,10 +128,13 @@ This package provides support for meson.build files in Vim.
%prep %prep
%setup -q -n meson-%{version} %setup -q -n meson-%{version}
%patch0 -p1 %patch0 -p1
%if 0%{?suse_version} < 1500
%patch1 -p1 %patch1 -p1
%patch2 -p1 %patch2 -p1
%patch3 -p1 %patch3 -p1
%endif
%patch100 -p1 %patch100 -p1
# Remove static boost tests from test cases/frameworks/1 boost (can't use patch due to spaces in dirname) # Remove static boost tests from test cases/frameworks/1 boost (can't use patch due to spaces in dirname)
sed -i "/static/d" test\ cases/frameworks/1\ boost/meson.build sed -i "/static/d" test\ cases/frameworks/1\ boost/meson.build

7
meson.changes
View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Wed Mar 21 23:46:12 UTC 2018 - sor.alexei@meowr.ru
- Only apply meson-suse-fix-llvm-3.8.patch,
meson-restore-python3.4.patch, meson-fix-gcc48.patch on Leap 42.x
or older.
------------------------------------------------------------------- -------------------------------------------------------------------
Wed Mar 21 10:20:37 UTC 2018 - sor.alexei@meowr.ru Wed Mar 21 10:20:37 UTC 2018 - sor.alexei@meowr.ru

11
meson.spec
View File

@ -35,12 +35,12 @@ Source1: https://github.com/%{_name}/meson/releases/download/%{version}/m
Source2: meson.keyring Source2: meson.keyring
# 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. # 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. # PATCH-FIX-OPENSUSE meson-suse-fix-llvm-3.8.patch -- Fix LLVM 3.8 tests.
Patch1: meson-fix-gcc48.patch Patch1: meson-suse-fix-llvm-3.8.patch
# PATCH-FIX-OPENSUSE meson-restore-python3.4.patch -- Restore Python 3.4 support (reverts commit 0538009). # PATCH-FIX-OPENSUSE meson-restore-python3.4.patch -- Restore Python 3.4 support (reverts commit 0538009).
Patch2: meson-restore-python3.4.patch Patch2: meson-restore-python3.4.patch
# PATCH-FIX-OPENSUSE meson-suse-fix-llvm-3.8.patch -- Fix LLVM 3.8 tests. # PATCH-FIX-OPENSUSE meson-fix-gcc48.patch sor.alexei@meowr.ru -- Fix GCC 4.8 handling for openSUSE Leap 42.x.
Patch3: meson-suse-fix-llvm-3.8.patch Patch3: meson-fix-gcc48.patch
# PATCH-FIX-OPENSUSE meson-test-installed-bin.patch dimstar@opensuse.org -- We want the test suite to run against /usr/bin/meson coming from our meson package. # PATCH-FIX-OPENSUSE meson-test-installed-bin.patch dimstar@opensuse.org -- We want the test suite to run against /usr/bin/meson coming from our meson package.
Patch100: meson-test-installed-bin.patch Patch100: meson-test-installed-bin.patch
BuildRequires: python3 BuildRequires: python3
@ -128,10 +128,13 @@ This package provides support for meson.build files in Vim.
%prep %prep
%setup -q -n meson-%{version} %setup -q -n meson-%{version}
%patch0 -p1 %patch0 -p1
%if 0%{?suse_version} < 1500
%patch1 -p1 %patch1 -p1
%patch2 -p1 %patch2 -p1
%patch3 -p1 %patch3 -p1
%endif
%patch100 -p1 %patch100 -p1
# Remove static boost tests from test cases/frameworks/1 boost (can't use patch due to spaces in dirname) # Remove static boost tests from test cases/frameworks/1 boost (can't use patch due to spaces in dirname)
sed -i "/static/d" test\ cases/frameworks/1\ boost/meson.build sed -i "/static/d" test\ cases/frameworks/1\ boost/meson.build