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)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 6A63615838C for ; Sat, 20 Jan 2024 22:13:24 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 4B4BAE29CC; Sat, 20 Jan 2024 22:13:21 +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)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 2B345E29CA for ; Sat, 20 Jan 2024 22:13:21 +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 6A585343277 for ; Sat, 20 Jan 2024 22:13:19 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id A4F7314C5 for ; Sat, 20 Jan 2024 22:13:16 +0000 (UTC) From: "David Roman" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "David Roman" Message-ID: <1705687458.0b5554c5bc2a2659d82f4d6dc60e52e56f5188ba.davidroman@gentoo> Subject: [gentoo-commits] repo/proj/guru:master commit in: dev-lang/hare/ X-VCS-Repository: repo/proj/guru X-VCS-Files: dev-lang/hare/hare-0_pre20231127-r1.ebuild dev-lang/hare/hare-0_pre20231127.ebuild dev-lang/hare/hare-9999.ebuild X-VCS-Directories: dev-lang/hare/ X-VCS-Committer: davidroman X-VCS-Committer-Name: David Roman X-VCS-Revision: 0b5554c5bc2a2659d82f4d6dc60e52e56f5188ba X-VCS-Branch: master Date: Sat, 20 Jan 2024 22:13:16 +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: f6cc1eae-088c-42c5-a310-226008a4a4b4 X-Archives-Hash: 1c4a16e184f629be543e5b7b4c555d7d commit: 0b5554c5bc2a2659d82f4d6dc60e52e56f5188ba Author: Haelwenn (lanodan) Monnier hacktivis me> AuthorDate: Fri Jan 19 18:04:18 2024 +0000 Commit: David Roman gmail com> CommitDate: Fri Jan 19 18:04:18 2024 +0000 URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=0b5554c5 dev-lang/hare: Fix PREFIX, needed for a sane HAREPATH Signed-off-by: Haelwenn (lanodan) Monnier hacktivis.me> .../hare/{hare-0_pre20231127.ebuild => hare-0_pre20231127-r1.ebuild} | 4 +++- dev-lang/hare/hare-9999.ebuild | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/dev-lang/hare/hare-0_pre20231127.ebuild b/dev-lang/hare/hare-0_pre20231127-r1.ebuild similarity index 89% rename from dev-lang/hare/hare-0_pre20231127.ebuild rename to dev-lang/hare/hare-0_pre20231127-r1.ebuild index c5283c60d1..6d644cfdf4 100644 --- a/dev-lang/hare/hare-0_pre20231127.ebuild +++ b/dev-lang/hare/hare-0_pre20231127-r1.ebuild @@ -39,11 +39,13 @@ src_configure() { * ) die "unsupported architecture: ${ARCH}" ;; esac + # Note: PREFIX needs to be set early as it is used for HAREPATH cp config.example.mk config.mk || die sed -i \ -e 's;=aarch64-;=;' \ -e 's;=riscv64-;=;' \ -e "s;^ARCH =.*;ARCH = ${target_arch};" \ + -e "s;^PREFIX =.*;PREFIX = ${EPREFIX}/usr;" \ -e 's;^AS =;AS ?=;' \ -e 's;^LD =;LD ?=;' \ -e 's;^AR =;AR ?=;' \ @@ -51,5 +53,5 @@ src_configure() { } src_install() { - emake DESTDIR="${D}" PREFIX="${EPREFIX}/usr" install + emake DESTDIR="${D}" install } diff --git a/dev-lang/hare/hare-9999.ebuild b/dev-lang/hare/hare-9999.ebuild index 208f3b7ac4..0812095c10 100644 --- a/dev-lang/hare/hare-9999.ebuild +++ b/dev-lang/hare/hare-9999.ebuild @@ -39,14 +39,16 @@ src_configure() { * ) die "unsupported architecture: ${ARCH}" ;; esac + # Note: PREFIX needs to be set early as it is used for HAREPATH cp configs/linux.mk config.mk || die sed -i \ -e "s;^ARCH =.*;ARCH = ${target_arch};" \ + -e "s;^PREFIX =.*;PREFIX = ${EPREFIX}/usr;" \ -e 's;^AS =;AS ?=;' \ -e 's;^LD =;LD ?=;' \ config.mk || die } src_install() { - emake DESTDIR="${D}" PREFIX="${EPREFIX}/usr" install + emake DESTDIR="${D}" install }