From 46be812ea6778a97fef18020321748e0b9068f11 Mon Sep 17 00:00:00 2001 From: Nathan Owens Date: Wed, 16 Dec 2020 16:44:03 -0600 Subject: [PATCH] dhcpcd-qt: unmark nocross --- srcpkgs/dhcpcd-qt/template | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/srcpkgs/dhcpcd-qt/template b/srcpkgs/dhcpcd-qt/template index a7b58dbcfe8..9e8ed14d4bd 100644 --- a/srcpkgs/dhcpcd-qt/template +++ b/srcpkgs/dhcpcd-qt/template @@ -14,21 +14,22 @@ license="BSD-2-Clause" homepage="http://roy.marples.name/projects/dhcpcd-ui" distfiles="http://roy.marples.name/downloads/dhcpcd/dhcpcd-ui-${version}.tar.xz" checksum=81d448f82c9aa88ff85e4bc3cead5e4c7f3ea08e57c713dff9996fb5ba2c42b0 -nocross="https://api.travis-ci.org/v3/job/621373375/log.txt" if [ "$CROSS_BUILD" ]; then hostmakedepends+=" qt5-devel qt5-host-tools" fi post_configure() { - sed -i src/dhcpcd-qt/Makefile \ + vsed -i src/dhcpcd-qt/Makefile \ -e "s;^\(CC .*=\).*;\1 ${CC};" \ -e "s;^\(CXX .*=\).*;\1 ${CXX};" \ + -e "s;g++ -;${CXX} -;" \ -e "s;^\(CFLAGS.*=.*\);& ${CFLAGS};" \ -e "s;^\(CXXFLAGS.*=.*\);& ${CXXFLAGS};" \ -e "s;^\(LFLAGS.*=.*\);& ${LDFLAGS};" \ -e "s;^\(LINK .*=\).*;\1 ${CXX};" \ - -e "/STRIP/d" + -e "/STRIP/d" \ + -e 's|^LIBS.*|LIBS = $(SUBLIBS) -L../libdhcpcd ../libdhcpcd/libdhcpcd.a -L"${XBPS_CROSS_BASE}/usr/lib" -lQt5Widgets -lQt5Gui -lQt5Core -lGL -lpthread|' } pre_install() {