From 718267136f3672b6fa4993ff8cf48d51eea64298 Mon Sep 17 00:00:00 2001 From: Juergen Buchmueller Date: Tue, 8 Nov 2016 16:08:55 +0100 Subject: [PATCH] qt5-webkit: fix cross --- srcpkgs/qt5-webkit/template | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/srcpkgs/qt5-webkit/template b/srcpkgs/qt5-webkit/template index 94729625787..7f678a3297e 100644 --- a/srcpkgs/qt5-webkit/template +++ b/srcpkgs/qt5-webkit/template @@ -2,10 +2,10 @@ pkgname=qt5-webkit version=5.6.2 revision=1 -nocross=yes build_style=qmake wrksrc=qtwebkit-opensource-src-${version} -hostmakedepends="bison flex gperf perl python ruby pkg-config qt5-qmake" +hostmakedepends="bison flex gperf perl python ruby pkg-config + qt5-host-tools qt5-declarative-devel" makedepends="libwebp-devel libxslt-devel libXcomposite-devel sqlite-devel gst-plugins-base1-devel qt5-declarative-devel qt5-location-devel qt5-sensors-devel qt5-webchannel-devel" @@ -19,11 +19,9 @@ checksum=528a6b8b1c5095367b26e8ce4f3a46bb739e2e9913ff4dfc6ef58a04fcd73966 if [ ${XBPS_GCC_VERSION_MAJOR} -gt 5 ]; then CXXFLAGS="-fno-delete-null-pointer-checks" fi - if [ -n "$CROSS_BUILD" ]; then - CFLAGS+=" -I${XBPS_CROSS_BASE}/usr/include/qt5 -I${XBPS_CROSS_BASE}/usr/include/qt5/QtCore" - CXXFLAGS+=" -I${XBPS_CROSS_BASE}/usr/include/qt5 -I${XBPS_CROSS_BASE}/usr/include/qt5/QtCore" - export QT_SYSROOT=${XBPS_CROSS_BASE} + # Can't use gold linker when cross compiling + configure_args+=" QMAKE_LFLAGS_USE_GOLD=" fi pre_configure() {