diff options
| author |   Eric Joldasov <bratishkaerik@getgoogleoff.me> | 2022-07-27 03:33:45 +0600 |
|---|---|---|
| committer |   Jakov Smolić <jsmolic@gentoo.org> | 2022-08-22 10:16:09 +0200 |
| commit | 7b3b491cb416d13765051c3957ccb7d624a4d61b (patch) | |
| tree | dfbdcb7c175e0512a5d20cf41969328ef0762597 /dev-lang/zig | |
| parent | dev-lang/zig: block dev-lang/zig-bin, add risv stage0 patch for 0.9.1 (diff) | |
| download | gentoo-7b3b491cb416d13765051c3957ccb7d624a4d61b.tar.gz gentoo-7b3b491cb416d13765051c3957ccb7d624a4d61b.tar.bz2 gentoo-7b3b491cb416d13765051c3957ccb7d624a4d61b.zip | |
dev-lang/zig: block dev-lang/zig-bin and some fixes for 9999
cmake_src_install already installs lib/, so we should skip this in
stage2
-DZIG_PREFER_CLANG_CPP_DYLIB has been renamed
to -DZIG_SHARED_LLVM, see https://github.com/ziglang/zig/pull/12136
Closes: https://bugs.gentoo.org/864247
Closes: https://github.com/gentoo/gentoo/pull/26779
Co-authored-by: Rahim Usubov <the.guard@mail.ru>
Signed-off-by: Eric Joldasov <bratishkaerik@getgoogleoff.me>
Signed-off-by: Jakov Smolić <jsmolic@gentoo.org>
Diffstat (limited to 'dev-lang/zig')
| -rw-r--r-- | dev-lang/zig/zig-9999.ebuild | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/dev-lang/zig/zig-9999.ebuild b/dev-lang/zig/zig-9999.ebuild index c081a14b93c0..32a064ec02fc 100644 --- a/dev-lang/zig/zig-9999.ebuild +++ b/dev-lang/zig/zig-9999.ebuild @@ -23,14 +23,18 @@ RESTRICT="!test? ( test )" BUILD_DIR="${S}/build" -RDEPEND=" +DEPEND=" sys-devel/clang:${LLVM_MAX_SLOT} >=sys-devel/lld-${LLVM_MAX_SLOT} <sys-devel/lld-$((${LLVM_MAX_SLOT} + 1)) sys-devel/llvm:${LLVM_MAX_SLOT} >=sys-libs/zlib-1.2.12 " -DEPEND="${RDEPEND}" + +RDEPEND=" + ${DEPEND} + !dev-lang/zig-bin +" llvm_check_deps() { has_version "sys-devel/clang:${LLVM_SLOT}" @@ -50,8 +54,8 @@ pkg_setup() { src_configure() { local mycmakeargs=( -DZIG_USE_CCACHE=OFF - -DZIG_PREFER_CLANG_CPP_DYLIB=ON - -DZIG_SINGLE_THREADED="$(usex threads OFF ON)" + -DZIG_SHARED_LLVM=ON + -DZIG_SINGLE_THREADED="$(usex !threads)" ) cmake_src_configure @@ -62,7 +66,7 @@ src_compile() { if use stage2 ; then cd "${BUILD_DIR}" || die - ./zig build -p stage2 -Dstatic-llvm=false -Denable-llvm=true -Dsingle-threaded="$(usex threads false true)" || die + ./zig build -p stage2 -Dstatic-llvm=false -Denable-llvm=true -Dsingle-threaded="$(usex threads false true)" -Dskip-install-lib-files=true --verbose || die fi } @@ -74,15 +78,11 @@ src_test() { src_install() { cmake_src_install - if use stage2 ; then - cd "${BUILD_DIR}" || die - mv ./stage2/bin/zig zig-stage2 || die - dobin zig-stage2 - fi + use stage2 && newbin "${BUILD_DIR}/stage2/bin/zig" zig-stage2 } # see https://github.com/ziglang/zig/issues/3382 -QA_FLAGS_IGNORED="/usr/bin/zig-stage2" +QA_FLAGS_IGNORED="usr/bin/zig-stage2" pkg_postinst() { use stage2 && elog "You enabled stage2 USE flag, Zig stage1 was installed as /usr/bin/zig, Zig stage2 was installed as /usr/bin/zig-stage2" |