diff options
| author |   Andreas Sturmlechner <asturm@gentoo.org> | 2019-12-21 11:07:39 +0100 |
|---|---|---|
| committer | Andreas Sturmlechner <asturm@gentoo.org> | 2019-12-21 11:08:52 +0100 |
| commit | d1d4a96d4d91b121d6c60a4c85ae66cd3bc69699 (patch) | |
| tree | b14f97cde510b49f58f217db02bfc2918bbe817a /net-libs/libssh | |
| parent | profiles: Remove ancient mask for virtual/emacs-23 on solaris. (diff) | |
| download | gentoo-d1d4a96d4d91b121d6c60a4c85ae66cd3bc69699.tar.gz gentoo-d1d4a96d4d91b121d6c60a4c85ae66cd3bc69699.tar.bz2 gentoo-d1d4a96d4d91b121d6c60a4c85ae66cd3bc69699.zip | |
net-libs/libssh: Fix USE static-libs, drop obsolete test condition
Closes: https://bugs.gentoo.org/703400
Package-Manager: Portage-2.3.82, Repoman-2.3.20
Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
Diffstat (limited to 'net-libs/libssh')
| -rw-r--r-- | net-libs/libssh/libssh-0.9.3.ebuild | 6 | ||||
| -rw-r--r-- | net-libs/libssh/libssh-9999.ebuild | 6 |
2 files changed, 8 insertions, 4 deletions
diff --git a/net-libs/libssh/libssh-0.9.3.ebuild b/net-libs/libssh/libssh-0.9.3.ebuild index 5361468d2fe6..06898dc5da51 100644 --- a/net-libs/libssh/libssh-0.9.3.ebuild +++ b/net-libs/libssh/libssh-0.9.3.ebuild @@ -21,7 +21,7 @@ SLOT="0/4" # subslot = soname major version IUSE="debug doc examples gcrypt gssapi libressl mbedtls pcap server +sftp static-libs test zlib" # Maintainer: check IUSE-defaults at DefineOptions.cmake -REQUIRED_USE="?? ( gcrypt mbedtls ) test? ( static-libs )" +REQUIRED_USE="?? ( gcrypt mbedtls )" BDEPEND=" doc? ( app-doc/doxygen[dot] ) @@ -81,7 +81,7 @@ multilib_src_configure() { -DWITH_PCAP="$(usex pcap)" -DWITH_SERVER="$(usex server)" -DWITH_SFTP="$(usex sftp)" - -DBUILD_SHARED_LIBS="$(usex !static-libs)" + -DBUILD_STATIC_LIB="$(usex static-libs)" -DUNIT_TESTING="$(usex test)" -DWITH_ZLIB="$(usex zlib)" ) @@ -100,6 +100,8 @@ multilib_src_install() { cmake-utils_src_install multilib_is_native_abi && use doc && HTML_DOCS=( "${BUILD_DIR}"/doc/html/. ) + use static-libs && dolib.a src/libssh.a + # compatibility symlink until all consumers have been updated # to no longer use libssh_threads.so dosym libssh.so /usr/$(get_libdir)/libssh_threads.so diff --git a/net-libs/libssh/libssh-9999.ebuild b/net-libs/libssh/libssh-9999.ebuild index dc04b6aee9da..e86e51662ed2 100644 --- a/net-libs/libssh/libssh-9999.ebuild +++ b/net-libs/libssh/libssh-9999.ebuild @@ -21,7 +21,7 @@ SLOT="0/4" # subslot = soname major version IUSE="debug doc examples gcrypt gssapi libressl mbedtls pcap server +sftp static-libs test zlib" # Maintainer: check IUSE-defaults at DefineOptions.cmake -REQUIRED_USE="?? ( gcrypt mbedtls ) test? ( static-libs )" +REQUIRED_USE="?? ( gcrypt mbedtls )" BDEPEND=" doc? ( app-doc/doxygen[dot] ) @@ -81,7 +81,7 @@ multilib_src_configure() { -DWITH_PCAP="$(usex pcap)" -DWITH_SERVER="$(usex server)" -DWITH_SFTP="$(usex sftp)" - -DBUILD_SHARED_LIBS="$(usex !static-libs)" + -DBUILD_STATIC_LIB="$(usex static-libs)" -DUNIT_TESTING="$(usex test)" -DWITH_ZLIB="$(usex zlib)" ) @@ -100,6 +100,8 @@ multilib_src_install() { cmake-utils_src_install multilib_is_native_abi && use doc && HTML_DOCS=( "${BUILD_DIR}"/doc/html/. ) + use static-libs && dolib.a src/libssh.a + # compatibility symlink until all consumers have been updated # to no longer use libssh_threads.so dosym libssh.so /usr/$(get_libdir)/libssh_threads.so |