You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
34 lines
1.2 KiB
34 lines
1.2 KiB
6 years ago
|
From a532714cf50f13cb29b0eb86c588f3a7fc6343b0 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Igor Gnatenko <i.gnatenko.brain@gmail.com>
|
||
|
|
Date: Mon, 4 Sep 2017 13:03:07 +0200
|
||
|
|
Subject: [PATCH 1/2] rpm: use good old %optflags
|
||
|
|
|
||
|
|
Signed-off-by: Igor Gnatenko <i.gnatenko.brain@gmail.com>
|
||
|
|
---
|
||
|
|
data/macros.meson | 10 +++++-----
|
||
|
|
1 file changed, 5 insertions(+), 5 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/data/macros.meson b/data/macros.meson
|
||
|
|
index 732b68d2..9ef19a57 100644
|
||
|
|
--- a/data/macros.meson
|
||
|
|
+++ b/data/macros.meson
|
||
|
|
@@ -2,11 +2,11 @@
|
||
|
|
%__meson_wrap_mode nodownload
|
||
|
|
|
||
|
|
%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 -I%_fmoddir}" \
|
||
|
|
+ export FCFLAGS="${FCFLAGS:-%optflags -I%_fmoddir}" \
|
||
|
|
+ export LDFLAGS="${LDFLAGS:-%__global_ldflags}" \
|
||
|
|
%{__meson} \\\
|
||
|
|
--buildtype=plain \\\
|
||
|
|
--prefix=%{_prefix} \\\
|
||
|
|
--
|
||
|
|
2.18.0
|