Gentoo Archives: gentoo-commits

From: Andrew Pirie <andrew+gentoo@××××××.uk>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/proj/guru:dev commit in: dev-lang/hare/
Date: Fri, 26 Aug 2022 08:16:11
Message-Id: 1661501685.d88ac1ce52d6640ae77e549682d51c26bc595001.andrew+gentoo@gentoo
1 commit: d88ac1ce52d6640ae77e549682d51c26bc595001
2 Author: Andrew Pirie <andrew <AT> apirie <DOT> uk>
3 AuthorDate: Fri Aug 26 08:14:45 2022 +0000
4 Commit: Andrew Pirie <andrew+gentoo <AT> apirie <DOT> uk>
5 CommitDate: Fri Aug 26 08:14:45 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=d88ac1ce
7
8 dev-lang/hare: set correct architecture for build during configure
9
10 Signed-off-by: Andrew Pirie <andrew <AT> apirie.uk>
11
12 dev-lang/hare/hare-0_pre20220730.ebuild | 11 +++++++++++
13 dev-lang/hare/hare-9999.ebuild | 11 +++++++++++
14 2 files changed, 22 insertions(+)
15
16 diff --git a/dev-lang/hare/hare-0_pre20220730.ebuild b/dev-lang/hare/hare-0_pre20220730.ebuild
17 index 139218333..1fe1e819d 100644
18 --- a/dev-lang/hare/hare-0_pre20220730.ebuild
19 +++ b/dev-lang/hare/hare-0_pre20220730.ebuild
20 @@ -33,8 +33,19 @@ RDEPEND="${DEPEND}"
21 QA_FLAGS_IGNORED="usr/bin/harec?"
22
23 src_configure() {
24 + local target_arch
25 + case ${ARCH} in
26 + amd64 ) target_arch=x86_64 ;;
27 + arm64 ) target_arch=aarch64 ;;
28 + riscv ) target_arch=riscv64 ;;
29 + * ) die "unsupported architecture: ${ARCH}" ;;
30 + esac
31 +
32 cp config.example.mk config.mk || die
33 sed -i \
34 + -e 's;=aarch64-;=;' \
35 + -e 's;=riscv64-;=;' \
36 + -e "s;^ARCH =.*;ARCH=${target_arch};" \
37 -e 's;^PREFIX=.*;PREFIX=/usr;' \
38 -e 's;^AS =;AS ?=;' \
39 -e 's;^LD =;LD ?=;' \
40
41 diff --git a/dev-lang/hare/hare-9999.ebuild b/dev-lang/hare/hare-9999.ebuild
42 index 139218333..1fe1e819d 100644
43 --- a/dev-lang/hare/hare-9999.ebuild
44 +++ b/dev-lang/hare/hare-9999.ebuild
45 @@ -33,8 +33,19 @@ RDEPEND="${DEPEND}"
46 QA_FLAGS_IGNORED="usr/bin/harec?"
47
48 src_configure() {
49 + local target_arch
50 + case ${ARCH} in
51 + amd64 ) target_arch=x86_64 ;;
52 + arm64 ) target_arch=aarch64 ;;
53 + riscv ) target_arch=riscv64 ;;
54 + * ) die "unsupported architecture: ${ARCH}" ;;
55 + esac
56 +
57 cp config.example.mk config.mk || die
58 sed -i \
59 + -e 's;=aarch64-;=;' \
60 + -e 's;=riscv64-;=;' \
61 + -e "s;^ARCH =.*;ARCH=${target_arch};" \
62 -e 's;^PREFIX=.*;PREFIX=/usr;' \
63 -e 's;^AS =;AS ?=;' \
64 -e 's;^LD =;LD ?=;' \