From: "Sebastian Pipping" <sping@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: app-text/xmlstarlet/
Date: Sun, 31 Jan 2021 19:03:39 +0000 (UTC) [thread overview]
Message-ID: <1612119771.50b1b854dcc2c8edf99916c8acfc1610619adce3.sping@gentoo> (raw)
commit: 50b1b854dcc2c8edf99916c8acfc1610619adce3
Author: Sebastian Pipping <sping <AT> gentoo <DOT> org>
AuthorDate: Sun Jan 31 19:00:59 2021 +0000
Commit: Sebastian Pipping <sping <AT> gentoo <DOT> org>
CommitDate: Sun Jan 31 19:02:51 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=50b1b854
app-text/xmlstarlet: Fix linking for lld + profile 17.1 + amd64
Closes: https://bugs.gentoo.org/729600
Signed-off-by: Sebastian Pipping <sping <AT> gentoo.org>
Package-Manager: Portage-3.0.14, Repoman-3.0.2
app-text/xmlstarlet/xmlstarlet-1.6.1.ebuild | 18 ++++++++++++++++--
1 file changed, 16 insertions(+), 2 deletions(-)
diff --git a/app-text/xmlstarlet/xmlstarlet-1.6.1.ebuild b/app-text/xmlstarlet/xmlstarlet-1.6.1.ebuild
index c2ad4628c94..81ac6ed97cc 100644
--- a/app-text/xmlstarlet/xmlstarlet-1.6.1.ebuild
+++ b/app-text/xmlstarlet/xmlstarlet-1.6.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
-inherit flag-o-matic toolchain-funcs
+inherit autotools multilib flag-o-matic toolchain-funcs
DESCRIPTION="A set of tools to transform, query, validate, and edit XML documents"
HOMEPAGE="http://xmlstar.sourceforge.net/"
@@ -21,6 +21,20 @@ RDEPEND="
DEPEND="${RDEPEND}"
BDEPEND="virtual/pkgconfig"
+src_prepare() {
+ eapply_user
+
+ # We need to patch use of /usr/lib because it is a problem with
+ # linker lld with profile 17.1 on amd64 (see https://bugs.gentoo.org/729600)
+ # The grep sandwich acts as a regression test so that a future
+ # version bump cannot break patching without noticing
+ grep -wq _PREFIX/lib m4/xstar-check-libs.m4 || die
+ sed "s,_PREFIX/lib,_PREFIX/$(get_libdir)," -i m4/xstar-check-libs.m4 || die
+ grep -w _PREFIX/lib m4/xstar-check-libs.m4 && die
+
+ eautoreconf
+}
+
src_configure() {
append-cppflags $($(tc-getPKG_CONFIG) --cflags libxml-2.0)
next reply other threads:[~2021-01-31 19:03 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-01-31 19:03 Sebastian Pipping [this message]
-- strict thread matches above, loose matches on Subject: below --
2023-05-11 3:29 [gentoo-commits] repo/gentoo:master commit in: app-text/xmlstarlet/ Sam James
2023-04-25 21:25 Sam James
2022-09-02 13:07 Sebastian Pipping
2021-01-31 19:45 Sebastian Pipping
2020-01-21 21:51 David Seifert
2018-05-21 15:53 Mikle Kolyada
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=1612119771.50b1b854dcc2c8edf99916c8acfc1610619adce3.sping@gentoo \
--to=sping@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