public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Lucio Sauer" <watermanpaint@posteo.net>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/proj/guru:master commit in: sys-fs/fsverity-utils/
Date: Thu,  1 Aug 2024 13:51:57 +0000 (UTC)	[thread overview]
Message-ID: <1722517245.6a9edcb8dea89f3b77d71e42583e19072701b3f1.watermanpaint@gentoo> (raw)
Message-ID: <20240801135157.-XZh03hmfWOuyugFgP4CkxfeLzyiPkfHZSuvJFEBhq0@z> (raw)

commit:     6a9edcb8dea89f3b77d71e42583e19072701b3f1
Author:     Lucio Sauer <watermanpaint <AT> posteo <DOT> net>
AuthorDate: Thu Aug  1 12:51:15 2024 +0000
Commit:     Lucio Sauer <watermanpaint <AT> posteo <DOT> net>
CommitDate: Thu Aug  1 13:00:45 2024 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=6a9edcb8

sys-fs/fsverity-utils: drop libfsverity.a (PG 0302)

No revdeps and not required by this package except for testing, when
USE_SHARED_LIB is set.  Export prefixed AR due to dependence on
libfsverity.a at test phase.

Bug: https://bugs.gentoo.org/937042
Signed-off-by: Lucio Sauer <watermanpaint <AT> posteo.net>

 sys-fs/fsverity-utils/fsverity-utils-1.6.ebuild | 22 +++++++++++++---------
 1 file changed, 13 insertions(+), 9 deletions(-)

diff --git a/sys-fs/fsverity-utils/fsverity-utils-1.6.ebuild b/sys-fs/fsverity-utils/fsverity-utils-1.6.ebuild
index d2a777437..cff9471d3 100644
--- a/sys-fs/fsverity-utils/fsverity-utils-1.6.ebuild
+++ b/sys-fs/fsverity-utils/fsverity-utils-1.6.ebuild
@@ -19,22 +19,26 @@ HOMEPAGE="https://git.kernel.org/pub/scm/fs/fsverity/fsverity-utils.git"
 LICENSE="MIT"
 SLOT="0"
 
-IUSE="static-libs"
-
 DEPEND="dev-libs/openssl:="
 
 RDEPEND="${DEPEND}"
 BDEPEND="virtual/pkgconfig"
 
+src_prepare() {
+	# bug comment 937042#c3
+	sed -e '/^DEFAULT_TARGETS += libfsverity.a/d' \
+		-e '/install -m644 libfsverity.a/d' \
+		-i Makefile || die
+	default
+}
+
 src_compile() {
-	emake CC="$(tc-getCC)" PKGCONF="$(tc-getPKG_CONFIG)"
+	export PKGCONF="$(tc-getPKG_CONFIG)" USE_SHARED_LIB=1
+	tc-export AR CC
+	default
 }
 
 src_install() {
-	emake install CC="$(tc-getCC)" PKGCONF="$(tc-getPKG_CONFIG)" DESTDIR="${D}" \
-		PREFIX="${EPREFIX}/usr" LIBDIR="${EPREFIX}/usr/$(get_libdir)"
-
-	if ! use static-libs ; then
-		rm "${ED}/usr/$(get_libdir)/libfsverity.a" || die
-	fi
+	emake install DESTDIR="${D}" PREFIX="${EPREFIX}/usr" \
+		LIBDIR="${EPREFIX}/usr/$(get_libdir)"
 }


             reply	other threads:[~2024-08-01 13:52 UTC|newest]

Thread overview: 9+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-08-01 13:09 Lucio Sauer [this message]
2024-08-01 13:51 ` [gentoo-commits] repo/proj/guru:master commit in: sys-fs/fsverity-utils/ Lucio Sauer
  -- strict thread matches above, loose matches on Subject: below --
2024-08-01 13:09 [gentoo-commits] repo/proj/guru:dev " Lucio Sauer
2024-08-01 13:09 Lucio Sauer
2024-07-31 23:23 Mark Harmstone
2024-07-31 23:01 Mark Harmstone
2024-07-31 19:31 Mark Harmstone
2024-07-31 12:54 Lucio Sauer
2024-07-31 11:51 Mark Harmstone

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=1722517245.6a9edcb8dea89f3b77d71e42583e19072701b3f1.watermanpaint@gentoo \
    --to=watermanpaint@posteo.net \
    --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