d715e30
From 48e8347b4755800287aa653a4d08b89d86bfda52 Mon Sep 17 00:00:00 2001
795680b
From: Igor Gnatenko <i.gnatenko.brain@gmail.com>
795680b
Date: Mon, 23 Jul 2018 19:25:30 +0200
d715e30
Subject: [PATCH 1/5] rpm: use %set_build_flags [skip ci]
795680b
795680b
It has better name and should do the trick.
795680b
795680b
Signed-off-by: Igor Gnatenko <i.gnatenko.brain@gmail.com>
d715e30
(cherry picked from commit 99070beec4a6b1ded499405025104483534f97e4)
795680b
---
795680b
 data/macros.meson | 6 +-----
795680b
 1 file changed, 1 insertion(+), 5 deletions(-)
795680b
795680b
diff --git a/data/macros.meson b/data/macros.meson
66003de
index 732b68d2..7be47895 100644
795680b
--- a/data/macros.meson
795680b
+++ b/data/macros.meson
66003de
@@ -2,11 +2,7 @@
66003de
 %__meson_wrap_mode nodownload
795680b
 
795680b
 %meson \
795680b
-    export CFLAGS="${CFLAGS:-%__global_cflags}"       \
795680b
-    export CXXFLAGS="${CXXFLAGS:-%__global_cxxflags}" \
795680b
-    export FFLAGS="${FFLAGS:-%__global_fflags}"       \
795680b
-    export FCFLAGS="${FCFLAGS:-%__global_fcflags}"    \
795680b
-    export LDFLAGS="${LDFLAGS:-%__global_ldflags}"    \
795680b
+    %set_build_flags \
795680b
     %{__meson}                              \\\
795680b
         --buildtype=plain                   \\\
795680b
         --prefix=%{_prefix}                 \\\
795680b
-- 
795680b
2.18.0
795680b