[gentoo-commits] repo/proj/guru:master commit in: dev-lang/hare/

[David Roman]

commit:     0b5554c5bc2a2659d82f4d6dc60e52e56f5188ba
Author:     Haelwenn (lanodan) Monnier <contact <AT> hacktivis <DOT> me>
AuthorDate: Fri Jan 19 18:04:18 2024 +0000
Commit:     David Roman <davidroman96 <AT> gmail <DOT> 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 <contact <AT> 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
 }