From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: 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) server-digest SHA256) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 4B45515852A for ; Thu, 15 Aug 2024 10:24:06 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 5CD3FE29E3; Thu, 15 Aug 2024 10:24:05 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (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 3B16BE29E3 for ; Thu, 15 Aug 2024 10:24:05 +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) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 39BFB342FF8 for ; Thu, 15 Aug 2024 10:24:04 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 3B8851EBA for ; Thu, 15 Aug 2024 10:24:02 +0000 (UTC) From: "James Le Cuirot" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "James Le Cuirot" Message-ID: <1723717346.f8107e34b0a0ca8fcd565e3d5b6f00ac3db48b12.chewi@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-lang/perl/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-lang/perl/perl-5.40.0.ebuild X-VCS-Directories: dev-lang/perl/ X-VCS-Committer: chewi X-VCS-Committer-Name: James Le Cuirot X-VCS-Revision: f8107e34b0a0ca8fcd565e3d5b6f00ac3db48b12 X-VCS-Branch: master Date: Thu, 15 Aug 2024 10:24:02 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: a4f6089f-fe91-4397-9880-be10966c973c X-Archives-Hash: 63225c2cce84c912b84fd2c6daa3ed4a commit: f8107e34b0a0ca8fcd565e3d5b6f00ac3db48b12 Author: James Le Cuirot gentoo org> AuthorDate: Thu Aug 15 10:22:26 2024 +0000 Commit: James Le Cuirot gentoo org> CommitDate: Thu Aug 15 10:22:26 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f8107e34 dev-lang/perl: Fix building when EROOT != ESYSROOT I didn't understand the distinction when I added these lines 8 years ago! There is some remaining usage of EROOT in src_configure, which is technically not allowed, but I'm not sure whether ESYSROOT would make sense there either. Perhaps that code needs to move. Signed-off-by: James Le Cuirot gentoo.org> dev-lang/perl/perl-5.40.0.ebuild | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dev-lang/perl/perl-5.40.0.ebuild b/dev-lang/perl/perl-5.40.0.ebuild index 462941f8d822..be1251b4c5a1 100644 --- a/dev-lang/perl/perl-5.40.0.ebuild +++ b/dev-lang/perl/perl-5.40.0.ebuild @@ -439,7 +439,7 @@ src_prepare() { tc-is-static-only || src_prepare_dynamic if use gdbm; then - sed -i "s:INC => .*:INC => \"-I${EROOT}/usr/include/gdbm\":g" \ + sed -i "s:INC => .*:INC => \"-I${ESYSROOT}/usr/include/gdbm\":g" \ ext/NDBM_File/Makefile.PL || die fi @@ -577,12 +577,12 @@ src_configure() { use m68k && append-ldflags -Wl,-z,norelro export BUILD_BZIP2=0 - export BZIP2_INCLUDE=${EROOT}/usr/include - export BZIP2_LIB=${EROOT}/usr/$(get_libdir) + export BZIP2_INCLUDE=${ESYSROOT}/usr/include + export BZIP2_LIB=${ESYSROOT}/usr/$(get_libdir) export BUILD_ZLIB=False - export ZLIB_INCLUDE=${EROOT}/usr/include - export ZLIB_LIB=${EROOT}/usr/$(get_libdir) + export ZLIB_INCLUDE=${ESYSROOT}/usr/include + export ZLIB_LIB=${ESYSROOT}/usr/$(get_libdir) # allow either gdbm to provide ndbm (in ) or db1 myndbm='U'