From 1cba9c09cdfedb2acac87487f1944fb75ef67f1b Mon Sep 17 00:00:00 2001 From: maxice8 Date: Thu, 17 Jan 2019 00:05:21 -0200 Subject: [PATCH] qt5-webkit: try to make it compile on i686 by using ld.gold --- srcpkgs/qt5-webkit/template | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/srcpkgs/qt5-webkit/template b/srcpkgs/qt5-webkit/template index 4b601d58f96..203646a531e 100644 --- a/srcpkgs/qt5-webkit/template +++ b/srcpkgs/qt5-webkit/template @@ -3,7 +3,7 @@ pkgname=qt5-webkit version=5.212.0 revision=2 _v=${version%.*} -wrksrc=qtwebkit-everywhere-src-${_v} +wrksrc="qtwebkit-everywhere-src-${_v}" build_style=cmake configure_args="-DPORT=Qt -DUSE_LD_GOLD=OFF" hostmakedepends="flex gperf perl pkg-config python qt5-qmake ruby" @@ -21,7 +21,7 @@ checksum=283b907ea324a2c734e3983c73fc27dbd8b33e2383c583de41842ee84d648a3e CPPFLAGS="-I${XBPS_CROSS_BASE}/usr/include" CXXFLAGS="-fpermissive -Wno-class-memaccess" -if [ -n "$CROSS_BUILD" ]; then +if [ "$CROSS_BUILD" ]; then hostmakedepends+=" qt5-host-tools qt5-declarative-devel ruby-devel" configure_args+=" -DRUBY_CONFIG_INCLUDE_DIR=${XBPS_CROSS_BASE}/usr/include/ruby-*" fi @@ -35,7 +35,8 @@ case "$XBPS_TARGET_MACHINE" in configure_args+=" -DENABLE_JIT=OFF -DUSE_SYSTEM_MALLOC=ON -DENABLE_ALLINONE_BUILD=OFF" ;; i686*) # try to reduce memory footprint when linking - configure_args+=" -DENABLE_ALLINONE_BUILD=OFF" + # try to reduce memory footprint when linking by using gold + configure_args+=" -DENABLE_ALLINONE_BUILD=OFF -DUSE_LD_GOLD=ON" ;; esac