snailed
/
void-packages
2
0
Fork 0
Code Issues 1 Pull Requests 5 Actions Activity

qt5: workaround x86 breakage due to -fstack-protector-strong.

This commit is contained in:
Juan RP 2014-12-01 12:08:47 +01:00
parent eb0bfbf8de
commit 5aab5555d6
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
srcpkgs/qt5/template
View File

@ -23,12 +23,11 @@ makedepends="
gst-plugins-base1-devel libxslt-devel" gst-plugins-base1-devel libxslt-devel"
depends="qtchooser" depends="qtchooser"
# XXX
if [ "$XBPS_TARGET_MACHINE" = "i686" ]; then
broken="http://build.voidlinux.eu:8010/builders/i686_builder/builds/7611/steps/shell_3/logs/stdio"
fi
pre_configure() { pre_configure() {
if [ "$XBPS_TARGET_MACHINE" = "i686" ]; then
# XXX http://build.voidlinux.eu:8010/builders/i686_builder/builds/7611/steps/shell_3/logs/stdio
CXXFLAGS="${CXXFLAGS/-fstack-protector-strong/-fstack-protector}"
fi
sed -i "s|-O2|${CXXFLAGS}|" qtbase/mkspecs/common/{g++,gcc}-base.conf sed -i "s|-O2|${CXXFLAGS}|" qtbase/mkspecs/common/{g++,gcc}-base.conf
sed -i "/^QMAKE_LFLAGS_RPATH/s| -Wl,-rpath,||g" qtbase/mkspecs/common/gcc-base-unix.conf sed -i "/^QMAKE_LFLAGS_RPATH/s| -Wl,-rpath,||g" qtbase/mkspecs/common/gcc-base-unix.conf
sed -i "/^QMAKE_LFLAGS\s/s|+=|+= ${LDFLAGS}|g" qtbase/mkspecs/common/gcc-base.conf sed -i "/^QMAKE_LFLAGS\s/s|+=|+= ${LDFLAGS}|g" qtbase/mkspecs/common/gcc-base.conf