diff --git a/meson-suse-ify-macros.patch b/meson-suse-ify-macros.patch new file mode 100644 index 0000000..e5d9bf8 --- /dev/null +++ b/meson-suse-ify-macros.patch @@ -0,0 +1,22 @@ +Index: meson-0.37.1/data/macros.meson +=================================================================== +--- meson-0.37.1.orig/data/macros.meson ++++ meson-0.37.1/data/macros.meson +@@ -1,11 +1,12 @@ + %__meson %{_bindir}/meson ++%_vpath_srcdir . ++%_vpath_builddir build + + %meson \ +- export CFLAGS="${CFLAGS:-%__global_cflags}" \ +- export CXXFLAGS="${CXXFLAGS:-%__global_cxxflags}" \ +- export FFLAGS="${FFLAGS:-%__global_fflags}" \ +- export FCFLAGS="${FCFLAGS:-%__global_fcflags}" \ +- export LDFLAGS="${LDFLAGS:-%__global_ldflags}" \ ++ export CFLAGS="${CFLAGS:-%optflags}" \ ++ export CXXFLAGS="${CXXFLAGS:-%optflags}" \ ++ export FFLAGS="${FFLAGS:-%optflags}" \ ++ export FCFLAGS="${FCFLAGS:-%optflags}" \ + %{__meson} \\\ + --buildtype=plain \\\ + --prefix=%{_prefix} \\\ diff --git a/meson.changes b/meson.changes index 28b52bc..9cd30a7 100644 --- a/meson.changes +++ b/meson.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +Tue Jan 10 16:14:32 UTC 2017 - dimstar@opensuse.org + +- Add meson-suse-ify-macros.patch: Make the meson macros also work + on openSUSE. We do not (yet?) have separate macros for CFLAGS, + CXXFLAGS, FFLAGS and LDFLAGS, but only carry optflags. This is no + issue, since openSUSE so far only added flags that work accross + compilers/languages. This might change in the future, making the + patch obsolete. + ------------------------------------------------------------------- Sun Jan 1 12:51:36 UTC 2017 - sor.alexei@meowr.ru diff --git a/meson.spec b/meson.spec index b4886f1..2989db4 100644 --- a/meson.spec +++ b/meson.spec @@ -27,6 +27,8 @@ Url: http://mesonbuild.com/ 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 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 +Patch0: meson-suse-ify-macros.patch BuildRequires: bison BuildRequires: boost-devel BuildRequires: flex @@ -71,6 +73,7 @@ Domain Specific Language. %prep %setup -q +%patch0 -p1 # Lack of gtest, gmock, gnustep. rm -rf "test cases/frameworks/2 gtest" \