From 344e54dd33af44e0baec2ef8e93bb663de70fcf3 Mon Sep 17 00:00:00 2001 From: Caio Marcelo de Oliveira Filho Date: Tue, 25 Sep 2018 11:05:23 -0700 Subject: [PATCH] Do not set flags twice in meson build The PKG_CONFIG_PATH, CFLAGS and friends are already exported, so don't set it again in the meson command line. --- autospec/specfiles.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/autospec/specfiles.py b/autospec/specfiles.py index 8f02759..6396d34 100644 --- a/autospec/specfiles.py +++ b/autospec/specfiles.py @@ -1371,8 +1371,7 @@ class Specfile(object): if config.config_opts['32bit']: self._write_strip("pushd ../build32") self.write_32bit_exports() - self._write_strip('CFLAGS="$CFLAGS -m32" CXXFLAGS="$CXXFLAGS -m32" LDFLAGS="$LDFLAGS -m32" ' - 'PKG_CONFIG_PATH="/usr/lib32/pkgconfig" meson ' + self._write_strip('meson ' '--libdir=/usr/lib32 --prefix /usr --buildtype=plain {0} {1} builddir' .format(config.extra_configure, config.extra_configure32))