public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Mike Frysinger" <vapier@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: app-emulation/hercules/
Date: Thu, 18 Nov 2021 08:00:58 +0000 (UTC)	[thread overview]
Message-ID: <1637222387.0fa2a867cc1298a4c0cd3babab783072d2f6e102.vapier@gentoo> (raw)

commit:     0fa2a867cc1298a4c0cd3babab783072d2f6e102
Author:     Mike Frysinger <vapier <AT> gentoo <DOT> org>
AuthorDate: Thu Nov 18 07:55:40 2021 +0000
Commit:     Mike Frysinger <vapier <AT> gentoo <DOT> org>
CommitDate: Thu Nov 18 07:59:47 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0fa2a867

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 <vapier <AT> gentoo.org>

 .../{hercules-3.13.ebuild => hercules-3.13-r1.ebuild}        | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

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 e128b5c5332e..f068c94f7e2f 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
 }


             reply	other threads:[~2021-11-18  8:01 UTC|newest]

Thread overview: 12+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-11-18  8:00 Mike Frysinger [this message]
  -- strict thread matches above, loose matches on Subject: below --
2021-11-26 19:07 [gentoo-commits] repo/gentoo:master commit in: app-emulation/hercules/ Arthur Zamarin
2021-11-24  7:57 Agostino Sarubbo
2021-11-24  0:46 Sam James
2021-11-23 10:58 Jakov Smolić
2021-11-18  8:00 Mike Frysinger
2021-01-06 13:08 Fabian Groffen
2020-09-19 18:10 Sam James
2017-11-03 20:44 Andreas Hüttel
2016-12-12 19:09 Mike Frysinger
2016-12-12 19:09 Mike Frysinger
2016-12-12 16:27 Mike Frysinger

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=1637222387.0fa2a867cc1298a4c0cd3babab783072d2f6e102.vapier@gentoo \
    --to=vapier@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