From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1517028-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (2048 bits))
(No client certificate requested)
by finch.gentoo.org (Postfix) with ESMTPS id 9E202158649
for <garchives@archives.gentoo.org>; Wed, 10 May 2023 01:28:41 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id BD521E07B2;
Wed, 10 May 2023 01:28:40 +0000 (UTC)
Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256)
(No client certificate requested)
by pigeon.gentoo.org (Postfix) with ESMTPS id 9D453E07B2
for <gentoo-commits@lists.gentoo.org>; Wed, 10 May 2023 01:28:40 +0000 (UTC)
Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (4096 bits))
(No client certificate requested)
by smtp.gentoo.org (Postfix) with ESMTPS id CBBE9340B4D
for <gentoo-commits@lists.gentoo.org>; Wed, 10 May 2023 01:28:39 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id 0B9DA990
for <gentoo-commits@lists.gentoo.org>; Wed, 10 May 2023 01:28:38 +0000 (UTC)
From: "Sam James" <sam@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" <sam@gentoo.org>
Message-ID: <1683682115.ec88652cbefa9ce7fffaa1f5ab48ec6b772be106.sam@gentoo>
Subject: [gentoo-commits] proj/portage:master commit in: bin/
X-VCS-Repository: proj/portage
X-VCS-Files: bin/phase-helpers.sh
X-VCS-Directories: bin/
X-VCS-Committer: sam
X-VCS-Committer-Name: Sam James
X-VCS-Revision: ec88652cbefa9ce7fffaa1f5ab48ec6b772be106
X-VCS-Branch: master
Date: Wed, 10 May 2023 01:28:38 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply
X-Archives-Salt: 38f7260e-251b-4837-9e6d-7ba77111900e
X-Archives-Hash: 1a7a4868dfc8da0c12ce80f6cf3f6a46
commit: ec88652cbefa9ce7fffaa1f5ab48ec6b772be106
Author: Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Tue May 9 20:34:39 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed May 10 01:28:35 2023 +0000
URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=ec88652c
einstall: Make EI_DESTLIBDIR a local variable and rename it
Signed-off-by: Ulrich Müller <ulm <AT> gentoo.org>
Closes: https://github.com/gentoo/portage/pull/1033
Signed-off-by: Sam James <sam <AT> gentoo.org>
bin/phase-helpers.sh | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/bin/phase-helpers.sh b/bin/phase-helpers.sh
index e3fca6757..af96b73e4 100644
--- a/bin/phase-helpers.sh
+++ b/bin/phase-helpers.sh
@@ -757,10 +757,9 @@ einstall() {
fi
if [[ -n "${libdir}" && "${CONF_PREFIX:+set}" = set ]]; then
- EI_DESTLIBDIR="${D%/}/${CONF_PREFIX}/${libdir}"
- EI_DESTLIBDIR="$(__strip_duplicate_slashes "${EI_DESTLIBDIR}")"
- LOCAL_EXTRA_EINSTALL="libdir=${EI_DESTLIBDIR} ${LOCAL_EXTRA_EINSTALL}"
- unset EI_DESTLIBDIR
+ local destlibdir="${D%/}/${CONF_PREFIX}/${libdir}"
+ destlibdir="$(__strip_duplicate_slashes "${destlibdir}")"
+ LOCAL_EXTRA_EINSTALL="libdir=${destlibdir} ${LOCAL_EXTRA_EINSTALL}"
fi
if [[ -f Makefile || -f GNUmakefile || -f makefile ]] ; then