From 568e673cc51c43536b0859163ec4c50f11ddc63d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= Date: Fri, 12 Jan 2018 11:59:45 +0100 Subject: [PATCH] qt5-webkit: fix cross build in i686 environment --- srcpkgs/qt5-webkit/template | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/srcpkgs/qt5-webkit/template b/srcpkgs/qt5-webkit/template index 0e62cf6e7b..909e7c78e9 100644 --- a/srcpkgs/qt5-webkit/template +++ b/srcpkgs/qt5-webkit/template @@ -28,6 +28,14 @@ do_configure() { # Patch for QtWebProcess LFLAGS sed -i ${wrksrc}/Source/WebKit2/WebProcess.pro \ -e"/TARGET = QtWebProcess/i QMAKE_LFLAGS = $LDFLAGS" + if [ "$XBPS_ARCH" == "i686" -a -n "$CROSS_BUILD" ]; then + # Patch for i686 build environment: don't add i686 flags when cross compiling + sed -i ${wrksrc}/Tools/Scripts/webkitdirs.pm \ + -e 's;"-march=pentium4 -msse2 -mfpmath=sse " . ;;' + sed -i ${wrksrc}/Tools/qmake/mkspecs/features/unix/default_post.prf \ + -e 's;\(QMAKE_CFLAGS +=\) -msse2 -mfpmath=sse;\1;' \ + -e 's;\(QMAKE_CXXFLAGS +=\) -msse2 -mfpmath=sse;\1;' + fi qmake PREFIX=/usr LIB=/usr/lib QMAKE_LFLAGS_USE_GOLD= ${wrksrc} } do_build() {