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) server-digest SHA256) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id E032A158094 for ; Mon, 27 Jun 2022 23:11:10 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id CE413E0C44; Mon, 27 Jun 2022 23:11:09 +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) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id ABF34E0C44 for ; Mon, 27 Jun 2022 23:11:09 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (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 AE54E3412E8 for ; Mon, 27 Jun 2022 23:11:08 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id F37154ED for ; Mon, 27 Jun 2022 23:11:06 +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: <1656370988.3feebf96ee8ee9375f291bf2d9c128c1fa758052.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-libs/libssh/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-libs/libssh/libssh-0.9.6.ebuild net-libs/libssh/libssh-9999.ebuild X-VCS-Directories: net-libs/libssh/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 3feebf96ee8ee9375f291bf2d9c128c1fa758052 X-VCS-Branch: master Date: Mon, 27 Jun 2022 23:11:06 +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: 879f5d47-1753-4151-8245-c2273d0bfe35 X-Archives-Hash: 4887a160d69ff69d3ae269a919810341 commit: 3feebf96ee8ee9375f291bf2d9c128c1fa758052 Author: Cristian Othón Martínez Vera cfuga mx> AuthorDate: Mon Jun 27 19:23:26 2022 +0000 Commit: Sam James gentoo org> CommitDate: Mon Jun 27 23:03:08 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3feebf96 net-libs/libssh: fix musl build with USE="test" * add sys-libs/argp-standalone as dependency * force cmake to lookup for the argp library Signed-off-by: Cristian Othón Martínez Vera cfuga.mx> Bug: https://bugs.gentoo.org/836705 Signed-off-by: Sam James gentoo.org> net-libs/libssh/libssh-0.9.6.ebuild | 9 ++++++++- net-libs/libssh/libssh-9999.ebuild | 11 +++++++++-- 2 files changed, 17 insertions(+), 3 deletions(-) diff --git a/net-libs/libssh/libssh-0.9.6.ebuild b/net-libs/libssh/libssh-0.9.6.ebuild index 5bfd45be2d12..5283a50c1f61 100644 --- a/net-libs/libssh/libssh-0.9.6.ebuild +++ b/net-libs/libssh/libssh-0.9.6.ebuild @@ -39,7 +39,9 @@ RDEPEND=" zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] ) " DEPEND="${RDEPEND} - test? ( >=dev-util/cmocka-0.3.1[${MULTILIB_USEDEP}] ) + test? ( + >=dev-util/cmocka-0.3.1[${MULTILIB_USEDEP}] + elibc_musl? ( sys-libs/argp-standalone ) ) " DOCS=( AUTHORS README ChangeLog ) @@ -66,6 +68,11 @@ src_prepare() { sed -e "/^check_include_file.*HAVE_VALGRIND_VALGRIND_H/s/^/#DONT /" \ -i ConfigureChecks.cmake || die + + if use test && use elibc_musl; then + sed -e "/SOLARIS/d" \ + -i tests/CMakeLists.txt || die + fi } multilib_src_configure() { diff --git a/net-libs/libssh/libssh-9999.ebuild b/net-libs/libssh/libssh-9999.ebuild index 2801869f419f..7b1299b71476 100644 --- a/net-libs/libssh/libssh-9999.ebuild +++ b/net-libs/libssh/libssh-9999.ebuild @@ -14,7 +14,7 @@ if [[ "${PV}" == *9999 ]] ; then EGIT_REPO_URI="https://git.libssh.org/projects/libssh.git" else SRC_URI="https://www.libssh.org/files/$(ver_cut 1-2)/${P}.tar.xz" - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux" fi LICENSE="LGPL-2.1" @@ -39,7 +39,9 @@ RDEPEND=" zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] ) " DEPEND="${RDEPEND} - test? ( >=dev-util/cmocka-0.3.1[${MULTILIB_USEDEP}] ) + test? ( + >=dev-util/cmocka-0.3.1[${MULTILIB_USEDEP}] + elibc_musl? ( sys-libs/argp-standalone ) ) " DOCS=( AUTHORS README ChangeLog ) @@ -66,6 +68,11 @@ src_prepare() { sed -e "/^check_include_file.*HAVE_VALGRIND_VALGRIND_H/s/^/#DONT /" \ -i ConfigureChecks.cmake || die + + if use test && use elibc_musl; then + sed -e "/SOLARIS/d" \ + -i tests/CMakeLists.txt || die + fi } multilib_src_configure() {