From owner-svn-ports-all@freebsd.org Wed Feb 10 23:19:17 2021 Return-Path: Delivered-To: svn-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id D374052DC4B; Wed, 10 Feb 2021 23:19:17 +0000 (UTC) (envelope-from adridg@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4DbbLY5dxbz3jHy; Wed, 10 Feb 2021 23:19:17 +0000 (UTC) (envelope-from adridg@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id B4926264AA; Wed, 10 Feb 2021 23:19:17 +0000 (UTC) (envelope-from adridg@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 11ANJHMh070430; Wed, 10 Feb 2021 23:19:17 GMT (envelope-from adridg@FreeBSD.org) Received: (from adridg@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 11ANJH1L070429; Wed, 10 Feb 2021 23:19:17 GMT (envelope-from adridg@FreeBSD.org) Message-Id: <202102102319.11ANJH1L070429@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: adridg set sender to adridg@FreeBSD.org using -f From: Adriaan de Groot Date: Wed, 10 Feb 2021 23:19:17 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r564908 - head/Mk/Uses X-SVN-Group: ports-head X-SVN-Commit-Author: adridg X-SVN-Commit-Paths: head/Mk/Uses X-SVN-Commit-Revision: 564908 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 10 Feb 2021 23:19:17 -0000 Author: adridg Date: Wed Feb 10 23:19:17 2021 New Revision: 564908 URL: https://svnweb.freebsd.org/changeset/ports/564908 Log: Improve the upgrade path for Qt with portupgrade. Newer Qt releases depend on the build tools and qmake from that release, but the existing way of specifying that (e.g. USE_QT=buildtools_build) could pick up the *old* Qt version's tools and qmake. Never a problem in poudriere, which builds cleanly, but it keeps tripping up other tools. Replace the existing definitions for the dependencies with versioned dependencies, so that the right version of tools is built and used for the rest of the Qt stack. PR: 245862 Reported by: Piotr Smyrak Reviewed by: tcberner Modified: head/Mk/Uses/qt.mk Modified: head/Mk/Uses/qt.mk ============================================================================== --- head/Mk/Uses/qt.mk Wed Feb 10 22:08:53 2021 (r564907) +++ head/Mk/Uses/qt.mk Wed Feb 10 23:19:17 2021 (r564908) @@ -151,8 +151,9 @@ qt-3d_LIB= libQt${_QT_LIBVER}3DCore.so qt-assistant_PORT= devel/${_QT_RELNAME}-assistant qt-assistant_PATH= ${LOCALBASE}/${QT_BINDIR_REL}/assistant +# Always build with *this* version's buildtools qt-buildtools_PORT= devel/${_QT_RELNAME}-buildtools -qt-buildtools_PATH= ${LOCALBASE}/${QT_BINDIR_REL}/moc +qt-buildtools_PATH= ${_QT_RELNAME}-buildtools>=${_QT_VERSION} qt-charts_PORT= x11-toolkits/${_QT_RELNAME}-charts qt-charts_LIB= libQt${_QT_LIBVER}Charts.so @@ -256,8 +257,9 @@ qt-qdoc-data_PATH= ${LOCALBASE}/${QT_DOCDIR_REL}/globa qt-qev_PORT= x11/${_QT_RELNAME}-qev qt-qev_PATH= ${LOCALBASE}/${QT_BINDIR_REL}/qev +# Always build with *this* version's qmake qt-qmake_PORT= devel/${_QT_RELNAME}-qmake -qt-qmake_PATH= ${LOCALBASE}/${QT_BINDIR_REL}/qmake +qt-qmake_PATH= ${_QT_RELNAME}-qmake>=${_QT_VERSION} qt-quick3d_PORT= x11-toolkits/${_QT_RELNAME}-quick3d qt-quick3d_LIB= libQt${_QT_LIBVER}Quick3D.so