From ea3c72be46b558d715519b86b9f8b6358c0120db05074a1cd96a5bc38f724eb0 Mon Sep 17 00:00:00 2001 From: Alexei Sorokin Date: Thu, 22 Mar 2018 18:47:28 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/devel:tools:building/meson?expand=0&rev=89 --- meson-suse-fix-llvm-3.8.patch | 2 +- meson-testsuite.changes | 7 +++++++ meson-testsuite.spec | 11 +++++++---- meson.changes | 7 +++++++ meson.spec | 11 +++++++---- 5 files changed, 29 insertions(+), 9 deletions(-) diff --git a/meson-suse-fix-llvm-3.8.patch b/meson-suse-fix-llvm-3.8.patch index d8d4eb5..37120ce 100644 --- a/meson-suse-fix-llvm-3.8.patch +++ b/meson-suse-fix-llvm-3.8.patch @@ -19,7 +19,7 @@ else: raise DependencyException( 'Could not find a dynamically linkable library for LLVM.') -+ """ ++ """ def check_components(self, modules, required=True): """Check for llvm components (modules in meson terms). diff --git a/meson-testsuite.changes b/meson-testsuite.changes index c59183a..b8641b4 100644 --- a/meson-testsuite.changes +++ b/meson-testsuite.changes @@ -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 diff --git a/meson-testsuite.spec b/meson-testsuite.spec index 32ba733..54b7be2 100644 --- a/meson-testsuite.spec +++ b/meson-testsuite.spec @@ -35,12 +35,12 @@ Source1: https://github.com/%{_name}/meson/releases/download/%{version}/m 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. 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 +# PATCH-FIX-OPENSUSE meson-suse-fix-llvm-3.8.patch -- Fix LLVM 3.8 tests. +Patch1: meson-suse-fix-llvm-3.8.patch # PATCH-FIX-OPENSUSE meson-restore-python3.4.patch -- Restore Python 3.4 support (reverts commit 0538009). Patch2: meson-restore-python3.4.patch -# PATCH-FIX-OPENSUSE meson-suse-fix-llvm-3.8.patch -- Fix LLVM 3.8 tests. -Patch3: meson-suse-fix-llvm-3.8.patch +# PATCH-FIX-OPENSUSE meson-fix-gcc48.patch sor.alexei@meowr.ru -- Fix GCC 4.8 handling for openSUSE Leap 42.x. +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. Patch100: meson-test-installed-bin.patch BuildRequires: python3 @@ -128,10 +128,13 @@ This package provides support for meson.build files in Vim. %prep %setup -q -n meson-%{version} %patch0 -p1 +%if 0%{?suse_version} < 1500 %patch1 -p1 %patch2 -p1 %patch3 -p1 +%endif %patch100 -p1 + # 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 diff --git a/meson.changes b/meson.changes index c59183a..b8641b4 100644 --- a/meson.changes +++ b/meson.changes @@ -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 diff --git a/meson.spec b/meson.spec index 03e26f5..3e69506 100644 --- a/meson.spec +++ b/meson.spec @@ -35,12 +35,12 @@ Source1: https://github.com/%{_name}/meson/releases/download/%{version}/m 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. 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 +# PATCH-FIX-OPENSUSE meson-suse-fix-llvm-3.8.patch -- Fix LLVM 3.8 tests. +Patch1: meson-suse-fix-llvm-3.8.patch # PATCH-FIX-OPENSUSE meson-restore-python3.4.patch -- Restore Python 3.4 support (reverts commit 0538009). Patch2: meson-restore-python3.4.patch -# PATCH-FIX-OPENSUSE meson-suse-fix-llvm-3.8.patch -- Fix LLVM 3.8 tests. -Patch3: meson-suse-fix-llvm-3.8.patch +# PATCH-FIX-OPENSUSE meson-fix-gcc48.patch sor.alexei@meowr.ru -- Fix GCC 4.8 handling for openSUSE Leap 42.x. +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. Patch100: meson-test-installed-bin.patch BuildRequires: python3 @@ -128,10 +128,13 @@ This package provides support for meson.build files in Vim. %prep %setup -q -n meson-%{version} %patch0 -p1 +%if 0%{?suse_version} < 1500 %patch1 -p1 %patch2 -p1 %patch3 -p1 +%endif %patch100 -p1 + # 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