From b21a0a9d92095ad98f67e9d471d4178128163339 Mon Sep 17 00:00:00 2001 From: Piraty Date: Fri, 1 Nov 2019 01:45:31 +0100 Subject: [PATCH] qjackctl: fix cross previously, qmake tried to link libs from the host. By using build-style=qmake, we now make use of the qtconf file which specifies correct sysroot and paths. A run of configure is still necessary --- srcpkgs/qjackctl/template | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/srcpkgs/qjackctl/template b/srcpkgs/qjackctl/template index 0bdc6bba780..ef52b716f0f 100644 --- a/srcpkgs/qjackctl/template +++ b/srcpkgs/qjackctl/template @@ -2,8 +2,7 @@ pkgname=qjackctl version=0.6.0 revision=1 -build_style=gnu-configure -configure_args="--enable-jack-version --disable-xunique" +build_style=qmake hostmakedepends="pkg-config" makedepends="qt5-devel jack-devel qt5-x11extras-devel" depends="desktop-file-utils hicolor-icon-theme jack" @@ -16,9 +15,16 @@ checksum=9dd5ee9a7f0a2d1d530b10652e09972732dc210239b7c082be816f0e7bdfadcd if [ "${CROSS_BUILD}" ]; then hostmakedepends+=" qt5-host-tools qt5-devel qt5-x11extras-devel" + crossargs="--host=$XBPS_CROSS_TRIPLET --with-sysroot=$XBPS_CROSS_BASE" fi do_patch() { vsed -i '21i#include // gethostname()' src/qjackctl.cpp vsed -i "s/@\$(QMAKE).*/& QMAKE_CC=$CC QMAKE_CXX=$CXX QMAKE_LINK=$CXX/" Makefile.in } + +pre_configure() { + local defargs="--prefix=/usr --sysconfdir=/etc --sbindir=/usr/bin --bindir=/usr/bin --with-libtool-sysroot=$XBPS_CROSS_BASE --mandir=/usr/share/man --infodir=/usr/share/info --localstatedir=/var" + local args="--enable-jack-version --disable-xunique" + ./configure $defargs $args $crossargs +}