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.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 42FCD138334 for ; Sat, 21 Dec 2019 10:09:10 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 7EBEBE08C0; Sat, 21 Dec 2019 10:09:09 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 35BB0E08C0 for ; Sat, 21 Dec 2019 10:09:09 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id ECAAC34D51C for ; Sat, 21 Dec 2019 10:09:07 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id DC9BA778 for ; Sat, 21 Dec 2019 10:09:05 +0000 (UTC) From: "Andreas Sturmlechner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Sturmlechner" Message-ID: <1576922932.d1d4a96d4d91b121d6c60a4c85ae66cd3bc69699.asturm@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.3.ebuild net-libs/libssh/libssh-9999.ebuild X-VCS-Directories: net-libs/libssh/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: d1d4a96d4d91b121d6c60a4c85ae66cd3bc69699 X-VCS-Branch: master Date: Sat, 21 Dec 2019 10:09:05 +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: 9688664e-e358-4550-8029-3e53b8767fbb X-Archives-Hash: 014115fe1d31912b87113af2c922886f commit: d1d4a96d4d91b121d6c60a4c85ae66cd3bc69699 Author: Andreas Sturmlechner gentoo org> AuthorDate: Sat Dec 21 10:07:39 2019 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Sat Dec 21 10:08:52 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d1d4a96d 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 gentoo.org> net-libs/libssh/libssh-0.9.3.ebuild | 6 ++++-- 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 5361468d2fe..06898dc5da5 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 dc04b6aee9d..e86e51662ed 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