| 1 |
commit: e65424f0cda5754051c5b5a7178030cd45273ff8 |
| 2 |
Author: BratishkaErik <bratishkaerik <AT> getgoogleoff <DOT> me> |
| 3 |
AuthorDate: Fri May 20 12:19:18 2022 +0000 |
| 4 |
Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Fri May 27 07:45:27 2022 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e65424f0 |
| 7 |
|
| 8 |
dev-lang/zig: add threads USE flag |
| 9 |
|
| 10 |
Signed-off-by: BratishkaErik <bratishkaerik <AT> getgoogleoff.me> |
| 11 |
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org> |
| 12 |
|
| 13 |
dev-lang/zig/files/zig-0.9.1-fix-single-threaded.patch | 13 +++++++++++++ |
| 14 |
dev-lang/zig/zig-0.9.1.ebuild | 5 ++++- |
| 15 |
dev-lang/zig/zig-9999.ebuild | 5 +++-- |
| 16 |
3 files changed, 20 insertions(+), 3 deletions(-) |
| 17 |
|
| 18 |
diff --git a/dev-lang/zig/files/zig-0.9.1-fix-single-threaded.patch b/dev-lang/zig/files/zig-0.9.1-fix-single-threaded.patch |
| 19 |
new file mode 100644 |
| 20 |
index 000000000000..70f807f2d550 |
| 21 |
--- /dev/null |
| 22 |
+++ b/dev-lang/zig/files/zig-0.9.1-fix-single-threaded.patch |
| 23 |
@@ -0,0 +1,13 @@ |
| 24 |
+diff --git a/CMakeLists.txt b/CMakeLists.txt |
| 25 |
+index 638f39f7e..791477c41 100644 |
| 26 |
+--- a/CMakeLists.txt |
| 27 |
++++ b/CMakeLists.txt |
| 28 |
+@@ -787,7 +787,7 @@ else() |
| 29 |
+ set(ZIG1_RELEASE_ARG -OReleaseFast --strip) |
| 30 |
+ endif() |
| 31 |
+ if(ZIG_SINGLE_THREADED) |
| 32 |
+- set(ZIG1_SINGLE_THREADED_ARG "-fsingle-threaded") |
| 33 |
++ set(ZIG1_SINGLE_THREADED_ARG "--single-threaded") |
| 34 |
+ else() |
| 35 |
+ set(ZIG1_SINGLE_THREADED_ARG "") |
| 36 |
+ endif() |
| 37 |
|
| 38 |
diff --git a/dev-lang/zig/zig-0.9.1.ebuild b/dev-lang/zig/zig-0.9.1.ebuild |
| 39 |
index a0e3522a22a0..18dd79a4bbad 100644 |
| 40 |
--- a/dev-lang/zig/zig-0.9.1.ebuild |
| 41 |
+++ b/dev-lang/zig/zig-0.9.1.ebuild |
| 42 |
@@ -18,9 +18,11 @@ fi |
| 43 |
|
| 44 |
LICENSE="MIT" |
| 45 |
SLOT="0" |
| 46 |
-IUSE="test" |
| 47 |
+IUSE="test +threads" |
| 48 |
RESTRICT="!test? ( test )" |
| 49 |
|
| 50 |
+PATCHES=("${FILESDIR}/${P}-fix-single-threaded.patch") |
| 51 |
+ |
| 52 |
BUILD_DIR="${S}/build" |
| 53 |
|
| 54 |
# According to zig's author, zig builds that do not support all targets are not |
| 55 |
@@ -56,6 +58,7 @@ src_configure() { |
| 56 |
local mycmakeargs=( |
| 57 |
-DZIG_USE_CCACHE=OFF |
| 58 |
-DZIG_PREFER_CLANG_CPP_DYLIB=ON |
| 59 |
+ -DZIG_SINGLE_THREADED="$(usex threads OFF ON)" |
| 60 |
) |
| 61 |
|
| 62 |
cmake_src_configure |
| 63 |
|
| 64 |
diff --git a/dev-lang/zig/zig-9999.ebuild b/dev-lang/zig/zig-9999.ebuild |
| 65 |
index cdac1427ee7e..c63dc88b02c2 100644 |
| 66 |
--- a/dev-lang/zig/zig-9999.ebuild |
| 67 |
+++ b/dev-lang/zig/zig-9999.ebuild |
| 68 |
@@ -18,7 +18,7 @@ fi |
| 69 |
|
| 70 |
LICENSE="MIT" |
| 71 |
SLOT="0" |
| 72 |
-IUSE="test +stage2" |
| 73 |
+IUSE="test +stage2 +threads" |
| 74 |
RESTRICT="!test? ( test )" |
| 75 |
|
| 76 |
BUILD_DIR="${S}/build" |
| 77 |
@@ -59,6 +59,7 @@ src_configure() { |
| 78 |
local mycmakeargs=( |
| 79 |
-DZIG_USE_CCACHE=OFF |
| 80 |
-DZIG_PREFER_CLANG_CPP_DYLIB=ON |
| 81 |
+ -DZIG_SINGLE_THREADED="$(usex threads OFF ON)" |
| 82 |
) |
| 83 |
|
| 84 |
cmake_src_configure |
| 85 |
@@ -69,7 +70,7 @@ src_compile() { |
| 86 |
|
| 87 |
if use stage2 ; then |
| 88 |
cd "${BUILD_DIR}" || die |
| 89 |
- ./zig build -p stage2 -Dstatic-llvm=false -Denable-llvm=true || die |
| 90 |
+ ./zig build -p stage2 -Dstatic-llvm=false -Denable-llvm=true -Dsingle-threaded="$(usex threads false true)" || die |
| 91 |
fi |
| 92 |
} |
Archives