From 066ed215125e39d8102a55b8356ad030acdad984 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= Date: Sat, 14 Jan 2017 11:29:46 +0100 Subject: [PATCH] qt-webkit: cross is broken for now --- srcpkgs/qt-webkit/template | 27 ++++++++++++--------------- 1 file changed, 12 insertions(+), 15 deletions(-) diff --git a/srcpkgs/qt-webkit/template b/srcpkgs/qt-webkit/template index cc5980afac2..9ecb4dc6b5d 100644 --- a/srcpkgs/qt-webkit/template +++ b/srcpkgs/qt-webkit/template @@ -5,11 +5,13 @@ revision=3 _qtver=4.8.7 wrksrc="qtwebkit-${version}" create_wrksrc=yes +build_style=cmake +configure_args="-DPORT=Efl" hostmakedepends="automake libtool bison flex gperf ruby pkg-config qt-qmake" makedepends="MesaLib-devel libjpeg-turbo-devel qt-devel qt-designer-devel glib-devel fontconfig-devel gst-plugins-base1-devel sqlite-devel libXrender-devel" short_desc="Open source web browser engine (Qt4 port)" -maintainer="Juergen Buchmueller " +maintainer="Jürgen Buchmüller " license="LGPL-2.1, GPL-3" homepage="http://trac.webkit.org/wiki/QtWebKit" distfiles=" @@ -20,6 +22,12 @@ checksum=" e2882295097e47fe089f8ac741a95fef47e0a73a3f3cdf21b56990638f626ea0" conflicts="qt<4.8.7_12" +if [ -n "$CROSS_BUILD" ]; then + hostmakedepends+=" qt-devel" + configure_args+=" -DCMAKE_SYSTEM_PROCESSOR=${CROSS_BUILD}" + broken="https://build.voidlinux.eu/builders/armv7l-musl_builder/builds/162/steps/shell_3/logs/stdio" +fi + post_extract() { patch -p1 < ${FILESDIR}/fix-gcc6.patch patch -p1 < ${FILESDIR}/fix-execinfo.patch @@ -28,20 +36,9 @@ post_extract() { mv qt-everywhere-opensource-src-${_qtver} .. } -do_configure() { - : -} - -do_build() { - local opts="--qt --prefix=/usr --no-webkit2" - case "$XBPS_TARGET_MACHINE" in - i686*) opts+=" --no-force-sse2" ;; - esac - export QTDIR=/usr - export PATH="/usr/lib/qt/bin:$PATH" - Tools/Scripts/build-webkit --makeargs="${makejobs}" ${opts} - cd ../qt-everywhere-opensource-src-${_qtver}/tools/designer/src/plugins/qwebview - qmake +post_build() { + cd ${wrksrc}/../qt-everywhere-opensource-src-${_qtver}/tools/designer/src/plugins/qwebview + qmake CC="$CC" CXX="$CXX" LINK="$CXX" make ${makejobs} }