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 77562158016 for ; Sun, 17 Dec 2023 12:04:46 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id D4E6F2BC061; Sun, 17 Dec 2023 12:04:39 +0000 (UTC) Received: from smtp.gentoo.org (dev.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 BF34F2BC061 for ; Sun, 17 Dec 2023 12:04:39 +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 0CAA4342FF8 for ; Sun, 17 Dec 2023 12:04:39 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id F36F2B85 for ; Sun, 17 Dec 2023 12:04:35 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1702814670.558bd85599f1bb0956529e1a734ba863b84aec2a.sam@gentoo> Subject: [gentoo-commits] proj/kde:master commit in: net-libs/signond/ X-VCS-Repository: proj/kde X-VCS-Files: net-libs/signond/signond-9999.ebuild X-VCS-Directories: net-libs/signond/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 558bd85599f1bb0956529e1a734ba863b84aec2a X-VCS-Branch: master Date: Sun, 17 Dec 2023 12:04:35 +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: 9d5d3e39-dc0d-4d48-a38a-b494345c8424 X-Archives-Hash: 3ca2e9014236ba14423d8d3df15a86b0 commit: 558bd85599f1bb0956529e1a734ba863b84aec2a Author: Sam James gentoo org> AuthorDate: Fri Dec 8 10:50:35 2023 +0000 Commit: Sam James gentoo org> CommitDate: Sun Dec 17 12:04:30 2023 +0000 URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=558bd855 net-libs/signond: fix multibuild The qt5/qt6 situation is complicated: https://gitlab.com/accounts-sso/signon-plugin-oauth2/-/merge_requests/28#note_1689621252 1) the library is coinstallable for qt5/qt6 2) signond (the daemon) must be built for only one Qt version, matching the Qt version of all consumer plugins. Signed-off-by: Sam James gentoo.org> net-libs/signond/signond-9999.ebuild | 21 +++++++++++++++++++-- 1 file changed, 19 insertions(+), 2 deletions(-) diff --git a/net-libs/signond/signond-9999.ebuild b/net-libs/signond/signond-9999.ebuild index 5982a22663..1a9d0d7290 100644 --- a/net-libs/signond/signond-9999.ebuild +++ b/net-libs/signond/signond-9999.ebuild @@ -20,7 +20,12 @@ HOMEPAGE="https://gitlab.com/accounts-sso" LICENSE="LGPL-2.1" SLOT="0" +# The qt5/qt6 situation is complicated: https://gitlab.com/accounts-sso/signon-plugin-oauth2/-/merge_requests/28#note_1689621252 +# 1) the library is coinstallable for qt5/qt6 +# 2) signond (the daemon) must be built for only one Qt version, matching the +# Qt version of all consumer plugins. IUSE="doc +qt5 qt6 test" +REQUIRED_USE="|| ( qt5 qt6 )" # tests are brittle; they all pass when stars align, bug 727666 RESTRICT="test !test? ( test )" @@ -90,10 +95,14 @@ src_prepare() { use test || sed -e '/^SUBDIRS/s/tests//' \ -i signon.pro || die "couldn't disable tests" + + multibuild_copy_sources } src_configure() { my_src_configure() { + cd "${BUILD_DIR}" || die + local myqmakeargs=( PREFIX="${EPREFIX}"/usr LIBDIR=$(get_libdir) @@ -110,9 +119,17 @@ src_configure() { } src_compile() { - multibuild_foreach_variant default + my_src_compile() { + emake -C "${BUILD_DIR}" + } + + multibuild_foreach_variant my_src_compile } src_install() { - multibuild_foreach_variant emake INSTALL_ROOT="${D}" install + my_src_install() { + emake -C "${BUILD_DIR}" INSTALL_ROOT="${D}" install + } + + multibuild_foreach_variant my_src_install }