Gentoo Archives: gentoo-commits

From: Sebastian Pipping <sping@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: app-text/xmlstarlet/
Date: Fri, 02 Sep 2022 13:07:21
Message-Id: 1662123957.cd06c9384096477b8dcfe3c12ec27f3c2c293d9d.sping@gentoo
1 commit: cd06c9384096477b8dcfe3c12ec27f3c2c293d9d
2 Author: Sebastian Pipping <sping <AT> gentoo <DOT> org>
3 AuthorDate: Fri Sep 2 13:05:57 2022 +0000
4 Commit: Sebastian Pipping <sping <AT> gentoo <DOT> org>
5 CommitDate: Fri Sep 2 13:05:57 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cd06c938
7
8 app-text/xmlstarlet: Fix compile for libdir "lib"
9
10 Closes: https://bugs.gentoo.org/830062
11 Signed-off-by: Sebastian Pipping <sping <AT> gentoo.org>
12 Package-Manager: Portage-3.0.30, Repoman-3.0.3
13
14 app-text/xmlstarlet/xmlstarlet-1.6.1.ebuild | 8 +++++---
15 1 file changed, 5 insertions(+), 3 deletions(-)
16
17 diff --git a/app-text/xmlstarlet/xmlstarlet-1.6.1.ebuild b/app-text/xmlstarlet/xmlstarlet-1.6.1.ebuild
18 index 37ed9694ee5f..a234631ef8b8 100644
19 --- a/app-text/xmlstarlet/xmlstarlet-1.6.1.ebuild
20 +++ b/app-text/xmlstarlet/xmlstarlet-1.6.1.ebuild
21 @@ -28,9 +28,11 @@ src_prepare() {
22 # linker lld with profile 17.1 on amd64 (see https://bugs.gentoo.org/729600).
23 # The grep sandwich acts as a regression test so that a future
24 # version bump cannot break patching without noticing.
25 - grep -wq _PREFIX/lib m4/xstar-check-libs.m4 || die
26 - sed "s,_PREFIX/lib,_PREFIX/$(get_libdir)," -i m4/xstar-check-libs.m4 || die
27 - grep -w _PREFIX/lib m4/xstar-check-libs.m4 && die
28 + if [[ $(get_libdir) != lib ]]; then
29 + grep -wq _PREFIX/lib m4/xstar-check-libs.m4 || die
30 + sed "s,_PREFIX/lib,_PREFIX/$(get_libdir)," -i m4/xstar-check-libs.m4 || die
31 + grep -w _PREFIX/lib m4/xstar-check-libs.m4 && die
32 + fi
33
34 eautoreconf
35 }