Gentoo Archives: gentoo-commits

From: Mike Gilbert <floppym@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: sys-libs/zlib/
Date: Thu, 07 Oct 2021 14:49:44
Message-Id: 1633618133.f15136a2f35d977155da3f9e01fdf5678fea5408.floppym@gentoo
1 commit: f15136a2f35d977155da3f9e01fdf5678fea5408
2 Author: Mike Gilbert <floppym <AT> gentoo <DOT> org>
3 AuthorDate: Thu Oct 7 14:48:53 2021 +0000
4 Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org>
5 CommitDate: Thu Oct 7 14:48:53 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f15136a2
7
8 sys-libs/zlib: fix install with slibtool
9
10 Closes: https://bugs.gentoo.org/816756
11 Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org>
12
13 sys-libs/zlib/zlib-1.2.11-r4.ebuild | 4 +++-
14 1 file changed, 3 insertions(+), 1 deletion(-)
15
16 diff --git a/sys-libs/zlib/zlib-1.2.11-r4.ebuild b/sys-libs/zlib/zlib-1.2.11-r4.ebuild
17 index 6af7187084d..bc2fe9834ee 100644
18 --- a/sys-libs/zlib/zlib-1.2.11-r4.ebuild
19 +++ b/sys-libs/zlib/zlib-1.2.11-r4.ebuild
20 @@ -150,7 +150,9 @@ multilib_src_install() {
21 fi
22
23 if use minizip; then
24 - rm "${ED}"/usr/$(get_libdir)/libminizip.la || die
25 + # This might not exist if slibtool is used.
26 + # https://bugs.gentoo.org/816756
27 + rm -f "${ED}"/usr/$(get_libdir)/libminizip.la || die
28 fi
29
30 if ! use static-libs ; then