| 1 |
commit: 3feebf96ee8ee9375f291bf2d9c128c1fa758052 |
| 2 |
Author: Cristian Othón Martínez Vera <cfuga <AT> cfuga <DOT> mx> |
| 3 |
AuthorDate: Mon Jun 27 19:23:26 2022 +0000 |
| 4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Jun 27 23:03:08 2022 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3feebf96 |
| 7 |
|
| 8 |
net-libs/libssh: fix musl build with USE="test" |
| 9 |
|
| 10 |
* add sys-libs/argp-standalone as dependency |
| 11 |
* force cmake to lookup for the argp library |
| 12 |
|
| 13 |
Signed-off-by: Cristian Othón Martínez Vera <cfuga <AT> cfuga.mx> |
| 14 |
Bug: https://bugs.gentoo.org/836705 |
| 15 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
| 16 |
|
| 17 |
net-libs/libssh/libssh-0.9.6.ebuild | 9 ++++++++- |
| 18 |
net-libs/libssh/libssh-9999.ebuild | 11 +++++++++-- |
| 19 |
2 files changed, 17 insertions(+), 3 deletions(-) |
| 20 |
|
| 21 |
diff --git a/net-libs/libssh/libssh-0.9.6.ebuild b/net-libs/libssh/libssh-0.9.6.ebuild |
| 22 |
index 5bfd45be2d12..5283a50c1f61 100644 |
| 23 |
--- a/net-libs/libssh/libssh-0.9.6.ebuild |
| 24 |
+++ b/net-libs/libssh/libssh-0.9.6.ebuild |
| 25 |
@@ -39,7 +39,9 @@ RDEPEND=" |
| 26 |
zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] ) |
| 27 |
" |
| 28 |
DEPEND="${RDEPEND} |
| 29 |
- test? ( >=dev-util/cmocka-0.3.1[${MULTILIB_USEDEP}] ) |
| 30 |
+ test? ( |
| 31 |
+ >=dev-util/cmocka-0.3.1[${MULTILIB_USEDEP}] |
| 32 |
+ elibc_musl? ( sys-libs/argp-standalone ) ) |
| 33 |
" |
| 34 |
|
| 35 |
DOCS=( AUTHORS README ChangeLog ) |
| 36 |
@@ -66,6 +68,11 @@ src_prepare() { |
| 37 |
|
| 38 |
sed -e "/^check_include_file.*HAVE_VALGRIND_VALGRIND_H/s/^/#DONT /" \ |
| 39 |
-i ConfigureChecks.cmake || die |
| 40 |
+ |
| 41 |
+ if use test && use elibc_musl; then |
| 42 |
+ sed -e "/SOLARIS/d" \ |
| 43 |
+ -i tests/CMakeLists.txt || die |
| 44 |
+ fi |
| 45 |
} |
| 46 |
|
| 47 |
multilib_src_configure() { |
| 48 |
|
| 49 |
diff --git a/net-libs/libssh/libssh-9999.ebuild b/net-libs/libssh/libssh-9999.ebuild |
| 50 |
index 2801869f419f..7b1299b71476 100644 |
| 51 |
--- a/net-libs/libssh/libssh-9999.ebuild |
| 52 |
+++ b/net-libs/libssh/libssh-9999.ebuild |
| 53 |
@@ -14,7 +14,7 @@ if [[ "${PV}" == *9999 ]] ; then |
| 54 |
EGIT_REPO_URI="https://git.libssh.org/projects/libssh.git" |
| 55 |
else |
| 56 |
SRC_URI="https://www.libssh.org/files/$(ver_cut 1-2)/${P}.tar.xz" |
| 57 |
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux" |
| 58 |
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux" |
| 59 |
fi |
| 60 |
|
| 61 |
LICENSE="LGPL-2.1" |
| 62 |
@@ -39,7 +39,9 @@ RDEPEND=" |
| 63 |
zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] ) |
| 64 |
" |
| 65 |
DEPEND="${RDEPEND} |
| 66 |
- test? ( >=dev-util/cmocka-0.3.1[${MULTILIB_USEDEP}] ) |
| 67 |
+ test? ( |
| 68 |
+ >=dev-util/cmocka-0.3.1[${MULTILIB_USEDEP}] |
| 69 |
+ elibc_musl? ( sys-libs/argp-standalone ) ) |
| 70 |
" |
| 71 |
|
| 72 |
DOCS=( AUTHORS README ChangeLog ) |
| 73 |
@@ -66,6 +68,11 @@ src_prepare() { |
| 74 |
|
| 75 |
sed -e "/^check_include_file.*HAVE_VALGRIND_VALGRIND_H/s/^/#DONT /" \ |
| 76 |
-i ConfigureChecks.cmake || die |
| 77 |
+ |
| 78 |
+ if use test && use elibc_musl; then |
| 79 |
+ sed -e "/SOLARIS/d" \ |
| 80 |
+ -i tests/CMakeLists.txt || die |
| 81 |
+ fi |
| 82 |
} |
| 83 |
|
| 84 |
multilib_src_configure() { |
Archives