Blame 0002-rpm-use-set_build_flags-skip-ci.patch
|
Igor Gnatenko |
795680 |
From f40355d8a1c12504d2a4d7494d1c9c0b92558d9a Mon Sep 17 00:00:00 2001
|
|
Igor Gnatenko |
795680 |
From: Igor Gnatenko <i.gnatenko.brain@gmail.com>
|
|
Igor Gnatenko |
795680 |
Date: Mon, 23 Jul 2018 19:25:30 +0200
|
|
Igor Gnatenko |
795680 |
Subject: [PATCH 2/3] rpm: use %set_build_flags [skip ci]
|
|
Igor Gnatenko |
795680 |
|
|
Igor Gnatenko |
795680 |
It has better name and should do the trick.
|
|
Igor Gnatenko |
795680 |
|
|
Igor Gnatenko |
795680 |
Signed-off-by: Igor Gnatenko <i.gnatenko.brain@gmail.com>
|
|
Igor Gnatenko |
795680 |
---
|
|
Igor Gnatenko |
795680 |
data/macros.meson | 6 +-----
|
|
Igor Gnatenko |
795680 |
1 file changed, 1 insertion(+), 5 deletions(-)
|
|
Igor Gnatenko |
795680 |
|
|
Igor Gnatenko |
795680 |
diff --git a/data/macros.meson b/data/macros.meson
|
|
Igor Gnatenko |
795680 |
index 31f77951..acd3af93 100644
|
|
Igor Gnatenko |
795680 |
--- a/data/macros.meson
|
|
Igor Gnatenko |
795680 |
+++ b/data/macros.meson
|
|
Igor Gnatenko |
795680 |
@@ -3,11 +3,7 @@
|
|
Igor Gnatenko |
795680 |
%__meson_auto_features enabled
|
|
Igor Gnatenko |
795680 |
|
|
Igor Gnatenko |
795680 |
%meson \
|
|
Igor Gnatenko |
795680 |
- export CFLAGS="${CFLAGS:-%__global_cflags}" \
|
|
Igor Gnatenko |
795680 |
- export CXXFLAGS="${CXXFLAGS:-%__global_cxxflags}" \
|
|
Igor Gnatenko |
795680 |
- export FFLAGS="${FFLAGS:-%__global_fflags}" \
|
|
Igor Gnatenko |
795680 |
- export FCFLAGS="${FCFLAGS:-%__global_fcflags}" \
|
|
Igor Gnatenko |
795680 |
- export LDFLAGS="${LDFLAGS:-%__global_ldflags}" \
|
|
Igor Gnatenko |
795680 |
+ %set_build_flags \
|
|
Igor Gnatenko |
795680 |
%{__meson} \\\
|
|
Igor Gnatenko |
795680 |
--buildtype=plain \\\
|
|
Igor Gnatenko |
795680 |
--prefix=%{_prefix} \\\
|
|
Igor Gnatenko |
795680 |
--
|
|
Igor Gnatenko |
795680 |
2.18.0
|
|
Igor Gnatenko |
795680 |
|