From 5aab5555d6b51df6923345b7b9f0ea77b54a1203 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Mon, 1 Dec 2014 12:08:47 +0100 Subject: [PATCH] qt5: workaround x86 breakage due to -fstack-protector-strong. --- srcpkgs/qt5/template | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/srcpkgs/qt5/template b/srcpkgs/qt5/template index b193ab999d3..a0ab5f77c4e 100644 --- a/srcpkgs/qt5/template +++ b/srcpkgs/qt5/template @@ -23,12 +23,11 @@ makedepends=" gst-plugins-base1-devel libxslt-devel" 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() { + 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 "/^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