[gentoo-commits] repo/gentoo:master commit in: dev-lang/zig/files/, dev-lang/zig/

["Sam James" <sam@gentoo.org>]

commit:     766ffdacc8e269ad975a010bb9124024e7272fd7
Author:     Eric Joldasov <bratishkaerik <AT> getgoogleoff <DOT> me>
AuthorDate: Fri Jan 13 11:47:46 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Jan 14 19:14:51 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=766ffdac

dev-lang/zig: fix patch from previous commit

I'm sorry for possible incovenience caused by this (I hope that it was, since it
didn't look SO bad). Explained in and rebased upstream PR too.

Fixes: 28fcae31f91eb30b62c8d55b39207238d377f0c2
Closes: https://bugs.gentoo.org/890457
Closes: https://bugs.gentoo.org/890459

Signed-off-by: Eric Joldasov <bratishkaerik <AT> getgoogleoff.me>
Signed-off-by: Sam James <sam <AT> gentoo.org>

 .../zig-0.10.0-build-dir-install-stage3.patch      | 24 +++++++++++++++++-----
 .../{zig-0.10.0.ebuild => zig-0.10.0-r1.ebuild}    |  0
 2 files changed, 19 insertions(+), 5 deletions(-)

diff --git a/dev-lang/zig/files/zig-0.10.0-build-dir-install-stage3.patch b/dev-lang/zig/files/zig-0.10.0-build-dir-install-stage3.patch
index c44632f5111e..5704e4ba7921 100644
--- a/dev-lang/zig/files/zig-0.10.0-build-dir-install-stage3.patch
+++ b/dev-lang/zig/files/zig-0.10.0-build-dir-install-stage3.patch
@@ -1,18 +1,32 @@
 From: Eric Joldasov <bratishkaerik@getgoogleoff.me>
 
 Install 'zig' binary in 'build_dir/stage3' directory so that we can find it and use for testing.
+Also split "add_custom_target(stage3 ALL" and command that it invokes, so that it won't retry it during installation,
+as target will be considered not out-of-date. (Bug https://bugs.gentoo.org/890457 and https://bugs.gentoo.org/890459).
 Upstream PR https://github.com/ziglang/zig/pull/14255.
+
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -1094,7 +1094,7 @@ set(ZIG_BUILD_ARGS
+@@ -1094,10 +1094,14 @@ set(ZIG_BUILD_ARGS
  )
  
  add_custom_target(stage3 ALL
 -    COMMAND zig2 build compile ${ZIG_BUILD_ARGS}
-+    COMMAND zig2 build --prefix "${CMAKE_BINARY_DIR}/stage3" ${ZIG_BUILD_ARGS}
-     DEPENDS zig2
-     COMMENT STATUS "Building stage3"
-     WORKING_DIRECTORY "${CMAKE_SOURCE_DIR}"
+-    DEPENDS zig2
+-    COMMENT STATUS "Building stage3"
+-    WORKING_DIRECTORY "${CMAKE_SOURCE_DIR}"
++  DEPENDS "${CMAKE_BINARY_DIR}/stage3/bin/zig"
++)
++
++add_custom_command(
++  OUTPUT "${CMAKE_BINARY_DIR}/stage3/bin/zig"
++  COMMAND zig2 build --prefix "${CMAKE_BINARY_DIR}/stage3" ${ZIG_BUILD_ARGS}
++  COMMENT STATUS "Building stage3"
++  WORKING_DIRECTORY "${CMAKE_SOURCE_DIR}"
+ )
+ 
+ install(CODE "set(ZIG_EXECUTABLE \"${ZIG_EXECUTABLE}\")")
+
 --- a/build.zig
 +++ b/build.zig
 @@ -148,10 +148,6 @@ pub fn build(b: *Builder) !void {

diff --git a/dev-lang/zig/zig-0.10.0.ebuild b/dev-lang/zig/zig-0.10.0-r1.ebuild
similarity index 100%
rename from dev-lang/zig/zig-0.10.0.ebuild
rename to dev-lang/zig/zig-0.10.0-r1.ebuild