From: "Haelwenn Monnier" <contact@hacktivis.me>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/proj/guru:dev commit in: dev-lang/hare/
Date: Fri, 19 Jan 2024 18:05:07 +0000 (UTC) [thread overview]
Message-ID: <1705687458.0b5554c5bc2a2659d82f4d6dc60e52e56f5188ba.lanodan@gentoo> (raw)
commit: 0b5554c5bc2a2659d82f4d6dc60e52e56f5188ba
Author: Haelwenn (lanodan) Monnier <contact <AT> hacktivis <DOT> me>
AuthorDate: Fri Jan 19 18:04:18 2024 +0000
Commit: Haelwenn Monnier <contact <AT> hacktivis <DOT> me>
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
}
next reply other threads:[~2024-01-19 18:05 UTC|newest]
Thread overview: 33+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-01-19 18:05 Haelwenn Monnier [this message]
-- strict thread matches above, loose matches on Subject: below --
2025-06-22 14:02 [gentoo-commits] repo/proj/guru:dev commit in: dev-lang/hare/ Haelwenn Monnier
2025-06-21 15:13 Haelwenn Monnier
2025-06-21 15:11 Haelwenn Monnier
2024-07-14 15:27 Haelwenn Monnier
2024-07-14 15:27 Haelwenn Monnier
2024-02-29 8:52 Haelwenn Monnier
2024-02-29 8:49 Haelwenn Monnier
2024-02-29 8:49 Haelwenn Monnier
2024-02-28 10:30 Haelwenn Monnier
2024-01-20 3:53 Takuya Wakazono
2024-01-19 17:58 Haelwenn Monnier
2024-01-19 17:58 Haelwenn Monnier
2024-01-16 13:23 Takuya Wakazono
2023-12-02 1:29 Haelwenn Monnier
2023-08-14 16:37 Haelwenn Monnier
2023-06-15 19:12 Haelwenn Monnier
2023-05-30 21:59 Haelwenn Monnier
2023-02-27 22:32 Haelwenn Monnier
2022-11-02 13:58 Haelwenn Monnier
2022-09-27 22:29 Haelwenn Monnier
2022-09-27 20:48 Haelwenn Monnier
2022-09-27 20:41 Haelwenn Monnier
2022-08-28 13:47 Haelwenn Monnier
2022-08-26 8:16 Andrew Pirie
2022-08-13 7:04 Haelwenn Monnier
2022-08-12 22:13 Haelwenn Monnier
2022-08-08 20:23 Haelwenn Monnier
2022-06-25 3:53 Haelwenn Monnier
2022-06-24 13:11 Rui Huang
2022-06-24 12:42 Rui Huang
2022-05-05 14:42 Haelwenn Monnier
2022-04-23 17:53 Haelwenn Monnier
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=1705687458.0b5554c5bc2a2659d82f4d6dc60e52e56f5188ba.lanodan@gentoo \
--to=contact@hacktivis.me \
--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