diff options
| author | V3n3RiX <venerix@koprulu.sector> | 2023-01-11 11:44:03 +0000 |
|---|---|---|
| committer | V3n3RiX <venerix@koprulu.sector> | 2023-01-11 11:44:03 +0000 |
| commit | df26c7469c1f2af2e643d43e2e32a6c9142e4885 (patch) | |
| tree | 1beee9b11d06bfcc69d1d6c8ab00566f8633aec1 /dev-lang/zig | |
| parent | ad391b961414c99124b93cb86695c04bd8d57937 (diff) | |
gentoo auto-resync : 11:01:2023 - 11:44:03
Diffstat (limited to 'dev-lang/zig')
| -rw-r--r-- | dev-lang/zig/Manifest | 3 | ||||
| -rw-r--r-- | dev-lang/zig/files/zig-0.10.0-build-dir-install-stage3.patch | 28 | ||||
| -rw-r--r-- | dev-lang/zig/zig-0.10.0.ebuild | 18 |
3 files changed, 47 insertions, 2 deletions
diff --git a/dev-lang/zig/Manifest b/dev-lang/zig/Manifest index fa030d3052d8..71e22f132c18 100644 --- a/dev-lang/zig/Manifest +++ b/dev-lang/zig/Manifest @@ -1,5 +1,6 @@ AUX zig-0.10.0-avoid-cmake-bug.patch 2200 BLAKE2B 6c06d318f2da258f3c003c5d8eaf66261ec736cb4ea0a87f3b0ff3d7c350bd51523ba2f23ea2bccbaed237fe76dfd6e1b56b1741a5ac6ba3539f7551e2347f70 SHA512 8e5ff85b26fe3f5a19e73aa9ad8d9f6446f936e3c2157b50212218a77747913e1199c0b52181e884755a90dfa839b23f305da82edeba6e8d3ceaff1d20a16efd +AUX zig-0.10.0-build-dir-install-stage3.patch 927 BLAKE2B 6bf6797f04e3ad26ce9de0bf5fc388376e5ac3e5ebdf44a83ae882ba20cb3582ac10d40058ac13bec76766c6a1cd12021fde482379064ad7e9fa69981c013463 SHA512 4412f215b438409d0535f9c1668cd76bcbf2096a803a57048b301243ef4b183417339c8119d478d7eedea0ceaa0e520324cf3d40dd1f9ff5d6693c2fedd2f8c9 DIST zig-0.10.0.tar.xz 14530912 BLAKE2B 5949a44ee039b7d5a163344a0fc26af8dd9cf311ed25c7092a665bb59ec7dec8dc3cd39918d81ef02c707aa8989b038fb21dfba3927fd31153a1404739b4ea3c SHA512 9d83ce51cc0ce404c06da820179c1cc47aa50e573fb1c831a96baa12c6b5226abe85b384110f2ffc4cbdc5f24eaba1f14a4e3249ffeaa248c0d73ba29859e682 -EBUILD zig-0.10.0.ebuild 2852 BLAKE2B bc2bbb18252167fad93698a172e9ef8ebc386481bcc4d729b9b9769463bc56a9167f86abd715a9fe0da69227d763f9df16b7c173f04bb1d966e2c501b98f6543 SHA512 bf87ad4a824921573bb39d5849b22bc6b9a22e7e706743394b43f543462aca2d067343804d7daf70fe25b968751ed9f826e2823fa02494920af2ca58398c14c3 +EBUILD zig-0.10.0.ebuild 3894 BLAKE2B b8a91fcd746edad38c6f60e724ffa50dbbcc0b64281c0f1159abdef183528c570fb4b5375841bd67d7f1b876536d4a8a4832ebcc470f3d2bb0d5d280719eea83 SHA512 9bee415a98467aff89dce760ec93a96edee7f766b4d75e916095b1c62a18b18443f2cbcac66240db0a3a7db5d2207db16804091dd05c866a1e4b06acf19670c8 EBUILD zig-9999.ebuild 1671 BLAKE2B b753bbd37c7f1f60bdb2bc8fe3914d21f5b30787768460b55bd9e1980dc4727eb4f71c63a03da17a8a98c681df5e33e311b48c9c42fde8ab1b43a3bc9b3f4f90 SHA512 2b4d5a8fdfe5eba60896915b81168d5eb0aa3bcf53d6df8326c593f275556cf8652c401f0780f977325e877d36aa9348a196168f3e2c3dc3af99a8f5a1b46301 MISC metadata.xml 541 BLAKE2B 6f5c7fbf759f0430f69073a17a0dae4b8bebf335b54c3b43da6b24104dc3de05a3b686cddbbd31e4dae1fc31695a2f08d000d22437ed6f1847de8fa95e3b1952 SHA512 d49cf0a8ad76ac9a6f6fb091effddbbcd812b56f91df6d3c782e15197cb4ff4423fb1076671a232aabcb9833af19ef8c820ad6df312a1e4d72e665680314c083 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 new file mode 100644 index 000000000000..c44632f5111e --- /dev/null +++ b/dev-lang/zig/files/zig-0.10.0-build-dir-install-stage3.patch @@ -0,0 +1,28 @@ +From: Eric Joldasov <bratishkaerik@getgoogleoff.me> + +Install 'zig' binary in 'build_dir/stage3' directory so that we can find it and use for testing. +Upstream PR https://github.com/ziglang/zig/pull/14255. +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -1094,7 +1094,7 @@ 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}" +--- a/build.zig ++++ b/build.zig +@@ -148,10 +148,6 @@ pub fn build(b: *Builder) !void { + }; + + const exe = b.addExecutable("zig", main_file); +- +- const compile_step = b.step("compile", "Build the self-hosted compiler"); +- compile_step.dependOn(&exe.step); +- + exe.stack_size = stack_size; + exe.strip = strip; + exe.sanitize_thread = sanitize_thread; diff --git a/dev-lang/zig/zig-0.10.0.ebuild b/dev-lang/zig/zig-0.10.0.ebuild index fbc2bd7aee94..f47f22799167 100644 --- a/dev-lang/zig/zig-0.10.0.ebuild +++ b/dev-lang/zig/zig-0.10.0.ebuild @@ -49,6 +49,7 @@ CHECKREQS_MEMORY="10G" PATCHES=( "${FILESDIR}/${P}-avoid-cmake-bug.patch" + "${FILESDIR}/${P}-build-dir-install-stage3.patch" ) llvm_check_deps() { @@ -75,7 +76,22 @@ src_configure() { src_test() { cd "${BUILD_DIR}" || die - ./zig2 build test -Dstatic-llvm=false -Denable-llvm=true -Dskip-non-native=true || die + local ZIG_TESTARGS=("-Dstatic-llvm=false -Denable-llvm=true -Dskip-non-native=true -Drelease -Dtarget=native") + ./stage3/bin/zig build test-cases ${ZIG_TESTARGS[@]} || die + ./stage3/bin/zig build test-fmt ${ZIG_TESTARGS[@]} || die + ./stage3/bin/zig build test-behavior ${ZIG_TESTARGS[@]} || die + ./stage3/bin/zig build test-compiler-rt ${ZIG_TESTARGS[@]} || die + ./stage3/bin/zig build test-universal-libc ${ZIG_TESTARGS[@]} || die + ./stage3/bin/zig build test-compare-output ${ZIG_TESTARGS[@]} || die + ./stage3/bin/zig build test-standalone ${ZIG_TESTARGS[@]} || die + ./stage3/bin/zig build test-c-abi ${ZIG_TESTARGS[@]} || die + ./stage3/bin/zig build test-link ${ZIG_TESTARGS[@]} || die + ./stage3/bin/zig build test-stack-traces ${ZIG_TESTARGS[@]} || die + ./stage3/bin/zig build test-cli ${ZIG_TESTARGS[@]} || die + ./stage3/bin/zig build test-asm-link ${ZIG_TESTARGS[@]} || die + ./stage3/bin/zig build test-translate-c ${ZIG_TESTARGS[@]} || die + ./stage3/bin/zig build test-run-translated-c ${ZIG_TESTARGS[@]} || die + ./stage3/bin/zig build test-std ${ZIG_TESTARGS[@]} || die } pkg_postinst() { |