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 9EDC6158087 for ; Tue, 9 Nov 2021 03:37:47 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 9C52F2BC00D; Tue, 9 Nov 2021 03:37:46 +0000 (UTC) Received: from smtp.gentoo.org (smtp.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 DA7862BC003 for ; Tue, 9 Nov 2021 03:37:45 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (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 807A0342D7C for ; Tue, 9 Nov 2021 03:37:44 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id BA5C51B8 for ; Tue, 9 Nov 2021 03:37:42 +0000 (UTC) From: "Michael Orlitzky" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Michael Orlitzky" Message-ID: <1636429041.0a4cdd3089d1152a58428ce7f4f8b9f710c0c4f4.mjo@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-libs/ntl/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-libs/ntl/ntl-11.4.4-r1.ebuild X-VCS-Directories: dev-libs/ntl/ X-VCS-Committer: mjo X-VCS-Committer-Name: Michael Orlitzky X-VCS-Revision: 0a4cdd3089d1152a58428ce7f4f8b9f710c0c4f4 X-VCS-Branch: master Date: Tue, 9 Nov 2021 03:37:42 +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: ae9385d3-873d-48cb-baff-41c7e49a1bbf X-Archives-Hash: 7893af96aaf8b0148c8b983ac2986f25 commit: 0a4cdd3089d1152a58428ce7f4f8b9f710c0c4f4 Author: Michael Orlitzky gentoo org> AuthorDate: Tue Nov 9 02:57:38 2021 +0000 Commit: Michael Orlitzky gentoo org> CommitDate: Tue Nov 9 03:37:21 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0a4cdd30 dev-libs/ntl: support LIBTOOL="slibtool-shared". When using slibtool-shared, no static archives (*.a) are created. To tolerate their absence, we add an "-f" to the "rm" that tries to remove them. Package-Manager: Portage-3.0.28, Repoman-3.0.3 Signed-off-by: Michael Orlitzky gentoo.org> dev-libs/ntl/ntl-11.4.4-r1.ebuild | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dev-libs/ntl/ntl-11.4.4-r1.ebuild b/dev-libs/ntl/ntl-11.4.4-r1.ebuild index 1b184a8a48c..05f9388f8c5 100644 --- a/dev-libs/ntl/ntl-11.4.4-r1.ebuild +++ b/dev-libs/ntl/ntl-11.4.4-r1.ebuild @@ -64,7 +64,10 @@ src_install() { if ! use static-libs; then # bug #775884 find "${ED}" -name '*.la' -delete || die - rm "${ED}/usr/$(get_libdir)"/libntl.a || die + + # Use rm -f because the static archive may not be created when + # using (for example) slibtool-shared. + rm -f "${ED}/usr/$(get_libdir)"/libntl.a || die fi rm -r "${ED}"/usr/share/doc/NTL || die