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 (4096 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 30519158042 for ; Wed, 23 Oct 2024 21:03:21 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 7C967E0938; Wed, 23 Oct 2024 21:03:20 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 65366E0938 for ; Wed, 23 Oct 2024 21:03:20 +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)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 951843406BF for ; Wed, 23 Oct 2024 21:03:19 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 32260AE7 for ; Wed, 23 Oct 2024 21:03:18 +0000 (UTC) From: "Ionen Wolkens" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Ionen Wolkens" Message-ID: <1729717236.e332f55a25fc0de1567586683f99b79bcd0a2b52.ionen@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: ionen X-VCS-Committer-Name: Ionen Wolkens X-VCS-Revision: e332f55a25fc0de1567586683f99b79bcd0a2b52 X-VCS-Branch: master Date: Wed, 23 Oct 2024 21:03:18 +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: a6894f71-cac5-42a6-bd31-71a7338bc5a3 X-Archives-Hash: 81485258a47bcc04505430f2f3de5b05 commit: e332f55a25fc0de1567586683f99b79bcd0a2b52 Author: Ionen Wolkens gentoo org> AuthorDate: Wed Oct 23 20:56:52 2024 +0000 Commit: Ionen Wolkens gentoo org> CommitDate: Wed Oct 23 21:00:36 2024 +0000 URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=e332f55a qmake-utils.eclass: drop in favor ::gentoo's version Not in sync, and given about about all new development moved to ::gentoo (at least the moment) it is just a hassle to maintain a duplicate here. Closes: https://bugs.gentoo.org/942033 Signed-off-by: Ionen Wolkens gentoo.org> eclass/qmake-utils.eclass | 158 ---------------------------------------------- 1 file changed, 158 deletions(-) diff --git a/eclass/qmake-utils.eclass b/eclass/qmake-utils.eclass deleted file mode 100644 index 88755ab7..00000000 --- a/eclass/qmake-utils.eclass +++ /dev/null @@ -1,158 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -# @ECLASS: qmake-utils.eclass -# @MAINTAINER: -# qt@gentoo.org -# @AUTHOR: -# Davide Pesavento -# @SUPPORTED_EAPIS: 7 8 -# @BLURB: Common functions for qmake-based packages. -# @DESCRIPTION: -# Utility eclass providing wrapper functions for Qt qmake. -# -# This eclass does not set any metadata variables nor export any phase -# functions. It can be inherited safely. - -case ${EAPI} in - 7|8) ;; - *) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;; -esac - -if [[ -z ${_QMAKE_UTILS_ECLASS} ]]; then -_QMAKE_UTILS_ECLASS=1 - -inherit toolchain-funcs - -# @FUNCTION: qt5_get_bindir -# @DESCRIPTION: -# Echoes the directory where Qt5 binaries are installed. -# EPREFIX is already prepended to the returned path. -qt5_get_bindir() { - echo ${EPREFIX}$(qt5_get_libdir)/qt5/bin -} - -# @FUNCTION: qt5_get_headerdir -# @DESCRIPTION: -# Echoes the directory where Qt5 headers are installed. -qt5_get_headerdir() { - echo /usr/include/qt5 -} - -# @FUNCTION: qt5_get_libdir -# @DESCRIPTION: -# Echoes the directory where Qt5 libraries are installed. -qt5_get_libdir() { - echo /usr/$(get_libdir) -} - -# @FUNCTION: qt5_get_mkspecsdir -# @DESCRIPTION: -# Echoes the directory where Qt5 mkspecs are installed. -qt5_get_mkspecsdir() { - echo $(qt5_get_libdir)/qt5/mkspecs -} - -# @FUNCTION: qt5_get_plugindir -# @DESCRIPTION: -# Echoes the directory where Qt5 plugins are installed. -qt5_get_plugindir() { - echo $(qt5_get_libdir)/qt5/plugins -} - -# @FUNCTION: qt5_get_qmake_args -# @DESCRIPTION: -# 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_CFLAGS_RELEASE_WITH_DEBUGINFO= - QMAKE_CXXFLAGS="${CXXFLAGS}" - QMAKE_CXXFLAGS_RELEASE= - QMAKE_CXXFLAGS_DEBUG= - QMAKE_CXXFLAGS_RELEASE_WITH_DEBUGINFO= - QMAKE_LFLAGS="${LDFLAGS}" - QMAKE_LFLAGS_RELEASE= - QMAKE_LFLAGS_DEBUG= - QMAKE_LFLAGS_RELEASE_WITH_DEBUGINFO= - EOF -} - -# @FUNCTION: eqmake5 -# @USAGE: [arguments for qmake] -# @DESCRIPTION: -# Wrapper for Qt5's qmake. All arguments are passed to qmake. -# -# For recursive build systems, i.e. those based on the subdirs template, -# you should run eqmake5 on the top-level project file only, unless you -# have a valid reason to do otherwise. During the building, qmake will -# be automatically re-invoked with the right arguments on every directory -# specified inside the top-level project file. -eqmake5() { - debug-print-function ${FUNCNAME} "$@" - - ebegin "Running qmake" - - local -a args - mapfile -t args <<<"$(qt5_get_qmake_args)" - # NB: we're passing literal quotes in but qmake doesn't seem to mind - "$(qt5_get_bindir)"/qmake -makefile "${args[@]}" "$@" - - if ! eend $? ; then - echo - eerror "Running qmake has failed! (see above for details)" - eerror "This shouldn't happen - please send a bug report to https://bugs.gentoo.org/" - echo - die "eqmake5 failed" - 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