public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Joonas Niilola" <juippis@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-libs/libstrophe/
Date: Sun, 24 Apr 2022 07:24:09 +0000 (UTC)	[thread overview]
Message-ID: <1650785045.6071394425dbb0327b53e6188747249daa2f4786.juippis@gentoo> (raw)

commit:     6071394425dbb0327b53e6188747249daa2f4786
Author:     Adrian Schollmeyer <nex+b-g-o <AT> nexadn <DOT> de>
AuthorDate: Fri Apr 22 12:31:10 2022 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Sun Apr 24 07:24:05 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=60713944

dev-libs/libstrophe: Fix deletion of *.la files

The previous find call didn't delete *.la files, although they were
specified in the find call. This commit fixes this by inserting
parentheses. To further make the call robust, this commit also inserts
the -type f argument.

Signed-off-by: Adrian Schollmeyer <nex+b-g-o <AT> nexadn.de>
Closes: https://github.com/gentoo/gentoo/pull/25156
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>

 dev-libs/libstrophe/libstrophe-0.10.0.ebuild | 2 +-
 dev-libs/libstrophe/libstrophe-0.11.0.ebuild | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/dev-libs/libstrophe/libstrophe-0.10.0.ebuild b/dev-libs/libstrophe/libstrophe-0.10.0.ebuild
index 65e5bcfda6b4..d3f341dcdf59 100644
--- a/dev-libs/libstrophe/libstrophe-0.10.0.ebuild
+++ b/dev-libs/libstrophe/libstrophe-0.10.0.ebuild
@@ -41,7 +41,7 @@ src_compile() {
 src_install() {
 	default
 	use doc && dodoc -r examples
-	find "${D}" -name '*.la' -o -name '*.a' -delete || die
+	find "${D}" -type f \( -name '*.la' -o -name '*.a' \) -delete || die
 }
 
 # Explicit src_test is there to document that the test suite is integrated and

diff --git a/dev-libs/libstrophe/libstrophe-0.11.0.ebuild b/dev-libs/libstrophe/libstrophe-0.11.0.ebuild
index ad3d05309f8b..12a6e1084f43 100644
--- a/dev-libs/libstrophe/libstrophe-0.11.0.ebuild
+++ b/dev-libs/libstrophe/libstrophe-0.11.0.ebuild
@@ -44,7 +44,7 @@ src_compile() {
 src_install() {
 	default
 	use doc && dodoc -r examples
-	find "${D}" -name '*.la' -o -name '*.a' -delete || die
+	find "${D}" -type f \( -name '*.la' -o -name '*.a' \) -delete || die
 }
 
 # Explicit src_test is there to document that the test suite is integrated and


             reply	other threads:[~2022-04-24  7:24 UTC|newest]

Thread overview: 41+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-04-24  7:24 Joonas Niilola [this message]
  -- strict thread matches above, loose matches on Subject: below --
2025-05-21 21:15 [gentoo-commits] repo/gentoo:master commit in: dev-libs/libstrophe/ Sam James
2025-05-11 15:33 Sam James
2025-01-15 20:18 Sam James
2025-01-15 20:18 Sam James
2024-03-24 16:28 Sam James
2024-03-20 15:26 Sam James
2024-02-19 10:54 Florian Schmaus
2023-09-15  6:58 Sam James
2023-09-14  2:10 Sam James
2023-08-17 13:07 Florian Schmaus
2023-08-17 12:35 Florian Schmaus
2023-05-02 22:53 Sam James
2023-04-25 22:16 Sam James
2022-11-06 11:07 Florian Schmaus
2022-11-06 11:07 Florian Schmaus
2022-11-06 11:07 Florian Schmaus
2022-09-11 19:17 Jakov Smolić
2022-08-10  8:33 Florian Schmaus
2022-08-10  8:33 Florian Schmaus
2022-08-10  7:23 Joonas Niilola
2022-07-09 10:44 Florian Schmaus
2022-06-29  7:11 Florian Schmaus
2022-06-28  7:47 Joonas Niilola
2022-05-13  8:06 Florian Schmaus
2022-05-13  8:06 Florian Schmaus
2022-04-24  7:24 Joonas Niilola
2022-04-24  7:24 Joonas Niilola
2022-04-24  7:24 Joonas Niilola
2022-04-17 19:00 Sam James
2022-04-13 14:46 Sam James
2022-04-12 21:04 Sam James
2021-11-12 22:51 Andrey Utkin
2021-11-12 22:51 Andrey Utkin
2021-05-02 15:38 Mikle Kolyada
2020-12-29 12:53 Andrey Utkin
2020-10-12 10:21 Agostino Sarubbo
2020-09-30  6:49 Andrey Utkin
2020-09-21 14:44 Andrey Utkin
2020-09-21 13:53 Andrey Utkin
2019-10-28 19:03 Andrey Utkin

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1650785045.6071394425dbb0327b53e6188747249daa2f4786.juippis@gentoo \
    --to=juippis@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox