| 1 |
commit: d3e007705a1dbe686551fba460f2294285043db0 |
| 2 |
Author: BratishkaErik <bratishkaerik <AT> getgoogleoff <DOT> me> |
| 3 |
AuthorDate: Thu Mar 24 13:43:14 2022 +0000 |
| 4 |
Commit: Florian Schmaus <flow <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Mar 28 07:49:42 2022 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d3e00770 |
| 7 |
|
| 8 |
dev-lang/zig: add memory requirement via check-reqs |
| 9 |
|
| 10 |
see https://github.com/ziglang/zig/issues/6485 |
| 11 |
|
| 12 |
Package-Manager: Portage-3.0.30, Repoman-3.0.3 |
| 13 |
Signed-off-by: BratishkaErik <bratishkaerik <AT> getgoogleoff.me> |
| 14 |
Closes: https://github.com/gentoo/gentoo/pull/24734 |
| 15 |
Signed-off-by: Florian Schmaus <flow <AT> gentoo.org> |
| 16 |
|
| 17 |
dev-lang/zig/zig-0.7.1.ebuild | 9 ++++++--- |
| 18 |
dev-lang/zig/zig-0.8.1-r1.ebuild | 9 ++++++--- |
| 19 |
dev-lang/zig/zig-0.9.1.ebuild | 7 +++++-- |
| 20 |
dev-lang/zig/zig-9999.ebuild | 11 +++++++---- |
| 21 |
4 files changed, 24 insertions(+), 12 deletions(-) |
| 22 |
|
| 23 |
diff --git a/dev-lang/zig/zig-0.7.1.ebuild b/dev-lang/zig/zig-0.7.1.ebuild |
| 24 |
index d775cde187a1..39cf045b3b38 100644 |
| 25 |
--- a/dev-lang/zig/zig-0.7.1.ebuild |
| 26 |
+++ b/dev-lang/zig/zig-0.7.1.ebuild |
| 27 |
@@ -1,9 +1,9 @@ |
| 28 |
-# Copyright 2019-2021 Gentoo Authors |
| 29 |
+# Copyright 2019-2022 Gentoo Authors |
| 30 |
# Distributed under the terms of the GNU General Public License v2 |
| 31 |
|
| 32 |
-EAPI=7 |
| 33 |
+EAPI=8 |
| 34 |
|
| 35 |
-inherit cmake llvm |
| 36 |
+inherit cmake llvm check-reqs |
| 37 |
|
| 38 |
DESCRIPTION="A robust, optimal, and maintainable programming language" |
| 39 |
HOMEPAGE="https://ziglang.org/" |
| 40 |
@@ -46,6 +46,9 @@ llvm_check_deps() { |
| 41 |
has_version "sys-devel/clang:${LLVM_SLOT}" |
| 42 |
} |
| 43 |
|
| 44 |
+# see https://github.com/ziglang/zig/wiki/Troubleshooting-Build-Issues#high-memory-requirements |
| 45 |
+CHECKREQS_MEMORY="6G" |
| 46 |
+ |
| 47 |
src_configure() { |
| 48 |
local mycmakeargs=( |
| 49 |
-DZIG_USE_CCACHE=OFF |
| 50 |
|
| 51 |
diff --git a/dev-lang/zig/zig-0.8.1-r1.ebuild b/dev-lang/zig/zig-0.8.1-r1.ebuild |
| 52 |
index 659a2ac1dbca..86befea8144c 100644 |
| 53 |
--- a/dev-lang/zig/zig-0.8.1-r1.ebuild |
| 54 |
+++ b/dev-lang/zig/zig-0.8.1-r1.ebuild |
| 55 |
@@ -1,9 +1,9 @@ |
| 56 |
-# Copyright 2019-2021 Gentoo Authors |
| 57 |
+# Copyright 2019-2022 Gentoo Authors |
| 58 |
# Distributed under the terms of the GNU General Public License v2 |
| 59 |
|
| 60 |
-EAPI=7 |
| 61 |
+EAPI=8 |
| 62 |
|
| 63 |
-inherit cmake llvm |
| 64 |
+inherit cmake llvm check-reqs |
| 65 |
|
| 66 |
DESCRIPTION="A robust, optimal, and maintainable programming language" |
| 67 |
HOMEPAGE="https://ziglang.org/" |
| 68 |
@@ -45,6 +45,9 @@ llvm_check_deps() { |
| 69 |
has_version "sys-devel/clang:${LLVM_SLOT}" |
| 70 |
} |
| 71 |
|
| 72 |
+# see https://github.com/ziglang/zig/wiki/Troubleshooting-Build-Issues#high-memory-requirements |
| 73 |
+CHECKREQS_MEMORY="10G" |
| 74 |
+ |
| 75 |
src_configure() { |
| 76 |
local mycmakeargs=( |
| 77 |
-DZIG_USE_CCACHE=OFF |
| 78 |
|
| 79 |
diff --git a/dev-lang/zig/zig-0.9.1.ebuild b/dev-lang/zig/zig-0.9.1.ebuild |
| 80 |
index f3e935ec2f28..30aa4b234c28 100644 |
| 81 |
--- a/dev-lang/zig/zig-0.9.1.ebuild |
| 82 |
+++ b/dev-lang/zig/zig-0.9.1.ebuild |
| 83 |
@@ -1,10 +1,10 @@ |
| 84 |
# Copyright 2019-2022 Gentoo Authors |
| 85 |
# Distributed under the terms of the GNU General Public License v2 |
| 86 |
|
| 87 |
-EAPI=7 |
| 88 |
+EAPI=8 |
| 89 |
|
| 90 |
LLVM_MAX_SLOT=13 |
| 91 |
-inherit cmake llvm |
| 92 |
+inherit cmake llvm check-reqs |
| 93 |
|
| 94 |
DESCRIPTION="A robust, optimal, and maintainable programming language" |
| 95 |
HOMEPAGE="https://ziglang.org/" |
| 96 |
@@ -44,6 +44,9 @@ llvm_check_deps() { |
| 97 |
has_version "sys-devel/clang:${LLVM_SLOT}" |
| 98 |
} |
| 99 |
|
| 100 |
+# see https://github.com/ziglang/zig/wiki/Troubleshooting-Build-Issues#high-memory-requirements |
| 101 |
+CHECKREQS_MEMORY="10G" |
| 102 |
+ |
| 103 |
src_configure() { |
| 104 |
local mycmakeargs=( |
| 105 |
-DZIG_USE_CCACHE=OFF |
| 106 |
|
| 107 |
diff --git a/dev-lang/zig/zig-9999.ebuild b/dev-lang/zig/zig-9999.ebuild |
| 108 |
index ca45b1e7e4dc..30aa4b234c28 100644 |
| 109 |
--- a/dev-lang/zig/zig-9999.ebuild |
| 110 |
+++ b/dev-lang/zig/zig-9999.ebuild |
| 111 |
@@ -1,10 +1,10 @@ |
| 112 |
-# Copyright 2019-2021 Gentoo Authors |
| 113 |
+# Copyright 2019-2022 Gentoo Authors |
| 114 |
# Distributed under the terms of the GNU General Public License v2 |
| 115 |
|
| 116 |
-EAPI=7 |
| 117 |
+EAPI=8 |
| 118 |
|
| 119 |
LLVM_MAX_SLOT=13 |
| 120 |
-inherit cmake llvm |
| 121 |
+inherit cmake llvm check-reqs |
| 122 |
|
| 123 |
DESCRIPTION="A robust, optimal, and maintainable programming language" |
| 124 |
HOMEPAGE="https://ziglang.org/" |
| 125 |
@@ -13,7 +13,7 @@ if [[ ${PV} == 9999 ]]; then |
| 126 |
inherit git-r3 |
| 127 |
else |
| 128 |
SRC_URI="https://github.com/ziglang/zig/archive/${PV}.tar.gz -> ${P}.tar.gz" |
| 129 |
- KEYWORDS="~amd64 ~arm64" |
| 130 |
+ KEYWORDS="~amd64 ~arm ~arm64" |
| 131 |
fi |
| 132 |
|
| 133 |
LICENSE="MIT" |
| 134 |
@@ -44,6 +44,9 @@ llvm_check_deps() { |
| 135 |
has_version "sys-devel/clang:${LLVM_SLOT}" |
| 136 |
} |
| 137 |
|
| 138 |
+# see https://github.com/ziglang/zig/wiki/Troubleshooting-Build-Issues#high-memory-requirements |
| 139 |
+CHECKREQS_MEMORY="10G" |
| 140 |
+ |
| 141 |
src_configure() { |
| 142 |
local mycmakeargs=( |
| 143 |
-DZIG_USE_CCACHE=OFF |
Archives