Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
[meson] Update to version 0.50.1. Contributes to JB#37662
Adapt macro patch to new version by replacing the %set_build_flags macro,
which we don't have, with the actual implementation.
  • Loading branch information
mlehtima committed Apr 23, 2019
1 parent 3c58ed7 commit d10ac62
Show file tree
Hide file tree
Showing 3 changed files with 17 additions and 16 deletions.
2 changes: 1 addition & 1 deletion meson
Submodule meson updated 2067 files
20 changes: 11 additions & 9 deletions rpm/0001-patch-macros.patch
Expand Up @@ -2,17 +2,19 @@ diff --git a/data/macros.meson b/data/macros.meson
index b31f77e..c2eadc0 100644
--- a/data/macros.meson
+++ b/data/macros.meson
@@ -1,3 +1,5 @@
@@ -1,9 +1,14 @@
+%_vpath_srcdir .
+%_vpath_builddir _build
%__meson %{_bindir}/meson
%__meson_wrap_mode nodownload
%__meson_auto_features enabled

@@ -6,7 +8,6 @@
export CXXFLAGS="${CXXFLAGS:-%__global_cxxflags}" \
export FFLAGS="${FFLAGS:-%__global_fflags}" \
export FCFLAGS="${FCFLAGS:-%__global_fcflags}" \
- export LDFLAGS="${LDFLAGS:-%__global_ldflags}" \
%{__meson} \\\
--buildtype=plain \\\
--prefix=%{_prefix} \\\
%meson \
- %set_build_flags \
+ export CFLAGS="${CFLAGS:-%__global_cflags}" \
+ export CXXFLAGS="${CXXFLAGS:-%__global_cxxflags}" \
+ export FFLAGS="${FFLAGS:-%__global_fflags}" \
+ export FCFLAGS="${FCFLAGS:-%__global_fcflags}" \
%{shrink:%{__meson} \
--buildtype=plain \
--prefix=%{_prefix} \
11 changes: 5 additions & 6 deletions rpm/meson.spec
Expand Up @@ -2,14 +2,14 @@

%define _name mesonbuild
Name: meson
Version: 0.44.0
Version: 0.50.1
Release: 0
Summary: Python-based build system
License: ASL 2.0
Group: Development/Tools/Building
Url: http://mesonbuild.com/
Source: https://github.com/mesonbuild/meson/releases/download/%{version}/meson-%{version}.tar.gz
Patch0: 0001-patch-macros.patch
Patch0: 0001-patch-macros.patch

BuildArch: noarch

Expand Down Expand Up @@ -58,10 +58,9 @@ rm -rf %{buildroot}/%{_mandir}/*
%files
%doc COPYING
%{_bindir}/meson
%{_bindir}/mesonconf
%{_bindir}/mesonintrospect
%{_bindir}/mesontest
%{_bindir}/wraptool
%{python_sitelib}/%{_name}/
%{python_sitelib}/meson-*
%config(noreplace) %{_sysconfdir}/rpm/macros.meson
%dir %{_datadir}/polkit-1
%dir %{_datadir}/polkit-1/actions
%{_datadir}/polkit-1/actions/com.mesonbuild.install.policy

0 comments on commit d10ac62

Please sign in to comment.