From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1523616-garchives=archives.gentoo.org@lists.gentoo.org>
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 7529915806E
for <garchives@archives.gentoo.org>; Wed, 31 May 2023 03:34:15 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id 8E8AAE0A6B;
Wed, 31 May 2023 03:34: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) server-digest SHA256)
(No client certificate requested)
by pigeon.gentoo.org (Postfix) with ESMTPS id 6FFCEE0A6B
for <gentoo-commits@lists.gentoo.org>; Wed, 31 May 2023 03:34: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) server-digest SHA256)
(No client certificate requested)
by smtp.gentoo.org (Postfix) with ESMTPS id 6B8AA340F83
for <gentoo-commits@lists.gentoo.org>; Wed, 31 May 2023 03:34:13 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id BDD72990
for <gentoo-commits@lists.gentoo.org>; Wed, 31 May 2023 03:34:11 +0000 (UTC)
From: "Sam James" <sam@gentoo.org>
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" <sam@gentoo.org>
Message-ID: <1685504020.8d5428f7bbd5dc4fe9e8cb36c9383a86adbb96a0.sam@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: net-libs/libssh2/
X-VCS-Repository: repo/gentoo
X-VCS-Files: net-libs/libssh2/libssh2-1.11.0.ebuild net-libs/libssh2/libssh2-9999.ebuild
X-VCS-Directories: net-libs/libssh2/
X-VCS-Committer: sam
X-VCS-Committer-Name: Sam James
X-VCS-Revision: 8d5428f7bbd5dc4fe9e8cb36c9383a86adbb96a0
X-VCS-Branch: master
Date: Wed, 31 May 2023 03:34:11 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply
X-Archives-Salt: 6f3efa86-67c7-4d9f-9871-24702f2dcecf
X-Archives-Hash: fff0003691c8c82d63916d16aeceb48d
commit: 8d5428f7bbd5dc4fe9e8cb36c9383a86adbb96a0
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Wed May 31 03:33:40 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed May 31 03:33:40 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8d5428f7
net-libs/libssh2: conditionally set test options
Closes: https://bugs.gentoo.org/907443
Signed-off-by: Sam James <sam <AT> gentoo.org>
net-libs/libssh2/libssh2-1.11.0.ebuild | 11 +++++++++--
net-libs/libssh2/libssh2-9999.ebuild | 12 +++++++++++-
2 files changed, 20 insertions(+), 3 deletions(-)
diff --git a/net-libs/libssh2/libssh2-1.11.0.ebuild b/net-libs/libssh2/libssh2-1.11.0.ebuild
index 2f60c46c3928..30a399914f72 100644
--- a/net-libs/libssh2/libssh2-1.11.0.ebuild
+++ b/net-libs/libssh2/libssh2-1.11.0.ebuild
@@ -47,9 +47,16 @@ multilib_src_configure() {
-DBUILD_TESTING=$(usex test)
-DCRYPTO_BACKEND=${crypto_backend}
-DENABLE_ZLIB_COMPRESSION=$(usex zlib)
- -DRUN_SSHD_TESTS=OFF
- -DRUN_DOCKER_TESTS=OFF
)
+
+ if use test ; then
+ # Pass separately to avoid unused var warnings w/ USE=-test
+ mycmakeargs+=(
+ -DRUN_SSHD_TESTS=OFF
+ -DRUN_DOCKER_TESTS=OFF
+ )
+ fi
+
cmake_src_configure
}
diff --git a/net-libs/libssh2/libssh2-9999.ebuild b/net-libs/libssh2/libssh2-9999.ebuild
index 290d28ce2558..8a5ad181cafd 100644
--- a/net-libs/libssh2/libssh2-9999.ebuild
+++ b/net-libs/libssh2/libssh2-9999.ebuild
@@ -48,10 +48,20 @@ multilib_src_configure() {
-DRUN_SSHD_TESTS=OFF
-DRUN_DOCKER_TESTS=OFF
)
+
+ if use test ; then
+ # Pass separately to avoid unused var warnings w/ USE=-test
+ mycmakeargs+=(
+ -DRUN_SSHD_TESTS=OFF
+ -DRUN_DOCKER_TESTS=OFF
+ )
+ fi
+
+
cmake_src_configure
}
multilib_src_install_all() {
einstalldocs
- find "${ED}" -name '*.la' -delete || die
+ find "${ED}" -name '*.a' -delete || die
}