From 77b5af0e6593683789eda383104837d4bf638098 Mon Sep 17 00:00:00 2001 From: Enno Boland Date: Wed, 3 May 2017 20:11:18 +0200 Subject: [PATCH] mumble: fix cross --- srcpkgs/mumble/template | 21 ++++++++++++++++----- 1 file changed, 16 insertions(+), 5 deletions(-) diff --git a/srcpkgs/mumble/template b/srcpkgs/mumble/template index 87d5ae9345..60f68db742 100644 --- a/srcpkgs/mumble/template +++ b/srcpkgs/mumble/template @@ -2,7 +2,7 @@ pkgname=mumble version=1.2.19 revision=4 -hostmakedepends="pkg-config" +hostmakedepends="pkg-config qt-host-tools qt-qmake protobuf Ice" makedepends=" libcap-devel Ice-devel protobuf-devel libXi-devel qt-devel libressl-devel speex-devel libsndfile-devel libX11-devel alsa-lib-devel pulseaudio-devel @@ -15,21 +15,32 @@ homepage="http://mumble.sourceforge.net/" license="BSD" distfiles="https://github.com/mumble-voip/${pkgname}/releases/download/${version}/${pkgname}-${version}.tar.gz" checksum=f047fb707ad93948b0bc913ec0a89cd5480d87e840c4ff2519608fc8a2dac0e8 -nocross=https://build.voidlinux.eu/builders/armv7l_builder/builds/2488/steps/shell_3/logs/stdio do_configure() { + if [ "$CROSS_BUILD" ]; then + for i in ${XBPS_CROSS_BASE}/usr/include/Qt*; do + CXXFLAGS+=" -I$i" + done + fi # Needs bundled celt for some reason - qmake -recursive main.pro \ + qmake-qt4 -recursive main.pro \ CONFIG+="bundled-celt no-bundled-opus no-update no-bundled-speex no-g15 \ no-xevie pulseaudio no-embed-qt-translations" \ - DEFINES+="PLUGIN_PATH=/usr/lib/mumble" CXXFLAGS="$CXXFLAGS" LDFLAGS="$LDFLAGS" + DEFINES+="PLUGIN_PATH=/usr/lib/mumble" CXXFLAGS="$CXXFLAGS" LDFLAGS="$LDFLAGS" \ + PREFIX=/usr \ + LIB=/usr/lib \ + QMAKE_CC=$CC QMAKE_CXX=$CXX QMAKE_LINK=$CXX \ + QMAKE_CFLAGS="${CFLAGS}" \ + QMAKE_CXXFLAGS="${CXXFLAGS}" \ + QMAKE_LFLAGS="${LDFLAGS}" # qmake-qt4 ignores CXXFLAGS and LDFLAGS thus patch the Makefiles sed -i */Makefile* */*/Makefile* \ -e "s;^\(LFLAGS.*=.*\);& $LDFLAGS;" \ -e "s;^\(CXXFLAGS.*=.*\);& $CXXFLAGS;" } do_build() { - make ${makejobs} release + make ${makejobs} release \ + CC="$CC" CXX="$CXX" LINK="$CXX" } do_install() { vlicense LICENSE