From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 523C715810F for ; Sun, 11 Jun 2023 17:17:49 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 6BB8EE086E; Sun, 11 Jun 2023 17:17:48 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (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) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 4F78BE086E for ; Sun, 11 Jun 2023 17:17:48 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (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) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id E302934132C for ; Sun, 11 Jun 2023 17:17:46 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 4D61BA5C for ; Sun, 11 Jun 2023 17:17:45 +0000 (UTC) From: "Andreas Sturmlechner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Sturmlechner" Message-ID: <1686503799.36972bc5067874ad38bebabf57ac4c2785e96c30.asturm@gentoo> Subject: [gentoo-commits] proj/qt:master commit in: eclass/ X-VCS-Repository: proj/qt X-VCS-Files: eclass/qmake-utils.eclass X-VCS-Directories: eclass/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: 36972bc5067874ad38bebabf57ac4c2785e96c30 X-VCS-Branch: master Date: Sun, 11 Jun 2023 17:17:45 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 74cf4340-9c21-4e0c-b855-b777e7cfb0cf X-Archives-Hash: 2a8209c58e2dc734a25ea94a72197093 commit: 36972bc5067874ad38bebabf57ac4c2785e96c30 Author: Michał Górny gentoo org> AuthorDate: Sun May 8 14:04:20 2022 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Sun Jun 11 17:16:39 2023 +0000 URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=36972bc5 qmake-utils.eclass: Add a function to get qmake args Signed-off-by: Michał Górny gentoo.org> Signed-off-by: Andreas Sturmlechner gentoo.org> eclass/qmake-utils.eclass | 93 ++++++++++++++++++++++++++++++----------------- 1 file changed, 60 insertions(+), 33 deletions(-) diff --git a/eclass/qmake-utils.eclass b/eclass/qmake-utils.eclass index 345c574a..2d6623f2 100644 --- a/eclass/qmake-utils.eclass +++ b/eclass/qmake-utils.eclass @@ -60,40 +60,31 @@ qt5_get_plugindir() { echo $(qt5_get_libdir)/qt5/plugins } -# @FUNCTION: qt6_get_bindir -# @DESCRIPTION: -# Echoes the directory where Qt6 binaries are installed. -# EPREFIX is already prepended to the returned path. -qt6_get_bindir() { - echo ${EPREFIX}$(qt6_get_libdir)/qt6/bin -} - -# @FUNCTION: qt6_get_headerdir +# @FUNCTION: qt5_get_qmake_args # @DESCRIPTION: -# Echoes the directory where Qt6 headers are installed. -qt6_get_headerdir() { - echo /usr/include/qt6 -} - -# @FUNCTION: qt6_get_libdir -# @DESCRIPTION: -# Echoes the directory where Qt6 libraries are installed. -qt6_get_libdir() { - echo /usr/$(get_libdir) -} - -# @FUNCTION: qt6_get_mkspecsdir -# @DESCRIPTION: -# Echoes the directory where Qt6 mkspecs are installed. -qt6_get_mkspecsdir() { - echo $(qt6_get_libdir)/qt6/mkspecs -} - -# @FUNCTION: qt6_get_plugindir -# @DESCRIPTION: -# Echoes the directory where Qt6 plugins are installed. -qt6_get_plugindir() { - echo $(qt6_get_libdir)/qt6/plugins +# Echoes a multi-line string containing arguments to pass to qmake. +qt5_get_qmake_args() { + cat <<-EOF + QMAKE_AR="$(tc-getAR) cqs" + QMAKE_CC="$(tc-getCC)" + QMAKE_LINK_C="$(tc-getCC)" + QMAKE_LINK_C_SHLIB="$(tc-getCC)" + QMAKE_CXX="$(tc-getCXX)" + QMAKE_LINK="$(tc-getCXX)" + QMAKE_LINK_SHLIB="$(tc-getCXX)" + QMAKE_OBJCOPY="$(tc-getOBJCOPY)" + QMAKE_RANLIB= + QMAKE_STRIP= + QMAKE_CFLAGS="${CFLAGS}" + QMAKE_CFLAGS_RELEASE= + QMAKE_CFLAGS_DEBUG= + QMAKE_CXXFLAGS="${CXXFLAGS}" + QMAKE_CXXFLAGS_RELEASE= + QMAKE_CXXFLAGS_DEBUG= + QMAKE_LFLAGS="${LDFLAGS}" + QMAKE_LFLAGS_RELEASE= + QMAKE_LFLAGS_DEBUG= + EOF } # @FUNCTION: eqmake5 @@ -143,4 +134,40 @@ eqmake5() { fi } +# @FUNCTION: qt6_get_bindir +# @DESCRIPTION: +# Echoes the directory where Qt6 binaries are installed. +# EPREFIX is already prepended to the returned path. +qt6_get_bindir() { + echo ${EPREFIX}$(qt6_get_libdir)/qt6/bin +} + +# @FUNCTION: qt6_get_headerdir +# @DESCRIPTION: +# Echoes the directory where Qt6 headers are installed. +qt6_get_headerdir() { + echo /usr/include/qt6 +} + +# @FUNCTION: qt6_get_libdir +# @DESCRIPTION: +# Echoes the directory where Qt6 libraries are installed. +qt6_get_libdir() { + echo /usr/$(get_libdir) +} + +# @FUNCTION: qt6_get_mkspecsdir +# @DESCRIPTION: +# Echoes the directory where Qt6 mkspecs are installed. +qt6_get_mkspecsdir() { + echo $(qt6_get_libdir)/qt6/mkspecs +} + +# @FUNCTION: qt6_get_plugindir +# @DESCRIPTION: +# Echoes the directory where Qt6 plugins are installed. +qt6_get_plugindir() { + echo $(qt6_get_libdir)/qt6/plugins +} + fi