clearlinux/autospec
2
0
Fork 0
mirror of https://github.com/clearlinux/autospec.git synced 2026-09-01 02:44:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

specfiles: Avoid unnecessary whitespace in -m32 writes

Browse Source 
With newer CMake versions, having unsanitized " -m32" LDFLAGS with the
whitespace will violate policy CMP0004 causing build failures in SDL2.
Thus we modify the .spec file to only set "-m32" if the string is empty,
otherwise include " -m32" and the existing variable.

Signed-off-by: Ikey Doherty <ikey.doherty@intel.com>
This commit is contained in:
Ikey Doherty
2019-01-02 12:06:53 +00:00
committed by William Douglas
parent 61321637e3
commit 8a9a4c2225
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
autospec/specfiles.py
+4 -4
View File
@@ -402,10 +402,10 @@ class Specfile(object):
def write_32bit_exports(self):
"""Write 32bit only env exports."""
self._write_strip('export PKG_CONFIG_PATH="/usr/lib32/pkgconfig"')
self._write_strip('export ASFLAGS="$ASFLAGS --32"')
self._write_strip('export CFLAGS="$CFLAGS -m32"')
self._write_strip('export CXXFLAGS="$CXXFLAGS -m32"')
self._write_strip('export LDFLAGS="$LDFLAGS -m32"')
self._write_strip('export ASFLAGS="${ASFLAGS}${ASFLAGS:+ }--32"')
self._write_strip('export CFLAGS="${CFLAGS}${CFLAGS:+ }-m32"')
self._write_strip('export CXXFLAGS="${CXXFLAGS}${CXXFLAGS:+ }-m32"')
self._write_strip('export LDFLAGS="${LDFLAGS}${LDFLAGS:+ }-m32"')
def write_variables(self):
"""Write variable exports to spec file."""