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 8A731158015 for ; Mon, 18 Dec 2023 03:54:16 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id A7FA72BC02C; Mon, 18 Dec 2023 03:54:14 +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)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 854E12BC02C for ; Mon, 18 Dec 2023 03:54:14 +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 8E01A33E3A9 for ; Mon, 18 Dec 2023 03:54:13 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 98E4214AA for ; Mon, 18 Dec 2023 03:54:10 +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: <1702871604.f83ba8a5a579ebfe1ee01f894f3d56443cce4986.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-print/cups/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-print/cups/cups-2.4.7-r2.ebuild X-VCS-Directories: net-print/cups/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: f83ba8a5a579ebfe1ee01f894f3d56443cce4986 X-VCS-Branch: master Date: Mon, 18 Dec 2023 03:54:10 +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: c53221f6-f276-4862-88ed-08a561b446e9 X-Archives-Hash: 25ff63b827bada6ec655958732ad71c9 commit: f83ba8a5a579ebfe1ee01f894f3d56443cce4986 Author: Eli Schwartz gmail com> AuthorDate: Sun Nov 12 20:21:08 2023 +0000 Commit: Sam James gentoo org> CommitDate: Mon Dec 18 03:53:24 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f83ba8a5 net-print/cups: avoid running unittests in src_compile If USE=test, an option was passed to configure that makes unittest binaries be built, and as a side effect also runs them. But we really do not want to run tests in src_compile, as FEATURES=test might not be set. Crudely hack around this by overriding the autoconf variable that would normally be set by `$(use_enable test unit-tests)`, when running the test invocation itself. As a side effect, this also moves the test-program compilation to src_test. Signed-off-by: Eli Schwartz gmail.com> Signed-off-by: Sam James gentoo.org> net-print/cups/cups-2.4.7-r2.ebuild | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/net-print/cups/cups-2.4.7-r2.ebuild b/net-print/cups/cups-2.4.7-r2.ebuild index 3f63cd43a70c..d8a193a64337 100644 --- a/net-print/cups/cups-2.4.7-r2.ebuild +++ b/net-print/cups/cups-2.4.7-r2.ebuild @@ -30,8 +30,6 @@ LICENSE="Apache-2.0" SLOT="0" IUSE="acl dbus debug kerberos openssl pam selinux static-libs systemd test usb X xinetd zeroconf" -# As of 2.4.2, they don't actually seem to be interactive (they pass some flags -# by default to input for us), but they fail on some greyscale issue w/ poppler? RESTRICT="!test? ( test )" BDEPEND=" @@ -167,7 +165,6 @@ multilib_src_configure() { $(use_enable kerberos gssapi) $(multilib_native_use_enable pam) $(use_enable static-libs static) - $(use_enable test unit-tests) --with-tls=$(usex openssl openssl gnutls) $(use_with systemd ondemand systemd) $(multilib_native_use_enable usb libusb) @@ -222,7 +219,12 @@ multilib_src_test() { mkdir "${T}"/cups-tests || die # We only build some of CUPS for multilib, so can't run the tests. - multilib_is_native_abi && default + if multilib_is_native_abi; then + # avoid building *and running* test binaries in src_compile + # https://github.com/OpenPrinting/cups/commit/b1d42061e9286f50eefc851ed906d17c6e80c4b0 + emake UNITTESTS=unittests + default + fi } multilib_src_install() {