[gentoo-commits] repo/gentoo:master commit in: net-libs/libssh/

["Sam James" <sam@gentoo.org>]

commit:     3feebf96ee8ee9375f291bf2d9c128c1fa758052
Author:     Cristian Othón Martínez Vera <cfuga <AT> cfuga <DOT> mx>
AuthorDate: Mon Jun 27 19:23:26 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> 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 <AT> cfuga.mx>
Bug: https://bugs.gentoo.org/836705
Signed-off-by: Sam James <sam <AT> 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() {