testing/meson
SHA256
3
0
Fork 0
forked from pool/meson
Code Pull Requests Activity

Accepting request 449560 from home:dimstar:Factory

Browse Source 
- 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.

OBS-URL: https://build.opensuse.org/request/show/449560
OBS-URL: https://build.opensuse.org/package/show/devel:tools:building/meson?expand=0&rev=28
This commit is contained in:
Alexei Sorokin 2017-01-10 16:34:08 +00:00 committed by Git OBS Bridge
parent 6efa60b797
commit 2430271fed
3 changed files with 35 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
meson-suse-ify-macros.patch Normal file
View File

@ -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} \\\

10
meson.changes
View File

@ -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

3
meson.spec
View File

@ -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" \