public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Sebastian Pipping" <sping@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: www-client/httrack/
Date: Wed, 24 Mar 2021 16:10:42 +0000 (UTC)	[thread overview]
Message-ID: <1616602233.0d6b4f77e689f30c9a9fc7f0012caec35c338ed3.sping@gentoo> (raw)

commit:     0d6b4f77e689f30c9a9fc7f0012caec35c338ed3
Author:     Sebastian Pipping <sping <AT> gentoo <DOT> org>
AuthorDate: Wed Mar 24 16:08:58 2021 +0000
Commit:     Sebastian Pipping <sping <AT> gentoo <DOT> org>
CommitDate: Wed Mar 24 16:10:33 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0d6b4f77

www-client/httrack: Fix libdir patching

Closes: https://bugs.gentoo.org/777996
Signed-off-by: Sebastian Pipping <sping <AT> gentoo.org>
Package-Manager: Portage-3.0.17, Repoman-3.0.2

 www-client/httrack/httrack-3.49.2-r2.ebuild | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/www-client/httrack/httrack-3.49.2-r2.ebuild b/www-client/httrack/httrack-3.49.2-r2.ebuild
index a6bded23cc6..6dc538f5928 100644
--- a/www-client/httrack/httrack-3.49.2-r2.ebuild
+++ b/www-client/httrack/httrack-3.49.2-r2.ebuild
@@ -33,9 +33,11 @@ src_prepare() {
 	# linker lld with profile 17.1 on amd64 (see https://bugs.gentoo.org/732272).
 	# The grep sandwich acts as a regression test so that a future
 	# version bump cannot break patching without noticing.
-	grep -wq '{ZLIB_HOME}/lib' m4/check_zlib.m4 || die
-	sed "s,{ZLIB_HOME}/lib,{ZLIB_HOME}/$(get_libdir)," -i m4/check_zlib.m4 || die
-	grep -w '{ZLIB_HOME}/lib' m4/check_zlib.m4 && die
+	if [[ "$(get_libdir)" != lib ]]; then
+		grep -wq '{ZLIB_HOME}/lib' m4/check_zlib.m4 || die
+		sed "s,{ZLIB_HOME}/lib,{ZLIB_HOME}/$(get_libdir)," -i m4/check_zlib.m4 || die
+		grep -w '{ZLIB_HOME}/lib' m4/check_zlib.m4 && die
+	fi
 
 	eautoreconf
 }


             reply	other threads:[~2021-03-24 16:10 UTC|newest]

Thread overview: 34+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-03-24 16:10 Sebastian Pipping [this message]
  -- strict thread matches above, loose matches on Subject: below --
2024-01-27 18:43 [gentoo-commits] repo/gentoo:master commit in: www-client/httrack/ Sebastian Pipping
2024-01-27 17:36 Sam James
2024-01-27 17:36 Sam James
2024-01-27 17:29 Arthur Zamarin
2024-01-27 17:29 Arthur Zamarin
2024-01-27 14:45 Sebastian Pipping
2024-01-27 14:45 Sebastian Pipping
2023-03-13  2:49 Sebastian Pipping
2023-01-31  2:31 Sebastian Pipping
2023-01-18  0:21 Sebastian Pipping
2022-11-29  1:18 Sebastian Pipping
2021-04-30 18:34 Mikle Kolyada
2021-04-16 11:23 Sam James
2021-01-31 20:01 Sebastian Pipping
2020-01-31 18:36 Sebastian Pipping
2019-11-12 18:07 Agostino Sarubbo
2019-10-28  7:41 Agostino Sarubbo
2019-10-27 23:20 Thomas Deutschmann
2019-10-26 18:16 Sebastian Pipping
2019-10-26 18:16 Sebastian Pipping
2019-03-31 21:05 Sebastian Pipping
2018-04-21 20:56 Sebastian Pipping
2017-08-20 21:39 Sebastian Pipping
2017-08-20 21:33 Sebastian Pipping
2017-05-14 19:44 Sebastian Pipping
2016-08-03 15:03 Sebastian Pipping
2016-02-19 15:33 Fabian Groffen
2015-11-21  7:11 Anthony G. Basile
2015-11-12  9:40 Agostino Sarubbo
2015-11-11 10:05 Agostino Sarubbo
2015-11-11  8:54 Agostino Sarubbo
2015-11-08 16:26 Sebastian Pipping
2015-11-08 16:26 Sebastian Pipping

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=1616602233.0d6b4f77e689f30c9a9fc7f0012caec35c338ed3.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