From nobody Mon Aug 22 18:41:18 2022 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4MBLmH1FZ6z4ZMLH; Mon, 22 Aug 2022 18:41:19 +0000 (UTC) (envelope-from git@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 4MBLmH0qb3z3dVf; Mon, 22 Aug 2022 18:41:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1661193679; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=KxJpOh4jHFmk8V1nBk9W8apgvhTj156VA0VYEIiA3IE=; b=TyZNlAN6qnv987Mcq3P5AuikHywZjM3GKzJMeIEi6DXZO0ragZS3pn9Di2j0CiE9wjk3j7 +6dljjv+FYffkgKcxXiTcpRUS92xY4jKFSFvTeRtz1AXXUFMBQlCDW5xwc/GamMoMNKxjj zHTSLKm8rLBGUb/3fMgBxxC+3EEc4cFcUULF7XQkiSj08t58K6BysaIwZwS3qpmMc0CPr5 XP/SxAa1AWvXNUdU/M00VtXj1JktlBy22Mt31HLA01ynFF4k5bzFM0TW3avwG+lgSogFFO Swx4fjtAMkFtgpa1DWh4ebfzuoYWTS+FDz0ylvPbIF758MjrVbJ0RQK1XepbgQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4MBLmG717yz10m2; Mon, 22 Aug 2022 18:41:18 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 27MIfItV052046; Mon, 22 Aug 2022 18:41:18 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 27MIfIE8052045; Mon, 22 Aug 2022 18:41:18 GMT (envelope-from git) Date: Mon, 22 Aug 2022 18:41:18 GMT Message-Id: <202208221841.27MIfIE8052045@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: "Tobias C. Berner" Subject: git: acea977ab0b9 - main - qt.mk: Qt 6 has its tools in libexec/qt6 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: tcberner X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: acea977ab0b97222877a502c001f1299735b036e Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1661193679; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=KxJpOh4jHFmk8V1nBk9W8apgvhTj156VA0VYEIiA3IE=; b=HXdS32nQYPLWi35/0I++V6XfDU+Lhvw1zumhAPDCXtzzlYI8vPGW8AmSki6zwS8kYdt4uF 4PV4jWiupwqREYWLcbb4YIT6M2Dd3e/ax6nC+TOGQKKQGSn2KprMTXSqjlJDzdtiUPolO/ x3AK3x0pESrbQifzmBC/rv3IMfeMjgaydVSbFJedCoQ2g5hTM10VaqAWM7xsvrJe9GxTq1 yW5rEg4LlzDeapQcni7mcRudq9mvFsnT7xvhx09SZbQKB1O6IbZNHyzJLnYHMQuOCs4IiL /d0ozTo0lY7qCy26kqIxGa1AjPJTlnKxyB+koBCGGylsZyXxvaDvTWQl4dTuQA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1661193679; a=rsa-sha256; cv=none; b=cB3PEPMvNi3oX6AHHJaT4tVz+hcBxmHghDZ+O73pj8yJgPryO71v/7Ue9n1+7R2mInz5x4 qZhpTgcJeC7AwDEz0wGwlIFsjHbk2YZRJGtF/uY5EbRT0OJVv5ljlXqOjZyxYen1figJal WSlaxek9ZjMRdldiBU2MO3wtEROMO0RAZP4iz6D8VHBzz2pqBWWx0LOwOYtlkeN81S79uQ PSqjK2dD+hMLCoe6AsDhMPGlQmAArSEesvWNbKMsnoTMw8ZoQzUjJgcNLZgoJWFhCGxbEe QC0X896TP0nEaj7UgBUcgXxeHJ07YaR/LY0jt57GThKgAdYdv3Lz9zURIj6lDQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by tcberner: URL: https://cgit.FreeBSD.org/ports/commit/?id=acea977ab0b97222877a502c001f1299735b036e commit acea977ab0b97222877a502c001f1299735b036e Author: Tobias C. Berner AuthorDate: 2022-08-22 18:27:39 +0000 Commit: Tobias C. Berner CommitDate: 2022-08-22 18:40:49 +0000 qt.mk: Qt 6 has its tools in libexec/qt6 Add a new QT_TOOLDIR_REL / QT_TOOLDIR pair to handle this path. --- Mk/Uses/qt.mk | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/Mk/Uses/qt.mk b/Mk/Uses/qt.mk index cedf0b206bee..de8a8a628330 100644 --- a/Mk/Uses/qt.mk +++ b/Mk/Uses/qt.mk @@ -71,6 +71,9 @@ QT_ETCDIR_REL?= etc/xdg QT_EXAMPLEDIR_REL?= share/examples/${_QT_RELNAME} QT_TESTDIR_REL?= ${QT_DATADIR_REL}/tests QT_CMAKEDIR_REL?= lib/cmake +_QT5_TOOLDIR_REL= ${QT_BINDIR_REL} +_QT6_TOOLDIR_REL= ${QT_LIBEXECDIR_REL} +QT_TOOLDIR_REL= ${_QT${_QT_VER}_TOOLDIR_REL} # Not customizable. QT_MKSPECDIR_REL= ${QT_ARCHDIR_REL}/mkspecs @@ -79,12 +82,12 @@ _QT_LIBVER= ${_QT_VERSION:R:R} LCONVERT?= ${QT_BINDIR}/lconvert LRELEASE?= ${QT_BINDIR}/lrelease LUPDATE?= ${QT_BINDIR}/lupdate -MOC?= ${QT_BINDIR}/moc -RCC?= ${QT_BINDIR}/rcc -UIC?= ${QT_BINDIR}/uic +MOC?= ${QT_TOOLDIR}/moc +RCC?= ${QT_TOOLDIR}/rcc +UIC?= ${QT_TOOLDIR}/uic QMAKE?= ${QT_BINDIR}/qmake -QCOLLECTIONGENERATOR?= ${QT_BINDIR}/qcollectiongenerator -QHELPGENERATOR?= ${QT_BINDIR}/qhelpgenerator +QCOLLECTIONGENERATOR?= ${QT_TOOLDIR}/qcollectiongenerator +QHELPGENERATOR?= ${QT_TOOLDIR}/qhelpgenerator # Needed to redefine the qmake target for internal Qt configuration. _QMAKE?= ${QMAKE} @@ -99,7 +102,7 @@ QMAKE_COMPILER= $$(ccver="$$(${CXX} --version)"; case "$$ccver" in *clang*) echo . for dir in BIN INC LIB ARCH PLUGIN LIBEXEC IMPORT \ QML DATA DOC L10N ETC EXAMPLE TEST MKSPEC \ - CMAKE + CMAKE TOOL QT_${dir}DIR= ${PREFIX}/${QT_${dir}DIR_REL} # Export all directories to the plist substituion for QT_DIST ports. # For the others, exclude QT_CMAKEDIR and QT_ETCDIR.