diff options
| author | Igor Gnatenko <i.gnatenko.brain@gmail.com> | 2015-03-21 14:22:34 +0300 |
|---|---|---|
| committer | Igor Gnatenko <i.gnatenko.brain@gmail.com> | 2015-03-21 14:27:47 +0300 |
| commit | 6cc8881a5200f7cdb26b8225fc582bd0b5cbb3bc (patch) | |
| tree | 6b1486179701ffb7d1b3360e9fbeedfda0593b9e | |
| parent | 5c6bc7ad5e5abeabcf8e6e55938e3de8bc086f50 (diff) | |
| download | meson-6cc8881a5200f7cdb26b8225fc582bd0b5cbb3bc.zip meson-6cc8881a5200f7cdb26b8225fc582bd0b5cbb3bc.tar.gz meson-6cc8881a5200f7cdb26b8225fc582bd0b5cbb3bc.tar.bz2 | |
modules/rpm: use plain set up of compiler and linker flags
to avoid using empty configure file
Signed-off-by: Igor Gnatenko <i.gnatenko.brain@gmail.com>
| -rw-r--r-- | modules/rpm.py | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/modules/rpm.py b/modules/rpm.py index bd3d2f3..422d132 100644 --- a/modules/rpm.py +++ b/modules/rpm.py @@ -109,12 +109,15 @@ class RPMModule: fn.write('%prep\n') fn.write('%autosetup\n') fn.write('rm -rf rpmbuilddir && mkdir rpmbuilddir\n') - fn.write('echo "#!/bin/bash" > rpmbuilddir/configure && chmod +x rpmbuilddir/configure\n') fn.write('\n') fn.write('%build\n') fn.write('pushd rpmbuilddir\n') - fn.write(' %configure\n') - fn.write(' meson .. --buildtype=plain\n') + fn.write(' CFLAGS="${CFLAGS:-%optflags}" ; export CFLAGS\n') + fn.write(' CXXFLAGS="${CXXFLAGS:-%optflags}" ; export CXXFLAGS\n') + fn.write(' FFLAGS="${FFLAGS:-%optflags%{?_fmoddir: -I%_fmoddir}}" ; export FFLAGS\n') + fn.write(' FCFLAGS="${FCFLAGS:-%optflags%{?_fmoddir: -I%_fmoddir}}" ; export FCFLAGS\n') + fn.write(' %{?__global_ldflags:LDFLAGS="${LDFLAGS:-%__global_ldflags}" ; export LDFLAGS ;}\n') + fn.write(' meson .. --buildtype=plain --prefix=%{_prefix}\n') fn.write(' ninja-build -v\n') fn.write('popd\n') fn.write('\n') |