From da6a24af4827fadf5ff7dad80eeb87c6e20a4fe9 Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Dec 13 2016 14:42:51 +0000 Subject: rebase patches Signed-off-by: Igor Gnatenko --- diff --git a/0001-rpm-use-meson-s-syntax-to-specify-sourcedir-and-buil.patch b/0001-rpm-use-meson-s-syntax-to-specify-sourcedir-and-buil.patch index 53f5ffd..4e8883a 100644 --- a/0001-rpm-use-meson-s-syntax-to-specify-sourcedir-and-buil.patch +++ b/0001-rpm-use-meson-s-syntax-to-specify-sourcedir-and-buil.patch @@ -1,4 +1,4 @@ -From dcd3c217121fbb09be8acecd2d866219e85ad9bd Mon Sep 17 00:00:00 2001 +From dd2843cf8752d26575b15cd1ba73c43bd3501494 Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Tue, 13 Dec 2016 11:59:52 +0100 Subject: [PATCH 1/2] rpm: use meson's syntax to specify sourcedir and builddir @@ -16,32 +16,32 @@ this problem with pushd/popd. It also simplifies things a bit. Reported-by: Richard Hughes References: https://bugzilla.redhat.com/show_bug.cgi?id=1401062 Signed-off-by: Igor Gnatenko +(cherry picked from commit dcd3c217121fbb09be8acecd2d866219e85ad9bd) --- - data/macros.meson | 30 ++++++++++++++---------------- - 1 file changed, 14 insertions(+), 16 deletions(-) + data/macros.meson | 28 +++++++++++++--------------- + 1 file changed, 13 insertions(+), 15 deletions(-) diff --git a/data/macros.meson b/data/macros.meson -index 97d8a23f..5250c348 100644 +index 4b91c70d..1512a6bf 100644 --- a/data/macros.meson +++ b/data/macros.meson -@@ -8,22 +8,20 @@ +@@ -8,21 +8,19 @@ export FFLAGS="%{optflags} -I%{_fmoddir}" \ export FCFLAGS="%{optflags} -I%{_fmoddir}" \ export LDFLAGS="%{?__global_ldflags}" \ - mkdir -p %{__builddir} \ - pushd %{__builddir} \ -- %{__meson} \\\ -- --buildtype=plain \\\ -- --prefix=%{_prefix} \\\ -- --libdir=%{_libdir} \\\ -- --libexecdir=%{_libexecdir} \\\ -- --bindir=%{_bindir} \\\ -- --includedir=%{_includedir} \\\ -- --datadir=%{_datadir} \\\ -- --mandir=%{_mandir} \\\ -- --localedir=%{_datadir}/locale \\\ -- --sysconfdir=%{_sysconfdir} \\\ -- --localstatedir=%{_localstatedir} \\\ +- %{__meson} \\\ +- --buildtype=plain \\\ +- --prefix=%{_prefix} \\\ +- --libdir=%{_libdir} \\\ +- --libexecdir=%{_libexecdir} \\\ +- --bindir=%{_bindir} \\\ +- --includedir=%{_includedir} \\\ +- --datadir=%{_datadir} \\\ +- --mandir=%{_mandir} \\\ +- --localedir=%{_datadir}/locale \\\ +- --sysconfdir=%{_sysconfdir} \\\ - $OLDPWD/%{__sourcedir} \ - popd + %{__meson} \\\ @@ -55,7 +55,6 @@ index 97d8a23f..5250c348 100644 + --mandir=%{_mandir} \\\ + --localedir=%{_datadir}/locale \\\ + --sysconfdir=%{_sysconfdir} \\\ -+ --localstatedir=%{_localstatedir} \\\ + %{__sourcedir} %{__builddir} \\\ + %{nil} diff --git a/0002-rpm-use-__global_-flags.patch b/0002-rpm-use-__global_-flags.patch index 7471d0a..663fcb0 100644 --- a/0002-rpm-use-__global_-flags.patch +++ b/0002-rpm-use-__global_-flags.patch @@ -1,4 +1,4 @@ -From 0121faf16873b500274b36955a08c6994e7f6f76 Mon Sep 17 00:00:00 2001 +From d98711cde68faf2ab61584b3c81a3ab66c3833d8 Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Tue, 13 Dec 2016 12:29:28 +0100 Subject: [PATCH 2/2] rpm: use __global_*flags @@ -14,12 +14,13 @@ but anyway we already have %__global_ldflags and %ninja_build and no one complained. Signed-off-by: Igor Gnatenko +(cherry picked from commit 0121faf16873b500274b36955a08c6994e7f6f76) --- data/macros.meson | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/data/macros.meson b/data/macros.meson -index 5250c348..4eb1ab9a 100644 +index 1512a6bf..e8b15cdd 100644 --- a/data/macros.meson +++ b/data/macros.meson @@ -3,11 +3,11 @@