From 0fa2a867cc1298a4c0cd3babab783072d2f6e102 Mon Sep 17 00:00:00 2001 From: Mike Frysinger Date: Thu, 18 Nov 2021 02:55:40 -0500 Subject: [PATCH] app-emulation/hercules: do not delete libtool module .la files #720342 Since hercules uses libltdl to load its internal modules, we need to leave the .la files in place for it to process. Also add subslot linkage to these libs while we're updating. Bug: https://bugs.gentoo.org/252716 Closes: https://bugs.gentoo.org/720342 Signed-off-by: Mike Frysinger --- ...{hercules-3.13.ebuild => hercules-3.13-r1.ebuild} | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) rename app-emulation/hercules/{hercules-3.13.ebuild => hercules-3.13-r1.ebuild} (88%) diff --git a/app-emulation/hercules/hercules-3.13.ebuild b/app-emulation/hercules/hercules-3.13-r1.ebuild similarity index 88% rename from app-emulation/hercules/hercules-3.13.ebuild rename to app-emulation/hercules/hercules-3.13-r1.ebuild index e128b5c5332e9..f068c94f7e2f2 100644 --- a/app-emulation/hercules/hercules-3.13.ebuild +++ b/app-emulation/hercules/hercules-3.13-r1.ebuild @@ -1,7 +1,7 @@ # Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI="7" inherit autotools flag-o-matic @@ -15,10 +15,10 @@ KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86 ~x64-macos" IUSE="bzip2 custom-cflags +suid" RDEPEND=" - dev-libs/libltdl + dev-libs/libltdl:= net-libs/libnsl:0= - sys-libs/zlib - bzip2? ( app-arch/bzip2 )" + sys-libs/zlib:= + bzip2? ( app-arch/bzip2:= )" DEPEND="${RDEPEND}" PATCHES=( @@ -61,6 +61,6 @@ src_install() { insinto /usr/share/hercules doins hercules.cnf - # no static archives - find "${D}" -name '*.la' -delete || die + # No static archives. Have to leave .la files for modules. #720342 + rm "${ED}/usr/$(get_libdir)/"*.la || die }