diff options
| author |   Mike Gilbert <floppym@gentoo.org> | 2021-10-01 14:38:29 -0400 |
|---|---|---|
| committer | Mike Gilbert <floppym@gentoo.org> | 2021-10-01 15:41:12 -0400 |
| commit | f8fdcbb7421355945fc895231fa3da30645ef81b (patch) | |
| tree | 9948da5fc2bc03a3b00ca87544d9b3886abc4810 | |
| parent | dev-ml/ounit2: build with ocaml-4.12 (diff) | |
| download | gentoo-f8fdcbb7.tar.gz gentoo-f8fdcbb7.tar.bz2 gentoo-f8fdcbb7.zip | |
sys-libs/zlib: fix .a and .la removal logic
minizip uses automake/libtool, and its static lib is disabled at
configure time. We just need to remove the .la file.
libz uses a homegrown Makefile, and we need to remove libz.a after
installation. There is no .la file.
Signed-off-by: Mike Gilbert <floppym@gentoo.org>
| -rw-r--r-- | sys-libs/zlib/zlib-1.2.11-r4.ebuild | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/sys-libs/zlib/zlib-1.2.11-r4.ebuild b/sys-libs/zlib/zlib-1.2.11-r4.ebuild index 5dfe56381a95..6af7187084da 100644 --- a/sys-libs/zlib/zlib-1.2.11-r4.ebuild +++ b/sys-libs/zlib/zlib-1.2.11-r4.ebuild @@ -149,8 +149,13 @@ multilib_src_install() { sed_macros "${ED}"/usr/include/minizip/*.h fi + if use minizip; then + rm "${ED}"/usr/$(get_libdir)/libminizip.la || die + fi + if ! use static-libs ; then - rm -f "${ED}"/usr/$(get_libdir)/lib{z,minizip}.{a,la} || die #419645 + # https://bugs.gentoo.org/419645 + rm "${ED}"/usr/$(get_libdir)/libz.a || die fi } |