* [gentoo-commits] repo/gentoo:master commit in: dev-lang/zig/
@ 2023-07-27 11:45 Sam James
0 siblings, 0 replies; 72+ messages in thread
From: Sam James @ 2023-07-27 11:45 UTC (permalink / raw
To: gentoo-commits
commit: 04a33463261c264137b6e4466cb83c0695d3f6d6
Author: Eric Joldasov <bratishkaerik <AT> getgoogleoff <DOT> me>
AuthorDate: Wed Jul 26 08:52:40 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Jul 27 11:45:27 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=04a33463
dev-lang/zig: make doc generation for 9999 more reliable
Use build system steps for automatically following latest changes in doc-generation.
This means less frequent breakage, which is good.
Signed-off-by: Eric Joldasov <bratishkaerik <AT> getgoogleoff.me>
Closes: https://github.com/gentoo/gentoo/pull/32052
Signed-off-by: Sam James <sam <AT> gentoo.org>
dev-lang/zig/zig-9999.ebuild | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/dev-lang/zig/zig-9999.ebuild b/dev-lang/zig/zig-9999.ebuild
index 41467b2d0539..1644ef100c5c 100644
--- a/dev-lang/zig/zig-9999.ebuild
+++ b/dev-lang/zig/zig-9999.ebuild
@@ -126,8 +126,8 @@ src_compile() {
if use doc; then
cd "${BUILD_DIR}" || die
- edo ./stage3/bin/zig run ../doc/docgen.zig -- --zig ./stage3/bin/zig ../doc/langref.html.in "${S}/langref.html"
- edo ./stage3/bin/zig test ../lib/std/std.zig --zig-lib-dir ../lib -fno-emit-bin -femit-docs="${S}/std"
+ edo ./stage3/bin/zig build std-docs --prefix "${S}/docgen/"
+ edo ./stage3/bin/zig build langref --prefix "${S}/docgen/"
fi
}
@@ -148,7 +148,7 @@ src_test() {
}
src_install() {
- use doc && local HTML_DOCS=( "langref.html" "std" )
+ use doc && local HTML_DOCS=( "docgen/doc/langref.html" "docgen/doc/std" )
cmake_src_install
cd "${ED}/usr/$(get_libdir)/zig/${PV}/" || die
^ permalink raw reply related [flat|nested] 72+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-lang/zig/
@ 2025-02-17 1:52 Sam James
0 siblings, 0 replies; 72+ messages in thread
From: Sam James @ 2025-02-17 1:52 UTC (permalink / raw
To: gentoo-commits
commit: 9c26c480a223bbc97a4496652afff4a7e219cea2
Author: Eric Joldasov <bratishkaerik <AT> landless-city <DOT> net>
AuthorDate: Sun Feb 16 17:59:02 2025 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Feb 17 01:49:59 2025 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9c26c480
dev-lang/zig: do not die on `eselect` in `pkg_postrm` (leftover)
Signed-off-by: Eric Joldasov <bratishkaerik <AT> landless-city.net>
Closes: https://github.com/gentoo/gentoo/pull/40598
Signed-off-by: Sam James <sam <AT> gentoo.org>
dev-lang/zig/zig-0.13.0-r3.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-lang/zig/zig-0.13.0-r3.ebuild b/dev-lang/zig/zig-0.13.0-r3.ebuild
index 15de59370bbb..d893e2e33ea2 100644
--- a/dev-lang/zig/zig-0.13.0-r3.ebuild
+++ b/dev-lang/zig/zig-0.13.0-r3.ebuild
@@ -351,5 +351,5 @@ pkg_postinst() {
}
pkg_postrm() {
- eselect zig update ifunset || die
+ eselect zig update ifunset
}
^ permalink raw reply related [flat|nested] 72+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-lang/zig/
@ 2025-02-16 16:29 Sam James
0 siblings, 0 replies; 72+ messages in thread
From: Sam James @ 2025-02-16 16:29 UTC (permalink / raw
To: gentoo-commits
commit: 9cbe02e307e7f552415f5bc8ab19dfcd2aecad6e
Author: Eric Joldasov <bratishkaerik <AT> landless-city <DOT> net>
AuthorDate: Tue Feb 4 16:51:58 2025 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Feb 16 16:28:11 2025 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9cbe02e3
dev-lang/zig: do not die on `eselect` in `pkg_postrm`
Per PMS:
> Ebuilds are allowed to call them in pkg_preinst and pkg_postinst.
> Ebuilds may also call them in pkg_prerm and pkg_postrm but must not
> rely on them being available.
Bug: https://bugs.gentoo.org/949225
Signed-off-by: Eric Joldasov <bratishkaerik <AT> landless-city.net>
Signed-off-by: Sam James <sam <AT> gentoo.org>
dev-lang/zig/zig-0.13.0-r2.ebuild | 2 +-
dev-lang/zig/zig-9999.ebuild | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/dev-lang/zig/zig-0.13.0-r2.ebuild b/dev-lang/zig/zig-0.13.0-r2.ebuild
index d8fa77b14495..a17a501b392e 100644
--- a/dev-lang/zig/zig-0.13.0-r2.ebuild
+++ b/dev-lang/zig/zig-0.13.0-r2.ebuild
@@ -271,5 +271,5 @@ pkg_postinst() {
}
pkg_postrm() {
- eselect zig update ifunset || die
+ eselect zig update ifunset
}
diff --git a/dev-lang/zig/zig-9999.ebuild b/dev-lang/zig/zig-9999.ebuild
index bf7387685f3c..8fb29ab10b9e 100644
--- a/dev-lang/zig/zig-9999.ebuild
+++ b/dev-lang/zig/zig-9999.ebuild
@@ -344,5 +344,5 @@ pkg_postinst() {
}
pkg_postrm() {
- eselect zig update ifunset || die
+ eselect zig update ifunset
}
^ permalink raw reply related [flat|nested] 72+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-lang/zig/
@ 2025-02-16 16:25 Sam James
0 siblings, 0 replies; 72+ messages in thread
From: Sam James @ 2025-02-16 16:25 UTC (permalink / raw
To: gentoo-commits
commit: b5ac3a5296fd73fbd9efe3443724e6547222e815
Author: sin-ack <sin-ack <AT> protonmail <DOT> com>
AuthorDate: Fri Feb 14 19:33:11 2025 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Feb 16 16:24:53 2025 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b5ac3a52
dev-lang/zig: warn user about `binfmt_misc` when running tests
If binfmt_misc hooks are installed for QEMU, then running Zig tests will
fail because Zig attempts to run executables during tests that may be
from foreign architectures. Normally this would raise an "exec format
error" failure which Zig handles but binfmt_misc hooks turn it into a
"missing interpreter" error instead which is not handled.
Signed-off-by: Eric Joldasov <bratishkaerik <AT> landless-city.net>
Signed-off-by: Sam James <sam <AT> gentoo.org>
dev-lang/zig/zig-0.13.0-r2.ebuild | 7 +++++++
dev-lang/zig/zig-9999.ebuild | 7 +++++++
2 files changed, 14 insertions(+)
diff --git a/dev-lang/zig/zig-0.13.0-r2.ebuild b/dev-lang/zig/zig-0.13.0-r2.ebuild
index 2b05516cbff1..d8fa77b14495 100644
--- a/dev-lang/zig/zig-0.13.0-r2.ebuild
+++ b/dev-lang/zig/zig-0.13.0-r2.ebuild
@@ -209,6 +209,13 @@ src_compile() {
}
src_test() {
+ if has_version -b app-emulation/qemu; then
+ ewarn "QEMU executable was found on your building system."
+ ewarn "If you have qemu-binfmt (binfmt_misc) hooks enabled for"
+ ewarn "foreign architectures, Zig tests might fail."
+ ewarn "In this case, please disable qemu-binfmt and try again."
+ fi
+
cd "${BUILD_DIR}" || die
# XXX: When we pass a libc installation to Zig, it will fail to find
diff --git a/dev-lang/zig/zig-9999.ebuild b/dev-lang/zig/zig-9999.ebuild
index cb7c8e8bffc1..9fe4558461eb 100644
--- a/dev-lang/zig/zig-9999.ebuild
+++ b/dev-lang/zig/zig-9999.ebuild
@@ -202,6 +202,13 @@ src_compile() {
}
src_test() {
+ if has_version -b app-emulation/qemu; then
+ ewarn "QEMU executable was found on your building system."
+ ewarn "If you have qemu-binfmt (binfmt_misc) hooks enabled for"
+ ewarn "foreign architectures, Zig tests might fail."
+ ewarn "In this case, please disable qemu-binfmt and try again."
+ fi
+
cd "${BUILD_DIR}" || die
# XXX: When we pass a libc installation to Zig, it will fail to find
^ permalink raw reply related [flat|nested] 72+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-lang/zig/
@ 2025-02-16 16:25 Sam James
0 siblings, 0 replies; 72+ messages in thread
From: Sam James @ 2025-02-16 16:25 UTC (permalink / raw
To: gentoo-commits
commit: 6586ae03e438478e8c2db09b2355b519043c2760
Author: sin-ack <sin-ack <AT> protonmail <DOT> com>
AuthorDate: Fri Feb 14 19:46:57 2025 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Feb 16 16:24:54 2025 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6586ae03
dev-lang/zig: guard `stage3` calls when cross-compiling
They can't be run when cross-compiling unless user has qemu static-usr
enabled and used, which we can't check in ebuild. Therefore, we need to
also disallow docs building when cross-compiling for the time being.
Signed-off-by: Eric Joldasov <bratishkaerik <AT> landless-city.net>
Signed-off-by: Sam James <sam <AT> gentoo.org>
dev-lang/zig/zig-0.13.0-r3.ebuild | 14 +++++++++++---
dev-lang/zig/zig-9999.ebuild | 14 +++++++++++---
2 files changed, 22 insertions(+), 6 deletions(-)
diff --git a/dev-lang/zig/zig-0.13.0-r3.ebuild b/dev-lang/zig/zig-0.13.0-r3.ebuild
index 5d982900f831..97bcdb764771 100644
--- a/dev-lang/zig/zig-0.13.0-r3.ebuild
+++ b/dev-lang/zig/zig-0.13.0-r3.ebuild
@@ -99,6 +99,11 @@ pkg_setup() {
llvm-r1_pkg_setup
fi
+ # Requires running stage3 which is built for cross-target.
+ if use doc && tc-is-cross-compiler; then
+ die "USE=doc is not yet supported when cross-compiling"
+ fi
+
check-reqs_pkg_setup
}
@@ -204,10 +209,13 @@ src_compile() {
cd "${BUILD_DIR}" || die
ZIG_EXE="./zig2" zig_src_compile --prefix "${BUILD_DIR}/stage3/"
- ./stage3/bin/zig env || die "Zig compilation failed"
+ # Requires running stage3 which is built for cross-target.
+ if ! tc-is-cross-compiler; then
+ ./stage3/bin/zig env || die "Zig compilation failed"
- if use doc; then
- ZIG_EXE="./stage3/bin/zig" zig_src_compile langref --prefix "${S}/docgen/"
+ if use doc; then
+ ZIG_EXE="./stage3/bin/zig" zig_src_compile langref --prefix "${S}/docgen/"
+ fi
fi
}
diff --git a/dev-lang/zig/zig-9999.ebuild b/dev-lang/zig/zig-9999.ebuild
index dda68889ca43..6b440c6bb88b 100644
--- a/dev-lang/zig/zig-9999.ebuild
+++ b/dev-lang/zig/zig-9999.ebuild
@@ -92,6 +92,11 @@ pkg_setup() {
llvm-r1_pkg_setup
fi
+ # Requires running stage3 which is built for cross-target.
+ if use doc && tc-is-cross-compiler; then
+ die "USE=doc is not yet supported when cross-compiling"
+ fi
+
check-reqs_pkg_setup
}
@@ -197,10 +202,13 @@ src_compile() {
cd "${BUILD_DIR}" || die
ZIG_EXE="./zig2" zig_src_compile --prefix "${BUILD_DIR}/stage3/"
- ./stage3/bin/zig env || die "Zig compilation failed"
+ # Requires running stage3 which is built for cross-target.
+ if ! tc-is-cross-compiler; then
+ ./stage3/bin/zig env || die "Zig compilation failed"
- if use doc; then
- ZIG_EXE="./stage3/bin/zig" zig_src_compile langref --prefix "${S}/docgen/"
+ if use doc; then
+ ZIG_EXE="./stage3/bin/zig" zig_src_compile langref --prefix "${S}/docgen/"
+ fi
fi
}
^ permalink raw reply related [flat|nested] 72+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-lang/zig/
@ 2025-02-16 16:25 Sam James
0 siblings, 0 replies; 72+ messages in thread
From: Sam James @ 2025-02-16 16:25 UTC (permalink / raw
To: gentoo-commits
commit: eaaa8b9b68a6d7c6f8d36bced910856c0860413f
Author: Eric Joldasov <bratishkaerik <AT> landless-city <DOT> net>
AuthorDate: Tue Dec 17 21:23:02 2024 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Feb 16 16:24:54 2025 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=eaaa8b9b
dev-lang/zig: add `debug` USE-flag
Controls debug extensions such as `zig dump-zir` or
`zig build-exe --debug-compile-errors` and can change default when
building Zig itself from `ReleaseFast` to `ReleaseSafe`.
Signed-off-by: Eric Joldasov <bratishkaerik <AT> landless-city.net>
Signed-off-by: Sam James <sam <AT> gentoo.org>
dev-lang/zig/metadata.xml | 1 +
dev-lang/zig/{zig-9999.ebuild => zig-0.13.0-r3.ebuild} | 16 +++++++++++++---
dev-lang/zig/zig-9999.ebuild | 7 +++++--
3 files changed, 19 insertions(+), 5 deletions(-)
diff --git a/dev-lang/zig/metadata.xml b/dev-lang/zig/metadata.xml
index 2364982009cc..34e44a88bfa3 100644
--- a/dev-lang/zig/metadata.xml
+++ b/dev-lang/zig/metadata.xml
@@ -10,6 +10,7 @@
<name>Proxy Maintainers</name>
</maintainer>
<use>
+ <flag name="debug">Build with debug extensions enabled.</flag>
<flag name="llvm">Build with LLVM backend and extensions enabled.</flag>
</use>
<upstream>
diff --git a/dev-lang/zig/zig-9999.ebuild b/dev-lang/zig/zig-0.13.0-r3.ebuild
similarity index 93%
copy from dev-lang/zig/zig-9999.ebuild
copy to dev-lang/zig/zig-0.13.0-r3.ebuild
index 9fe4558461eb..5d982900f831 100644
--- a/dev-lang/zig/zig-9999.ebuild
+++ b/dev-lang/zig/zig-0.13.0-r3.ebuild
@@ -3,7 +3,7 @@
EAPI=8
-LLVM_COMPAT=( 19 )
+LLVM_COMPAT=( 18 )
LLVM_OPTIONAL=1
ZIG_SLOT="$(ver_cut 1-2)"
@@ -24,6 +24,7 @@ else
SRC_URI="
https://ziglang.org/download/${PV}/${P}.tar.xz
verify-sig? ( https://ziglang.org/download/${PV}/${P}.tar.xz.minisig )
+ https://codeberg.org/BratishkaErik/distfiles/releases/download/dev-lang%2Fzig-${PV}/${P}-llvm-18.1.8-r6-fix.patch
"
KEYWORDS="~amd64 ~arm ~arm64"
@@ -43,7 +44,7 @@ fi
# lib/libc/glibc: BSD HPND ISC inner-net LGPL-2.1+
LICENSE="MIT Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT ) || ( Apache-2.0-with-LLVM-exceptions Apache-2.0 MIT BSD-2 ) public-domain BSD-2 ZPL ISC HPND BSD inner-net LGPL-2.1+"
SLOT="${ZIG_SLOT}"
-IUSE="doc +llvm"
+IUSE="debug doc +llvm"
REQUIRED_USE="
!llvm? ( !doc )
llvm? ( ${LLVM_REQUIRED_USE} )
@@ -74,6 +75,12 @@ IDEPEND="app-eselect/eselect-zig"
DOCS=( "README.md" "doc/build.zig.zon.md" )
+PATCHES=(
+ "${FILESDIR}/zig-0.13.0-test-std-kernel-version.patch"
+ "${FILESDIR}/zig-0.13.0-skip-test-stack_iterator.patch"
+ "${DISTDIR}/${P}-llvm-18.1.8-r6-fix.patch"
+)
+
# zig.eclass does not set this for us since we use ZIG_OPTIONAL=1
QA_FLAGS_IGNORED="usr/.*/zig/${PV}/bin/zig"
@@ -142,7 +149,10 @@ src_configure() {
-Dno-langref
-Dstd-docs=false
- --release=fast
+ # More commands and options if "debug" is enabled.
+ -Ddebug-extensions=$(usex debug true false)
+ # More asserts and so on by default if "debug" is enabled.
+ --release=$(usex debug safe fast)
)
if use llvm; then
my_zbs_args+=(
diff --git a/dev-lang/zig/zig-9999.ebuild b/dev-lang/zig/zig-9999.ebuild
index 9fe4558461eb..dda68889ca43 100644
--- a/dev-lang/zig/zig-9999.ebuild
+++ b/dev-lang/zig/zig-9999.ebuild
@@ -43,7 +43,7 @@ fi
# lib/libc/glibc: BSD HPND ISC inner-net LGPL-2.1+
LICENSE="MIT Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT ) || ( Apache-2.0-with-LLVM-exceptions Apache-2.0 MIT BSD-2 ) public-domain BSD-2 ZPL ISC HPND BSD inner-net LGPL-2.1+"
SLOT="${ZIG_SLOT}"
-IUSE="doc +llvm"
+IUSE="debug doc +llvm"
REQUIRED_USE="
!llvm? ( !doc )
llvm? ( ${LLVM_REQUIRED_USE} )
@@ -142,7 +142,10 @@ src_configure() {
-Dno-langref
-Dstd-docs=false
- --release=fast
+ # More commands and options if "debug" is enabled.
+ -Ddebug-extensions=$(usex debug true false)
+ # More asserts and so on by default if "debug" is enabled.
+ --release=$(usex debug safe fast)
)
if use llvm; then
my_zbs_args+=(
^ permalink raw reply related [flat|nested] 72+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-lang/zig/
@ 2025-02-16 16:25 Sam James
0 siblings, 0 replies; 72+ messages in thread
From: Sam James @ 2025-02-16 16:25 UTC (permalink / raw
To: gentoo-commits
commit: aec404d30863f2304c1f593ac2a3161b5c2e9534
Author: Eric Joldasov <bratishkaerik <AT> landless-city <DOT> net>
AuthorDate: Wed Dec 18 21:41:13 2024 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Feb 16 16:24:55 2025 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=aec404d3
dev-lang/zig: use `llvm-r2.eclass`, add cross-compilation support for `USE=llvm`
Signed-off-by: Eric Joldasov <bratishkaerik <AT> landless-city.net>
Closes: https://github.com/gentoo/gentoo/pull/39765
Signed-off-by: Sam James <sam <AT> gentoo.org>
dev-lang/zig/zig-0.13.0-r3.ebuild | 127 +++++++++++++++++++++++++++++---------
dev-lang/zig/zig-9999.ebuild | 127 +++++++++++++++++++++++++++++---------
2 files changed, 196 insertions(+), 58 deletions(-)
diff --git a/dev-lang/zig/zig-0.13.0-r3.ebuild b/dev-lang/zig/zig-0.13.0-r3.ebuild
index 97bcdb764771..15de59370bbb 100644
--- a/dev-lang/zig/zig-0.13.0-r3.ebuild
+++ b/dev-lang/zig/zig-0.13.0-r3.ebuild
@@ -9,7 +9,7 @@ LLVM_OPTIONAL=1
ZIG_SLOT="$(ver_cut 1-2)"
ZIG_OPTIONAL=1
-inherit check-reqs cmake flag-o-matic edo llvm-r1 toolchain-funcs zig
+inherit check-reqs cmake flag-o-matic edo llvm-r2 toolchain-funcs zig
DESCRIPTION="A robust, optimal, and maintainable programming language"
HOMEPAGE="https://ziglang.org/ https://github.com/ziglang/zig/"
@@ -58,18 +58,14 @@ BUILD_DIR="${WORKDIR}/${P}_build"
# They are not required "on their own", so please don't add them here.
# You can check https://github.com/ziglang/zig-bootstrap in future, to see
# options that are passed to LLVM CMake building (excluding "static" ofc).
-DEPEND="
- llvm? (
- $(llvm_gen_dep '
- llvm-core/clang:${LLVM_SLOT}
- llvm-core/lld:${LLVM_SLOT}
- llvm-core/llvm:${LLVM_SLOT}[zstd]
- ')
- )
-"
-BDEPEND+="
- ${DEPEND}
-"
+LLVM_DEPEND="$(llvm_gen_dep '
+ llvm-core/clang:${LLVM_SLOT}
+ llvm-core/lld:${LLVM_SLOT}[zstd]
+ llvm-core/llvm:${LLVM_SLOT}[zstd]
+')"
+
+BDEPEND+=" llvm? ( ${LLVM_DEPEND} )"
+DEPEND="llvm? ( ${LLVM_DEPEND} )"
RDEPEND="${DEPEND}"
IDEPEND="app-eselect/eselect-zig"
@@ -90,13 +86,13 @@ CHECKREQS_MEMORY="4G"
pkg_setup() {
# Skip detecting zig executable.
- ZIG_EXE="not-applicable" ZIG_VER="${PV}" zig_pkg_setup
+ declare -r -g ZIG_VER="${PV}"
+ ZIG_EXE="not-applicable" zig_pkg_setup
- export ZIG_SYS_INSTALL_DEST="${EPREFIX}/usr/$(get_libdir)/zig/${PV}"
+ declare -r -g ZIG_SYS_INSTALL_DEST="${EPREFIX}/usr/$(get_libdir)/zig/${PV}"
if use llvm; then
- tc-is-cross-compiler && die "USE=llvm is not yet supported when cross-compiling"
- llvm-r1_pkg_setup
+ [[ ${MERGE_TYPE} != binary ]] && llvm_cbuild_setup
fi
# Requires running stage3 which is built for cross-target.
@@ -151,7 +147,7 @@ src_configure() {
--prefix-lib-dir lib/
# These are built separately
- -Dno-langref
+ -Dno-langref=true
-Dstd-docs=false
# More commands and options if "debug" is enabled.
@@ -159,6 +155,32 @@ src_configure() {
# More asserts and so on by default if "debug" is enabled.
--release=$(usex debug safe fast)
)
+
+ # Scenarios of compilation:
+
+ # With LLVM, native:
+ # CMake:
+ # * generate "config.h" for LLVM libraries and build "zigcpp"
+ # * build "zig2" using common "config.h" and "zigcpp"
+ # build.zig:
+ # * build "stage3" using common "config.h" and "zigcpp"
+
+ # With LLVM, cross-compiled:
+ # CMake:
+ # * generate cross-target "config.h" for LLVM libraries from ESYSROOT
+ # and build cross-target "zigcpp", and stash them away
+ # * generate native "config.h" for LLVM libraries from BROOT and
+ # build native "zigcpp"
+ # * build native "zig2" using native "config.h" and "zigcpp"
+ # build.zig:
+ # * build cross-target "stage3" using stashed "config.h" and "zigcpp"
+
+ # Without LLVM:
+ # bootstrap.c:
+ # * build native "zig2"
+ # build.zig:
+ # * build (cross-)target "stage3"
+
if use llvm; then
my_zbs_args+=(
-Denable-llvm=true
@@ -170,31 +192,78 @@ src_configure() {
-Denable-llvm=false
)
fi
-
zig_src_configure
if use llvm; then
- # Build for native only, it's for zig2 (build-time executable)
- # LLVM from BDEPEND
local mycmakeargs=(
-DZIG_SHARED_LLVM=ON
-DZIG_USE_LLVM_CONFIG=ON
-
- -DZIG_TARGET_TRIPLE=native
- -DZIG_TARGET_MCPU=native
-DZIG_HOST_TARGET_TRIPLE="${ZIG_HOST_AS_TARGET}"
-
- -DCMAKE_PREFIX_PATH="$(get_llvm_prefix -b)"
- -DCMAKE_INSTALL_PREFIX="${ZIG_SYS_INSTALL_DEST}"
+ # Don't set ZIG_TARGET_TRIPLE, ZIG_TARGET_MCPU and
+ # CMAKE_INSTALL_PREFIX because we build up to zig2 max,
+ # after that "zig build" is used to compile stage3.
+
+ # Don't set CMAKE_PREFIX_PATH because "llvm_chost_setup"
+ # and "llvm_cbuild_setup" already set PATH in such way
+ # that suitable llvm-config is found and used in
+ # "cmake/Findllvm.cmake", and "cmake.eclass" help with
+ # cross-compilation pathes for "Findclang" and "Findlld".
+
+ # CMP0144, Zig has own packages with these names, so ignore
+ # LLVM_ROOT, Clang_ROOT, LLD_ROOT from "llvm_chost_setup".
+ -DCMAKE_FIND_USE_PACKAGE_ROOT_PATH=OFF
)
+ if tc-is-cross-compiler; then
+ # Enable cross-compilation for CMake when filling "config.h"
+ # and building "zigcpp". They would be used for stage3 build.
+ # Here we are using LLVM from ESYSROOT/DEPEND.
+ # Uses script llvm-config.
+
+ # Isolate PATH changes in subshell so that it would not
+ # affect next `cmake_src_configure` with BROOT/BDEPEND.
+ (
+ llvm_chost_setup
+ cmake_src_configure
+ cmake_build zigcpp
+ )
+
+ mv "${BUILD_DIR}/config.h" "${T}/target_config.h" || die
+ mv "${BUILD_DIR}/zigcpp/" "${T}/target_zigcpp/" || die
+ rm -rf "${BUILD_DIR}" || die
+ fi
- cmake_src_configure
+ # Force disable cross-compilation for CMake when building "zig2".
+ # Here we are using LLVM from BROOT/BDEPEND.
+ # Uses native llvm-config.
+
+ # Isolate environment changes in subshell so that it would not
+ # affect next phases.
+ (
+ export BUILD_CFLAGS="${CFLAGS}"
+ export BUILD_CXXFLAGS="${CXXFLAGS}"
+ export BUILD_CPPFLAGS="${CPPFLAGS}"
+ export BUILD_LDFLAGS="${LDFLAGS}"
+ tc-env_build
+
+ unset SYSROOT
+ export CHOST="${CBUILD:-${CHOST}}"
+ strip-unsupported-flags
+ cmake_src_configure
+ )
fi
}
src_compile() {
if use llvm; then
cmake_build zig2
+
+ if tc-is-cross-compiler; then
+ rm -rf "${BUILD_DIR}/zigcpp/" || die
+ rm -f "${BUILD_DIR}/config.h" || die
+
+ mv "${T}/target_zigcpp/" "${BUILD_DIR}/zigcpp/" || die
+ mv "${T}/target_config.h" "${BUILD_DIR}/config.h" || die
+ fi
else
cd "${BUILD_DIR}" || die
ln -s "${S}/stage1/" . || die
@@ -207,7 +276,7 @@ src_compile() {
fi
cd "${BUILD_DIR}" || die
- ZIG_EXE="./zig2" zig_src_compile --prefix "${BUILD_DIR}/stage3/"
+ ZIG_EXE="./zig2" zig_src_compile --prefix stage3/
# Requires running stage3 which is built for cross-target.
if ! tc-is-cross-compiler; then
diff --git a/dev-lang/zig/zig-9999.ebuild b/dev-lang/zig/zig-9999.ebuild
index 6b440c6bb88b..bf7387685f3c 100644
--- a/dev-lang/zig/zig-9999.ebuild
+++ b/dev-lang/zig/zig-9999.ebuild
@@ -9,7 +9,7 @@ LLVM_OPTIONAL=1
ZIG_SLOT="$(ver_cut 1-2)"
ZIG_OPTIONAL=1
-inherit check-reqs cmake flag-o-matic edo llvm-r1 toolchain-funcs zig
+inherit check-reqs cmake flag-o-matic edo llvm-r2 toolchain-funcs zig
DESCRIPTION="A robust, optimal, and maintainable programming language"
HOMEPAGE="https://ziglang.org/ https://github.com/ziglang/zig/"
@@ -57,18 +57,14 @@ BUILD_DIR="${WORKDIR}/${P}_build"
# They are not required "on their own", so please don't add them here.
# You can check https://github.com/ziglang/zig-bootstrap in future, to see
# options that are passed to LLVM CMake building (excluding "static" ofc).
-DEPEND="
- llvm? (
- $(llvm_gen_dep '
- llvm-core/clang:${LLVM_SLOT}
- llvm-core/lld:${LLVM_SLOT}
- llvm-core/llvm:${LLVM_SLOT}[zstd]
- ')
- )
-"
-BDEPEND+="
- ${DEPEND}
-"
+LLVM_DEPEND="$(llvm_gen_dep '
+ llvm-core/clang:${LLVM_SLOT}
+ llvm-core/lld:${LLVM_SLOT}[zstd]
+ llvm-core/llvm:${LLVM_SLOT}[zstd]
+')"
+
+BDEPEND+=" llvm? ( ${LLVM_DEPEND} )"
+DEPEND="llvm? ( ${LLVM_DEPEND} )"
RDEPEND="${DEPEND}"
IDEPEND="app-eselect/eselect-zig"
@@ -83,13 +79,13 @@ CHECKREQS_MEMORY="4G"
pkg_setup() {
# Skip detecting zig executable.
- ZIG_EXE="not-applicable" ZIG_VER="${PV}" zig_pkg_setup
+ declare -r -g ZIG_VER="${PV}"
+ ZIG_EXE="not-applicable" zig_pkg_setup
- export ZIG_SYS_INSTALL_DEST="${EPREFIX}/usr/$(get_libdir)/zig/${PV}"
+ declare -r -g ZIG_SYS_INSTALL_DEST="${EPREFIX}/usr/$(get_libdir)/zig/${PV}"
if use llvm; then
- tc-is-cross-compiler && die "USE=llvm is not yet supported when cross-compiling"
- llvm-r1_pkg_setup
+ [[ ${MERGE_TYPE} != binary ]] && llvm_cbuild_setup
fi
# Requires running stage3 which is built for cross-target.
@@ -144,7 +140,7 @@ src_configure() {
--prefix-lib-dir lib/
# These are built separately
- -Dno-langref
+ -Dno-langref=true
-Dstd-docs=false
# More commands and options if "debug" is enabled.
@@ -152,6 +148,32 @@ src_configure() {
# More asserts and so on by default if "debug" is enabled.
--release=$(usex debug safe fast)
)
+
+ # Scenarios of compilation:
+
+ # With LLVM, native:
+ # CMake:
+ # * generate "config.h" for LLVM libraries and build "zigcpp"
+ # * build "zig2" using common "config.h" and "zigcpp"
+ # build.zig:
+ # * build "stage3" using common "config.h" and "zigcpp"
+
+ # With LLVM, cross-compiled:
+ # CMake:
+ # * generate cross-target "config.h" for LLVM libraries from ESYSROOT
+ # and build cross-target "zigcpp", and stash them away
+ # * generate native "config.h" for LLVM libraries from BROOT and
+ # build native "zigcpp"
+ # * build native "zig2" using native "config.h" and "zigcpp"
+ # build.zig:
+ # * build cross-target "stage3" using stashed "config.h" and "zigcpp"
+
+ # Without LLVM:
+ # bootstrap.c:
+ # * build native "zig2"
+ # build.zig:
+ # * build (cross-)target "stage3"
+
if use llvm; then
my_zbs_args+=(
-Denable-llvm=true
@@ -163,31 +185,78 @@ src_configure() {
-Denable-llvm=false
)
fi
-
zig_src_configure
if use llvm; then
- # Build for native only, it's for zig2 (build-time executable)
- # LLVM from BDEPEND
local mycmakeargs=(
-DZIG_SHARED_LLVM=ON
-DZIG_USE_LLVM_CONFIG=ON
-
- -DZIG_TARGET_TRIPLE=native
- -DZIG_TARGET_MCPU=native
-DZIG_HOST_TARGET_TRIPLE="${ZIG_HOST_AS_TARGET}"
-
- -DCMAKE_PREFIX_PATH="$(get_llvm_prefix -b)"
- -DCMAKE_INSTALL_PREFIX="${ZIG_SYS_INSTALL_DEST}"
+ # Don't set ZIG_TARGET_TRIPLE, ZIG_TARGET_MCPU and
+ # CMAKE_INSTALL_PREFIX because we build up to zig2 max,
+ # after that "zig build" is used to compile stage3.
+
+ # Don't set CMAKE_PREFIX_PATH because "llvm_chost_setup"
+ # and "llvm_cbuild_setup" already set PATH in such way
+ # that suitable llvm-config is found and used in
+ # "cmake/Findllvm.cmake", and "cmake.eclass" help with
+ # cross-compilation pathes for "Findclang" and "Findlld".
+
+ # CMP0144, Zig has own packages with these names, so ignore
+ # LLVM_ROOT, Clang_ROOT, LLD_ROOT from "llvm_chost_setup".
+ -DCMAKE_FIND_USE_PACKAGE_ROOT_PATH=OFF
)
+ if tc-is-cross-compiler; then
+ # Enable cross-compilation for CMake when filling "config.h"
+ # and building "zigcpp". They would be used for stage3 build.
+ # Here we are using LLVM from ESYSROOT/DEPEND.
+ # Uses script llvm-config.
+
+ # Isolate PATH changes in subshell so that it would not
+ # affect next `cmake_src_configure` with BROOT/BDEPEND.
+ (
+ llvm_chost_setup
+ cmake_src_configure
+ cmake_build zigcpp
+ )
+
+ mv "${BUILD_DIR}/config.h" "${T}/target_config.h" || die
+ mv "${BUILD_DIR}/zigcpp/" "${T}/target_zigcpp/" || die
+ rm -rf "${BUILD_DIR}" || die
+ fi
- cmake_src_configure
+ # Force disable cross-compilation for CMake when building "zig2".
+ # Here we are using LLVM from BROOT/BDEPEND.
+ # Uses native llvm-config.
+
+ # Isolate environment changes in subshell so that it would not
+ # affect next phases.
+ (
+ export BUILD_CFLAGS="${CFLAGS}"
+ export BUILD_CXXFLAGS="${CXXFLAGS}"
+ export BUILD_CPPFLAGS="${CPPFLAGS}"
+ export BUILD_LDFLAGS="${LDFLAGS}"
+ tc-env_build
+
+ unset SYSROOT
+ export CHOST="${CBUILD:-${CHOST}}"
+ strip-unsupported-flags
+ cmake_src_configure
+ )
fi
}
src_compile() {
if use llvm; then
cmake_build zig2
+
+ if tc-is-cross-compiler; then
+ rm -rf "${BUILD_DIR}/zigcpp/" || die
+ rm -f "${BUILD_DIR}/config.h" || die
+
+ mv "${T}/target_zigcpp/" "${BUILD_DIR}/zigcpp/" || die
+ mv "${T}/target_config.h" "${BUILD_DIR}/config.h" || die
+ fi
else
cd "${BUILD_DIR}" || die
ln -s "${S}/stage1/" . || die
@@ -200,7 +269,7 @@ src_compile() {
fi
cd "${BUILD_DIR}" || die
- ZIG_EXE="./zig2" zig_src_compile --prefix "${BUILD_DIR}/stage3/"
+ ZIG_EXE="./zig2" zig_src_compile --prefix stage3/
# Requires running stage3 which is built for cross-target.
if ! tc-is-cross-compiler; then
^ permalink raw reply related [flat|nested] 72+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-lang/zig/
@ 2025-02-16 16:25 Sam James
0 siblings, 0 replies; 72+ messages in thread
From: Sam James @ 2025-02-16 16:25 UTC (permalink / raw
To: gentoo-commits
commit: 7cfe7beb5c3f0f0fee6137225b927acb457c2b5d
Author: sin-ack <sin-ack <AT> protonmail <DOT> com>
AuthorDate: Fri Feb 14 19:23:57 2025 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Feb 16 16:24:53 2025 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7cfe7beb
dev-lang/zig: do not pass `--libc` when running tests
When `--libc` is passed to `zig build test`, tests that cross-compile to
other OSes and architectures fail because the internal include paths
automatically configured by Zig are overridden by the libc installation
file.
Upstream issue: https://www.github.com/ziglang/zig/issues/22383
Signed-off-by: Eric Joldasov <bratishkaerik <AT> landless-city.net>
Signed-off-by: Sam James <sam <AT> gentoo.org>
dev-lang/zig/zig-0.13.0-r2.ebuild | 22 +++++++++++++++++++++-
dev-lang/zig/zig-9999.ebuild | 22 +++++++++++++++++++++-
2 files changed, 42 insertions(+), 2 deletions(-)
diff --git a/dev-lang/zig/zig-0.13.0-r2.ebuild b/dev-lang/zig/zig-0.13.0-r2.ebuild
index b970092ce4e4..2b05516cbff1 100644
--- a/dev-lang/zig/zig-0.13.0-r2.ebuild
+++ b/dev-lang/zig/zig-0.13.0-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2019-2024 Gentoo Authors
+# Copyright 2019-2025 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -210,7 +210,27 @@ src_compile() {
src_test() {
cd "${BUILD_DIR}" || die
+
+ # XXX: When we pass a libc installation to Zig, it will fail to find
+ # the bundled libraries for targets like aarch64-macos and
+ # *-linux-musl. Zig doesn't run binaries for these targets when
+ # -Dskip-non-native is passed, but they are still compiled, so
+ # the test will fail. There's no way to disable --libc once passed,
+ # so we need to strip it from ZBS_ARGS.
+ # See: https://github.com/ziglang/zig/issues/22383
+ local args_backup=("${ZBS_ARGS[@]}")
+
+ for ((i = 0; i < ${#ZBS_ARGS[@]}; i++)); do
+ if [[ "${ZBS_ARGS[i]}" == "--libc" ]]; then
+ unset ZBS_ARGS[i]
+ unset ZBS_ARGS[i+1]
+ break
+ fi
+ done
+
ZIG_EXE="./stage3/bin/zig" zig_src_test -Dskip-non-native
+
+ ZBS_ARGS=("${args_backup[@]}")
}
src_install() {
diff --git a/dev-lang/zig/zig-9999.ebuild b/dev-lang/zig/zig-9999.ebuild
index 4f0358a96629..cb7c8e8bffc1 100644
--- a/dev-lang/zig/zig-9999.ebuild
+++ b/dev-lang/zig/zig-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2019-2024 Gentoo Authors
+# Copyright 2019-2025 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -203,7 +203,27 @@ src_compile() {
src_test() {
cd "${BUILD_DIR}" || die
+
+ # XXX: When we pass a libc installation to Zig, it will fail to find
+ # the bundled libraries for targets like aarch64-macos and
+ # *-linux-musl. Zig doesn't run binaries for these targets when
+ # -Dskip-non-native is passed, but they are still compiled, so
+ # the test will fail. There's no way to disable --libc once passed,
+ # so we need to strip it from ZBS_ARGS.
+ # See: https://github.com/ziglang/zig/issues/22383
+ local args_backup=("${ZBS_ARGS[@]}")
+
+ for ((i = 0; i < ${#ZBS_ARGS[@]}; i++)); do
+ if [[ "${ZBS_ARGS[i]}" == "--libc" ]]; then
+ unset ZBS_ARGS[i]
+ unset ZBS_ARGS[i+1]
+ break
+ fi
+ done
+
ZIG_EXE="./stage3/bin/zig" zig_src_test -Dskip-non-native
+
+ ZBS_ARGS=("${args_backup[@]}")
}
src_install() {
^ permalink raw reply related [flat|nested] 72+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-lang/zig/
@ 2024-12-15 9:47 Sam James
0 siblings, 0 replies; 72+ messages in thread
From: Sam James @ 2024-12-15 9:47 UTC (permalink / raw
To: gentoo-commits
commit: b68ca211734f85e6a98efd2e5c1cb96e27a7998d
Author: Eric Joldasov <bratishkaerik <AT> getgoogleoff <DOT> me>
AuthorDate: Thu Jun 6 13:59:53 2024 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Dec 15 09:47:06 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b68ca211
dev-lang/zig: sync 9999 with 0.13.0-r2
* Update to use zig-utils and zig eclasses instead of local
get_zig_mcpu etc. functions.
* "stage3" compilation is unified by combining build.zig options,
now both cmake (+llvm) and bootstrap.c (-llvm) build up to "zig2"
target, after that we use zig.eclass with common options.
* Before migrating to the zig.eclass, test steps in src_test
have been ran sequentially in for-loop, which allowed logic inside
each step to ran parallelly but not several steps at a time. Now we
use upstream "test" step instead of separately calling all dependant
steps, so that build system can now ran all of them paralelly.
This means time spent in `src_test` is now significantly shorter.
* "zig2" in both scenarios now has explicit target which is set by
using zig-utils.eclass functions on a CBUILD/CHOST. This allows us
to skip convertion logic in CMake and bootstrap.c, so that instead
of patching them we can just update converter in zig-utils.eclass
and unify target behaviour.
* Disable autodocs generation for "std" module, since it can now
be generated on-fly with `zig std` command.
Signed-off-by: Eric Joldasov <bratishkaerik <AT> landless-city.net>
Signed-off-by: Sam James <sam <AT> gentoo.org>
dev-lang/zig/zig-9999.ebuild | 235 ++++++++++++++++++++++---------------------
1 file changed, 121 insertions(+), 114 deletions(-)
diff --git a/dev-lang/zig/zig-9999.ebuild b/dev-lang/zig/zig-9999.ebuild
index 858ec3be9405..4f0358a96629 100644
--- a/dev-lang/zig/zig-9999.ebuild
+++ b/dev-lang/zig/zig-9999.ebuild
@@ -6,10 +6,13 @@ EAPI=8
LLVM_COMPAT=( 19 )
LLVM_OPTIONAL=1
-inherit check-reqs cmake edo llvm-r1 toolchain-funcs
+ZIG_SLOT="$(ver_cut 1-2)"
+ZIG_OPTIONAL=1
+
+inherit check-reqs cmake flag-o-matic edo llvm-r1 toolchain-funcs zig
DESCRIPTION="A robust, optimal, and maintainable programming language"
-HOMEPAGE="https://ziglang.org/"
+HOMEPAGE="https://ziglang.org/ https://github.com/ziglang/zig/"
if [[ ${PV} == 9999 ]]; then
EGIT_REPO_URI="https://github.com/ziglang/zig.git"
inherit git-r3
@@ -39,14 +42,15 @@ fi
# lib/libc/mingw: ZPL public-domain BSD-2 ISC HPND
# lib/libc/glibc: BSD HPND ISC inner-net LGPL-2.1+
LICENSE="MIT Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT ) || ( Apache-2.0-with-LLVM-exceptions Apache-2.0 MIT BSD-2 ) public-domain BSD-2 ZPL ISC HPND BSD inner-net LGPL-2.1+"
-SLOT="$(ver_cut 1-2)"
+SLOT="${ZIG_SLOT}"
IUSE="doc +llvm"
REQUIRED_USE="
!llvm? ( !doc )
llvm? ( ${LLVM_REQUIRED_USE} )
"
-BUILD_DIR="${S}/build"
+# Used by both "cmake" and "zig" eclasses.
+BUILD_DIR="${WORKDIR}/${P}_build"
# Zig requires zstd and zlib compression support in LLVM, if using LLVM backend.
# (non-LLVM backends don't require these)
@@ -62,173 +66,176 @@ DEPEND="
')
)
"
-
-RDEPEND="
+BDEPEND+="
${DEPEND}
"
-
+RDEPEND="${DEPEND}"
IDEPEND="app-eselect/eselect-zig"
-# see https://github.com/ziglang/zig/issues/3382
-# For now, Zig Build System doesn't support enviromental CFLAGS/LDFLAGS/etc.
-QA_FLAGS_IGNORED="usr/.*/zig/${PV}/bin/zig"
+DOCS=( "README.md" "doc/build.zig.zon.md" )
-RESTRICT="!llvm? ( test )"
+# zig.eclass does not set this for us since we use ZIG_OPTIONAL=1
+QA_FLAGS_IGNORED="usr/.*/zig/${PV}/bin/zig"
# Since commit https://github.com/ziglang/zig/commit/e7d28344fa3ee81d6ad7ca5ce1f83d50d8502118
# Zig uses self-hosted compiler only
CHECKREQS_MEMORY="4G"
-ctarget_to_zigtarget() {
- # Zig's Target Format: arch-os-abi
- local CTARGET="${CTARGET:-${CHOST}}"
-
- local ZIG_ARCH
- case "${CTARGET%%-*}" in
- i?86) ZIG_ARCH=x86;;
- sparcv9) ZIG_ARCH=sparc64;;
- *) ZIG_ARCH="${CTARGET%%-*}";; # Same as in CHOST
- esac
-
- local ZIG_OS
- case "${CTARGET}" in
- *linux*) ZIG_OS=linux;;
- *apple*) ZIG_OS=macos;;
- esac
-
- local ZIG_ABI
- case "${CTARGET##*-}" in
- gnu) ZIG_ABI=gnu;;
- solaris*) ZIG_OS=solaris ZIG_ABI=none;;
- darwin*) ZIG_ABI=none;;
- *) ZIG_ABI="${CTARGET##*-}";; # Same as in CHOST
- esac
-
- echo "${ZIG_ARCH}-${ZIG_OS}-${ZIG_ABI}"
-}
+pkg_setup() {
+ # Skip detecting zig executable.
+ ZIG_EXE="not-applicable" ZIG_VER="${PV}" zig_pkg_setup
-get_zig_mcpu() {
- local ZIG_DEFAULT_MCPU=native
- tc-is-cross-compiler && ZIG_DEFAULT_MCPU=baseline
- echo "${ZIG_MCPU:-${ZIG_DEFAULT_MCPU}}"
-}
+ export ZIG_SYS_INSTALL_DEST="${EPREFIX}/usr/$(get_libdir)/zig/${PV}"
+
+ if use llvm; then
+ tc-is-cross-compiler && die "USE=llvm is not yet supported when cross-compiling"
+ llvm-r1_pkg_setup
+ fi
-get_zig_target() {
- local ZIG_DEFAULT_TARGET=native
- tc-is-cross-compiler && ZIG_DEFAULT_TARGET="$(ctarget_to_zigtarget)"
- echo "${ZIG_TARGET:-${ZIG_DEFAULT_TARGET}}"
+ check-reqs_pkg_setup
}
-pkg_setup() {
- # Useful for debugging and a little bit more deterministic.
- export ZIG_LOCAL_CACHE_DIR="${T}/zig-local-cache"
- export ZIG_GLOBAL_CACHE_DIR="${T}/zig-global-cache"
+src_unpack() {
+ if [[ ${PV} == 9999 ]]; then
+ git-r3_src_unpack
+ else
+ if use verify-sig; then
+ verify-sig_verify_detached "${DISTDIR}"/${P}.tar.xz{,.minisig}
+ fi
+ fi
+ zig_src_unpack
+}
- export ZIG_SYS_INSTALL_DEST="${EPREFIX}/usr/$(get_libdir)/zig/${PV}"
+src_prepare() {
+ if use llvm; then
+ cmake_src_prepare
+ else
+ # Sync with zig_src_prepare
+ default_src_prepare
+ mkdir -p "${BUILD_DIR}" || die
+ einfo "BUILD_DIR: \"${BUILD_DIR}\""
+ # "--system" mode is not used during bootstrap.
+ fi
- use llvm && llvm-r1_pkg_setup
- check-reqs_pkg_setup
+ # Remove "limit memory usage" flags, it's already verified by
+ # CHECKREQS_MEMORY and causes unneccessary errors. Upstream set them
+ # according to CI OOM failures, which are not applicable to normal Gentoo build.
+ sed -i -e '/\.max_rss = .*,/d' build.zig || die
}
src_configure() {
- if ! use llvm; then
- mkdir -p "${BUILD_DIR}/stage3" || die
- # Currently, Zig without LLVM extensions lacks most optimizations.
- export ZIG_BOOTSTRAP_STAGE3_FLAGS=(
- -Dtarget="$(get_zig_target)"
- -Dcpu="$(get_zig_mcpu)"
- -Doptimize=Debug
- -Dstd-docs=false
- -Dno-langref
+ # Has no effect on final binary and only causes failures during bootstrapping.
+ filter-lto
+
+ # Used during bootstrapping. stage1/stage2 have limited functionality
+ # and can't resolve native target, so we pass target in exact form.
+ declare -r -g ZIG_HOST_AS_TARGET="$(zig-utils_c_env_to_zig_target "${CBUILD:-${CHOST}}" "${CFLAGS}"})"
+
+ # Note that if we are building with CMake, "my_zbs_args"
+ # are used only after compiling zig2.
+ local my_zbs_args=(
+ --zig-lib-dir "${S}/lib/"
+ # Will be a subdir under ZIG_SYS_INSTALL_DEST.
+ --prefix-lib-dir lib/
+
+ # These are built separately
+ -Dno-langref
+ -Dstd-docs=false
+
+ --release=fast
+ )
+ if use llvm; then
+ my_zbs_args+=(
+ -Denable-llvm=true
+ -Dstatic-llvm=false
+ -Dconfig_h="${BUILD_DIR}/config.h"
+ )
+ else
+ my_zbs_args+=(
-Denable-llvm=false
- -Dforce-link-libc
)
- return
fi
- local mycmakeargs=(
- -DZIG_USE_CCACHE=OFF
- -DZIG_SHARED_LLVM=ON
- -DZIG_TARGET_TRIPLE="$(get_zig_target)"
- -DZIG_TARGET_MCPU="$(get_zig_mcpu)"
- -DZIG_USE_LLVM_CONFIG=ON
- -DCMAKE_PREFIX_PATH="$(get_llvm_prefix)"
- -DCMAKE_INSTALL_PREFIX="${ZIG_SYS_INSTALL_DEST}"
- )
+ zig_src_configure
+
+ if use llvm; then
+ # Build for native only, it's for zig2 (build-time executable)
+ # LLVM from BDEPEND
+ local mycmakeargs=(
+ -DZIG_SHARED_LLVM=ON
+ -DZIG_USE_LLVM_CONFIG=ON
- cmake_src_configure
+ -DZIG_TARGET_TRIPLE=native
+ -DZIG_TARGET_MCPU=native
+ -DZIG_HOST_TARGET_TRIPLE="${ZIG_HOST_AS_TARGET}"
+
+ -DCMAKE_PREFIX_PATH="$(get_llvm_prefix -b)"
+ -DCMAKE_INSTALL_PREFIX="${ZIG_SYS_INSTALL_DEST}"
+ )
+
+ cmake_src_configure
+ fi
}
src_compile() {
- # Remove "limit memory usage" flags, it's already verified by
- # CHECKREQS_MEMORY and causes unneccessary errors. Upstream set them
- # according to CI OOM failures, which are higher than during Gentoo build.
- sed -i -e '/\.max_rss = .*,/d' build.zig || die
+ if use llvm; then
+ cmake_build zig2
+ else
+ cd "${BUILD_DIR}" || die
+ ln -s "${S}/stage1/" . || die
+ ln -s "${S}/src/" . || die
+ ln -s "${S}/lib/" . || die
- if ! use llvm; then
- $(tc-getCC) -o bootstrap bootstrap.c || die "Zig's bootstrap.c compilation failed"
- edob ./bootstrap
- edo ./zig2 build install --prefix "${BUILD_DIR}/stage3/" "${ZIG_BOOTSTRAP_STAGE3_FLAGS[@]}"
- return
+ local native_cc="$(tc-getBUILD_CC)"
+ "${native_cc}" -o bootstrap "${S}/bootstrap.c" || die "Zig's bootstrap.c compilation failed"
+ ZIG_HOST_TARGET_TRIPLE="${ZIG_HOST_AS_TARGET}" CC="${native_cc}" edo ./bootstrap
fi
- cmake_src_compile
+ cd "${BUILD_DIR}" || die
+ ZIG_EXE="./zig2" zig_src_compile --prefix "${BUILD_DIR}/stage3/"
- "${BUILD_DIR}/stage3/bin/zig" env || die "Zig compilation failed"
+ ./stage3/bin/zig env || die "Zig compilation failed"
if use doc; then
- cd "${BUILD_DIR}" || die
- edo ./stage3/bin/zig build std-docs --zig-lib-dir "${BUILD_DIR}/stage3/lib/zig/" --prefix "${S}/docgen/"
- edo ./stage3/bin/zig build langref --zig-lib-dir "${BUILD_DIR}/stage3/lib/zig/" --prefix "${S}/docgen/"
+ ZIG_EXE="./stage3/bin/zig" zig_src_compile langref --prefix "${S}/docgen/"
fi
}
src_test() {
cd "${BUILD_DIR}" || die
- local ZIG_TEST_ARGS="-Dstatic-llvm=false -Denable-llvm -Dskip-non-native \
- -Doptimize=ReleaseSafe -Dtarget=$(get_zig_target) -Dcpu=$(get_zig_mcpu)"
- local ZIG_TEST_STEPS=(
- test-fmt test-cases test-behavior test-c-import test-compiler-rt test-universal-libc test-compare-output
- test-standalone test-c-abi test-link test-stack-traces test-cli test-asm-link test-translate-c
- test-run-translated-c test-std
- )
-
- local step
- for step in "${ZIG_TEST_STEPS[@]}" ; do
- edob ./stage3/bin/zig build ${step} ${ZIG_TEST_ARGS}
- done
+ ZIG_EXE="./stage3/bin/zig" zig_src_test -Dskip-non-native
}
src_install() {
- local DOCS=( "README.md" "doc/build.zig.zon.md" )
- use doc && local HTML_DOCS=( "docgen/doc/langref.html" "docgen/doc/std" )
+ use doc && local HTML_DOCS=( "docgen/doc/langref.html" )
- if ! use llvm; then
- DESTDIR="${D}" edo ./zig2 build install --prefix "${ZIG_SYS_INSTALL_DEST}" "${ZIG_BOOTSTRAP_STAGE3_FLAGS[@]}"
- einstalldocs
- else
- cmake_src_install
- fi
+ ZIG_EXE="./zig2" zig_src_install --prefix "${ZIG_SYS_INSTALL_DEST}"
- cd "${ED}/usr/$(get_libdir)/zig/${PV}/" || die
+ cd "${D}/${ZIG_SYS_INSTALL_DEST}" || die
mv lib/zig/ lib2/ || die
rm -rf lib/ || die
mv lib2/ lib/ || die
- dosym -r "/usr/$(get_libdir)/zig/${PV}/bin/zig" "/usr/bin/zig-${PV}"
+ dosym -r "${ZIG_SYS_INSTALL_DEST}/bin/zig" /usr/bin/zig-${PV}
}
pkg_postinst() {
- eselect zig update ifunset
+ eselect zig update ifunset || die
+
+ elog "Starting from 0.12.0, Zig no longer installs"
+ elog "precompiled standard library documentation."
+ elog "Instead, you can call \`zig std\` to compile it on-the-fly."
+ elog "It reflects all edits in standard library automatically."
+ elog "See \`zig std --help\` for more information."
+ elog "More details here: https://ziglang.org/download/0.12.0/release-notes.html#Redesign-How-Autodoc-Works"
if ! use llvm; then
elog "Currently, Zig built without LLVM support lacks some"
elog "important features such as most optimizations, @cImport, etc."
elog "They are listed under \"Building from Source without LLVM\""
elog "section of the README file from \"/usr/share/doc/${PF}\" ."
- elog "It's recommended to use C backend directly with this stage2 build."
fi
}
pkg_postrm() {
- eselect zig update ifunset
+ eselect zig update ifunset || die
}
^ permalink raw reply related [flat|nested] 72+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-lang/zig/
@ 2024-11-06 13:35 Sam James
0 siblings, 0 replies; 72+ messages in thread
From: Sam James @ 2024-11-06 13:35 UTC (permalink / raw
To: gentoo-commits
commit: f4a5c79c896bde3dbf6fe3618fd86f68c003577a
Author: Eric Joldasov <bratishkaerik <AT> landless-city <DOT> net>
AuthorDate: Sun Nov 3 00:08:53 2024 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Nov 6 13:35:14 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f4a5c79c
dev-lang/zig: fix building 0.13.0 with `sys-devel/llvm-18.1.8-r6`
Also, while we are here, sync `.maxrss` fix from 9999 ebuild .
Patch message:
This is backported PR https://www.github.com/ziglang/zig/pull/21862 ,
squashed and trimmed down for Zig 0.13.0 . Fixes following error when
compiling with sys-devel/llvm-18.1.8-r6:
```
/var/tmp/portage/dev-lang/zig-0.13.0/work/zig-0.13.0/src/zig_llvm.cpp:738:68: error: static assertion failed
738 | static_assert((Triple::EnvironmentType)ZigLLVM_LastEnvironmentType == Triple::LastEnvironmentType, "");
```
Chronology as I understood it:
* New enum tags were added for `Triple::EnvironmentType` to 20.x in
https://www.github.com/llvm/llvm-project/pull/111302 ,
* These additions were backported to 19.1.3 in
https://www.github.com/llvm/llvm-project/pull/112364 , at this point
Zig upstream (9999) notices static assert failure and fixes in
https://www.github.com/ziglang/zig/pull/21862 .
Discussed here:
https://www.github.com/llvm/llvm-project/pull/112364#discussion_r1823206017 .
* These additions were backported again to 18.1.8-r6 (Gentoo only) in
https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9455b76daa769c03686d18098dbf37690c5c5f61 ,
this time it causes static assert failure for 0.13.0 .
Closes: https://bugs.gentoo.org/942563
Signed-off-by: Eric Joldasov <bratishkaerik <AT> landless-city.net>
Closes: https://github.com/gentoo/gentoo/pull/39187
Signed-off-by: Sam James <sam <AT> gentoo.org>
dev-lang/zig/Manifest | 1 +
dev-lang/zig/{zig-0.13.0.ebuild => zig-0.13.0-r1.ebuild} | 14 ++++++++++++++
2 files changed, 15 insertions(+)
diff --git a/dev-lang/zig/Manifest b/dev-lang/zig/Manifest
index 6ab62b044f50..3126303a057c 100644
--- a/dev-lang/zig/Manifest
+++ b/dev-lang/zig/Manifest
@@ -1,2 +1,3 @@
+DIST zig-0.13.0-llvm-18.1.8-r6-fix.patch 45968 BLAKE2B a07c47b22b079d324b200fe84af5c89ffe51a1c81f50ca894a80f9f9db51a9d4119ae51c2e4e84a9b4f0111b2b809978b88adca42480ee800693afbd78f47387 SHA512 148b3f4807763dfb6a4d4e201890fa8204deaf73e620a8b592dfa03b997bc16ed01ea26e4d85f242473e91ccc45b1a06af22f786851f8e26cec1ac821b14efdc
DIST zig-0.13.0.tar.xz 17220728 BLAKE2B f4bbacc2012950c556bebc28fc322fc6424bf20fe118e8362373336b6460e514028978584087f6e7f25ed8b8e6991610edce625676a1dd80c1975c5f9ef48775 SHA512 6f5f31f4ba71a11d8b16c7a5a613e124095e503fa6b02d2b77e5b177674c739287e81d98d96dc261fed24bc836caf196f71c3fcc7a6518387df86ba9e03df4dd
DIST zig-0.13.0.tar.xz.minisig 312 BLAKE2B 2d061257c9c75f9c36b01cfb08dcd2040538a125b9ea2cae8617ae5496e685b165933ce8981494419522b7e19b51fc69a651ecaa4a8930753acf2e4ae3d6e00f SHA512 21c6139c06cba6c5e23a3305fed0c0f1b9b32d9140bd686c26365ce0279d5f53cd081894eaba29f0c1ed51b2e831edf7bd4ae6a7eaee5018a252e312e9b65507
diff --git a/dev-lang/zig/zig-0.13.0.ebuild b/dev-lang/zig/zig-0.13.0-r1.ebuild
similarity index 91%
rename from dev-lang/zig/zig-0.13.0.ebuild
rename to dev-lang/zig/zig-0.13.0-r1.ebuild
index e55bb8ee700e..ef0d90d4fa76 100644
--- a/dev-lang/zig/zig-0.13.0.ebuild
+++ b/dev-lang/zig/zig-0.13.0-r1.ebuild
@@ -21,6 +21,7 @@ else
SRC_URI="
https://ziglang.org/download/${PV}/${P}.tar.xz
verify-sig? ( https://ziglang.org/download/${PV}/${P}.tar.xz.minisig )
+ https://codeberg.org/BratishkaErik/distfiles/releases/download/dev-lang%2Fzig-${PV}/${P}-llvm-18.1.8-r6-fix.patch
"
KEYWORDS="~amd64 ~arm ~arm64"
@@ -73,6 +74,7 @@ CHECKREQS_MEMORY="4G"
PATCHES=(
"${FILESDIR}/${P}-test-fmt-no-doc.patch"
"${FILESDIR}/${P}-test-std-kernel-version.patch"
+ "${DISTDIR}/${P}-llvm-18.1.8-r6-fix.patch"
)
llvm_check_deps() {
@@ -124,6 +126,13 @@ pkg_setup() {
check-reqs_pkg_setup
}
+src_unpack() {
+ if use verify-sig; then
+ verify-sig_verify_detached "${DISTDIR}"/${P}.tar.xz{,.minisig}
+ fi
+ default
+}
+
src_configure() {
# Useful for debugging and a little bit more deterministic.
export ZIG_LOCAL_CACHE_DIR="${T}/zig-local-cache"
@@ -142,6 +151,11 @@ src_configure() {
}
src_compile() {
+ # Remove "limit memory usage" flags, it's already verified by
+ # CHECKREQS_MEMORY and causes unneccessary errors. Upstream set them
+ # according to CI OOM failures, which are higher than during Gentoo build.
+ sed -i -e '/\.max_rss = .*,/d' build.zig || die
+
cmake_src_compile
"${BUILD_DIR}/stage3/bin/zig" env || die "Zig compilation failed"
^ permalink raw reply related [flat|nested] 72+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-lang/zig/
@ 2024-09-21 7:41 Michał Górny
0 siblings, 0 replies; 72+ messages in thread
From: Michał Górny @ 2024-09-21 7:41 UTC (permalink / raw
To: gentoo-commits
commit: 6c3c4f0fcc8dbdc84a461279797610dd402ad561
Author: Eric Joldasov <bratishkaerik <AT> landless-city <DOT> net>
AuthorDate: Fri Sep 20 12:49:45 2024 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sat Sep 21 07:40:43 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6c3c4f0f
dev-lang/zig: update to LLVM 19 for 9999
Signed-off-by: Eric Joldasov <bratishkaerik <AT> landless-city.net>
Closes: https://github.com/gentoo/gentoo/pull/38704
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
dev-lang/zig/zig-9999.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-lang/zig/zig-9999.ebuild b/dev-lang/zig/zig-9999.ebuild
index f7997e5184e6..335ac0eab28c 100644
--- a/dev-lang/zig/zig-9999.ebuild
+++ b/dev-lang/zig/zig-9999.ebuild
@@ -3,7 +3,7 @@
EAPI=8
-LLVM_COMPAT=( 18 )
+LLVM_COMPAT=( 19 )
LLVM_OPTIONAL=1
inherit check-reqs cmake edo llvm-r1 toolchain-funcs
^ permalink raw reply related [flat|nested] 72+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-lang/zig/
@ 2024-08-05 7:38 Joonas Niilola
0 siblings, 0 replies; 72+ messages in thread
From: Joonas Niilola @ 2024-08-05 7:38 UTC (permalink / raw
To: gentoo-commits
commit: 5b1ed6293014dce1016a26d3532ba467113762da
Author: Eric Joldasov <bratishkaerik <AT> landless-city <DOT> net>
AuthorDate: Wed Jul 24 09:57:21 2024 +0000
Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Mon Aug 5 07:38:17 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5b1ed629
dev-lang/zig: fix building with `doc` USE-flag enabled on 9999
Signed-off-by: Eric Joldasov <bratishkaerik <AT> landless-city.net>
Closes: https://github.com/gentoo/gentoo/pull/37703
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>
dev-lang/zig/zig-9999.ebuild | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/dev-lang/zig/zig-9999.ebuild b/dev-lang/zig/zig-9999.ebuild
index d278d521c061..f7997e5184e6 100644
--- a/dev-lang/zig/zig-9999.ebuild
+++ b/dev-lang/zig/zig-9999.ebuild
@@ -178,8 +178,8 @@ src_compile() {
if use doc; then
cd "${BUILD_DIR}" || die
- edo ./stage3/bin/zig build std-docs --prefix "${S}/docgen/"
- edo ./stage3/bin/zig build langref --prefix "${S}/docgen/"
+ edo ./stage3/bin/zig build std-docs --zig-lib-dir "${BUILD_DIR}/stage3/lib/zig/" --prefix "${S}/docgen/"
+ edo ./stage3/bin/zig build langref --zig-lib-dir "${BUILD_DIR}/stage3/lib/zig/" --prefix "${S}/docgen/"
fi
}
^ permalink raw reply related [flat|nested] 72+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-lang/zig/
@ 2024-05-20 7:49 Sam James
0 siblings, 0 replies; 72+ messages in thread
From: Sam James @ 2024-05-20 7:49 UTC (permalink / raw
To: gentoo-commits
commit: 570d80252431fe2ebd6ab7d6f24384becbb1546a
Author: Eric Joldasov <bratishkaerik <AT> landless-city <DOT> net>
AuthorDate: Sat Mar 30 08:42:17 2024 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon May 20 07:48:26 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=570d8025
dev-lang/zig: update LLVM to 18, fix build without LLVM on 9999
Signed-off-by: Eric Joldasov <bratishkaerik <AT> landless-city.net>
Closes: https://github.com/gentoo/gentoo/pull/35997
Signed-off-by: Sam James <sam <AT> gentoo.org>
dev-lang/zig/zig-9999.ebuild | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/dev-lang/zig/zig-9999.ebuild b/dev-lang/zig/zig-9999.ebuild
index a6c2c79a6a38..d278d521c061 100644
--- a/dev-lang/zig/zig-9999.ebuild
+++ b/dev-lang/zig/zig-9999.ebuild
@@ -3,7 +3,7 @@
EAPI=8
-LLVM_COMPAT=( 17 )
+LLVM_COMPAT=( 18 )
LLVM_OPTIONAL=1
inherit check-reqs cmake edo llvm-r1 toolchain-funcs
@@ -138,7 +138,7 @@ src_configure() {
-Dtarget="$(get_zig_target)"
-Dcpu="$(get_zig_mcpu)"
-Doptimize=Debug
- -Dno-autodocs
+ -Dstd-docs=false
-Dno-langref
-Denable-llvm=false
-Dforce-link-libc
^ permalink raw reply related [flat|nested] 72+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-lang/zig/
@ 2024-05-20 7:49 Sam James
0 siblings, 0 replies; 72+ messages in thread
From: Sam James @ 2024-05-20 7:49 UTC (permalink / raw
To: gentoo-commits
commit: 7f0030f20b6e01ae7deb80143dd3a39e0d69234e
Author: Eric Joldasov <bratishkaerik <AT> landless-city <DOT> net>
AuthorDate: Sat Mar 30 08:34:32 2024 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon May 20 07:48:25 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7f0030f2
dev-lang/zig: add verify-sig support
Signed-off-by: Eric Joldasov <bratishkaerik <AT> landless-city.net>
Signed-off-by: Sam James <sam <AT> gentoo.org>
dev-lang/zig/Manifest | 2 ++
dev-lang/zig/zig-0.11.0-r1.ebuild | 13 +++++++++++--
dev-lang/zig/zig-0.12.0.ebuild | 11 ++++++++++-
dev-lang/zig/zig-9999.ebuild | 11 ++++++++++-
4 files changed, 33 insertions(+), 4 deletions(-)
diff --git a/dev-lang/zig/Manifest b/dev-lang/zig/Manifest
index e4ec481d676a..59c8c3e88aaa 100644
--- a/dev-lang/zig/Manifest
+++ b/dev-lang/zig/Manifest
@@ -1,2 +1,4 @@
DIST zig-0.11.0.tar.xz 15275316 BLAKE2B 603e4995a36d214ba71cf05b719a04732c8927995c8207ab8fdd574dca3410cdc5ccc8f6aa9964807afc04a5cbce1a3910a6cde4cf12e585cdf7684833217eb2 SHA512 c19a8ae6d440a16dd5e77941fc77c036d1f284f1784376625e63b65f30b4acad62f9f4217bc818c401f88c2c33f8722f26fc467c3e23c29a89178c4b1882d1c4
+DIST zig-0.11.0.tar.xz.minisig 312 BLAKE2B 8df407f07dde36280c945300fd8b803e6e59c026eb7a3eb56e6d2f4fe1047672e17946a3bbe23ccfe9be07b65331e17690e95fd348353be22f7b6d9b73b3f9ca SHA512 565dd1eacb7dd697e6b1ff54517adc1e4775d2523afaeb4f9a3dd404df871b187862211ecbbcf90b42e3a03853677fc1603e7fc8fc5ba7126a054679faa601ca
DIST zig-0.12.0.tar.xz 17099152 BLAKE2B 2a1248302868156c4ddcb154d075af29886a95a4c29de02ff0981e76a85f5d4109dd5c38f95c2c16f5c942bab7d120ae068c1e122ab8ad421c0213b7e996956c SHA512 0c3d9396fea4905245c7e32ce6bd9b4ff140f061cd8a957929e4c84cf105f5bbcbf2e7c030013ac649edb569e909f65d928b3e8a86f35c9076fb62e996feea14
+DIST zig-0.12.0.tar.xz.minisig 312 BLAKE2B 4b3d1ae45d3b6d81054a39255c0892d9376d05da9ff1076bcf740310c9650b0154ddc39f19caee9dae293719d58a63764e43b694b83fe7031c87ab434aa377f5 SHA512 6e14c1e1926beeb249cb88fb2247ff401f679b64785c3ec8a924e33c894174deb77b48286469a863761bce0ca57524f904995eacf544919dda387c140e6e829e
diff --git a/dev-lang/zig/zig-0.11.0-r1.ebuild b/dev-lang/zig/zig-0.11.0-r1.ebuild
index 633b6e1c6399..8114e11a4f79 100644
--- a/dev-lang/zig/zig-0.11.0-r1.ebuild
+++ b/dev-lang/zig/zig-0.11.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2019-2023 Gentoo Authors
+# Copyright 2019-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -12,8 +12,17 @@ if [[ ${PV} == 9999 ]]; then
EGIT_REPO_URI="https://github.com/ziglang/zig.git"
inherit git-r3
else
- SRC_URI="https://ziglang.org/download/${PV}/${P}.tar.xz"
+ VERIFY_SIG_METHOD=minisig
+ VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/minisig-keys/zig-software-foundation.pub
+ inherit verify-sig
+
+ SRC_URI="
+ https://ziglang.org/download/${PV}/${P}.tar.xz
+ verify-sig? ( https://ziglang.org/download/${PV}/${P}.tar.xz.minisig )
+ "
KEYWORDS="~amd64 ~arm ~arm64"
+
+ BDEPEND="verify-sig? ( sec-keys/minisig-keys-zig-software-foundation )"
fi
# project itself: MIT
diff --git a/dev-lang/zig/zig-0.12.0.ebuild b/dev-lang/zig/zig-0.12.0.ebuild
index 73a78c57226a..2b89e41832af 100644
--- a/dev-lang/zig/zig-0.12.0.ebuild
+++ b/dev-lang/zig/zig-0.12.0.ebuild
@@ -12,8 +12,17 @@ if [[ ${PV} == 9999 ]]; then
EGIT_REPO_URI="https://github.com/ziglang/zig.git"
inherit git-r3
else
- SRC_URI="https://ziglang.org/download/${PV}/${P}.tar.xz"
+ VERIFY_SIG_METHOD=minisig
+ VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/minisig-keys/zig-software-foundation.pub
+ inherit verify-sig
+
+ SRC_URI="
+ https://ziglang.org/download/${PV}/${P}.tar.xz
+ verify-sig? ( https://ziglang.org/download/${PV}/${P}.tar.xz.minisig )
+ "
KEYWORDS="~amd64 ~arm ~arm64"
+
+ BDEPEND="verify-sig? ( sec-keys/minisig-keys-zig-software-foundation )"
fi
# project itself: MIT
diff --git a/dev-lang/zig/zig-9999.ebuild b/dev-lang/zig/zig-9999.ebuild
index d3ce3edd625b..a6c2c79a6a38 100644
--- a/dev-lang/zig/zig-9999.ebuild
+++ b/dev-lang/zig/zig-9999.ebuild
@@ -14,8 +14,17 @@ if [[ ${PV} == 9999 ]]; then
EGIT_REPO_URI="https://github.com/ziglang/zig.git"
inherit git-r3
else
- SRC_URI="https://ziglang.org/download/${PV}/${P}.tar.xz"
+ VERIFY_SIG_METHOD=minisig
+ VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/minisig-keys/zig-software-foundation.pub
+ inherit verify-sig
+
+ SRC_URI="
+ https://ziglang.org/download/${PV}/${P}.tar.xz
+ verify-sig? ( https://ziglang.org/download/${PV}/${P}.tar.xz.minisig )
+ "
KEYWORDS="~amd64 ~arm ~arm64"
+
+ BDEPEND="verify-sig? ( sec-keys/minisig-keys-zig-software-foundation )"
fi
# project itself: MIT
^ permalink raw reply related [flat|nested] 72+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-lang/zig/
@ 2024-05-19 15:21 Sam James
0 siblings, 0 replies; 72+ messages in thread
From: Sam James @ 2024-05-19 15:21 UTC (permalink / raw
To: gentoo-commits
commit: ec54c19f5b6c28b03d2c1beba2d07d92a4df2f00
Author: 0x5a4 <arthur <AT> wienstroer <DOT> net>
AuthorDate: Thu May 2 18:54:51 2024 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun May 19 15:20:36 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ec54c19f
dev-lang/zig: add 0.12.0
Signed-off-by: 0x5a4 <arthur <AT> wienstroer.net>
Closes: https://github.com/gentoo/gentoo/pull/36517
Signed-off-by: Sam James <sam <AT> gentoo.org>
dev-lang/zig/Manifest | 1 +
dev-lang/zig/zig-0.12.0.ebuild | 173 +++++++++++++++++++++++++++++++++++++++++
2 files changed, 174 insertions(+)
diff --git a/dev-lang/zig/Manifest b/dev-lang/zig/Manifest
index 0041c029d4ff..e4ec481d676a 100644
--- a/dev-lang/zig/Manifest
+++ b/dev-lang/zig/Manifest
@@ -1 +1,2 @@
DIST zig-0.11.0.tar.xz 15275316 BLAKE2B 603e4995a36d214ba71cf05b719a04732c8927995c8207ab8fdd574dca3410cdc5ccc8f6aa9964807afc04a5cbce1a3910a6cde4cf12e585cdf7684833217eb2 SHA512 c19a8ae6d440a16dd5e77941fc77c036d1f284f1784376625e63b65f30b4acad62f9f4217bc818c401f88c2c33f8722f26fc467c3e23c29a89178c4b1882d1c4
+DIST zig-0.12.0.tar.xz 17099152 BLAKE2B 2a1248302868156c4ddcb154d075af29886a95a4c29de02ff0981e76a85f5d4109dd5c38f95c2c16f5c942bab7d120ae068c1e122ab8ad421c0213b7e996956c SHA512 0c3d9396fea4905245c7e32ce6bd9b4ff140f061cd8a957929e4c84cf105f5bbcbf2e7c030013ac649edb569e909f65d928b3e8a86f35c9076fb62e996feea14
diff --git a/dev-lang/zig/zig-0.12.0.ebuild b/dev-lang/zig/zig-0.12.0.ebuild
new file mode 100644
index 000000000000..73a78c57226a
--- /dev/null
+++ b/dev-lang/zig/zig-0.12.0.ebuild
@@ -0,0 +1,173 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+LLVM_MAX_SLOT=17
+inherit edo cmake llvm check-reqs toolchain-funcs
+
+DESCRIPTION="A robust, optimal, and maintainable programming language"
+HOMEPAGE="https://ziglang.org/"
+if [[ ${PV} == 9999 ]]; then
+ EGIT_REPO_URI="https://github.com/ziglang/zig.git"
+ inherit git-r3
+else
+ SRC_URI="https://ziglang.org/download/${PV}/${P}.tar.xz"
+ KEYWORDS="~amd64 ~arm ~arm64"
+fi
+
+# project itself: MIT
+# There are bunch of projects under "lib/" folder that are needed for cross-compilation.
+# Files that are unnecessary for cross-compilation are removed by upstream
+# and therefore their licenses (if any special) are not included.
+# lib/libunwind: Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )
+# lib/libcxxabi: Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )
+# lib/libcxx: Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )
+# lib/libc/wasi: || ( Apache-2.0-with-LLVM-exceptions Apache-2.0 MIT BSD-2 ) public-domain
+# lib/libc/musl: MIT BSD-2
+# lib/libc/mingw: ZPL public-domain BSD-2 ISC HPND
+# lib/libc/glibc: BSD HPND ISC inner-net LGPL-2.1+
+LICENSE="MIT Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT ) || ( Apache-2.0-with-LLVM-exceptions Apache-2.0 MIT BSD-2 ) public-domain BSD-2 ZPL ISC HPND BSD inner-net LGPL-2.1+"
+SLOT="$(ver_cut 1-2)"
+IUSE="doc"
+
+BUILD_DIR="${S}/build"
+
+# Zig requires zstd and zlib compression support in LLVM, if using LLVM backend.
+# (non-LLVM backends don't require these)
+# They are not required "on their own", so please don't add them here.
+# You can check https://github.com/ziglang/zig-bootstrap in future, to see
+# options that are passed to LLVM CMake building (excluding "static" ofc).
+DEPEND="
+ sys-devel/clang:${LLVM_MAX_SLOT}=
+ sys-devel/lld:${LLVM_MAX_SLOT}=
+ sys-devel/llvm:${LLVM_MAX_SLOT}=[zstd]
+"
+
+RDEPEND="
+ ${DEPEND}
+"
+
+IDEPEND="app-eselect/eselect-zig"
+
+# see https://github.com/ziglang/zig/issues/3382
+# For now, Zig Build System doesn't support enviromental CFLAGS/LDFLAGS/etc.
+QA_FLAGS_IGNORED="usr/.*/zig/${PV}/bin/zig"
+
+# Since commit https://github.com/ziglang/zig/commit/e7d28344fa3ee81d6ad7ca5ce1f83d50d8502118
+# Zig uses self-hosted compiler only
+CHECKREQS_MEMORY="4G"
+
+llvm_check_deps() {
+ has_version "sys-devel/clang:${LLVM_SLOT}"
+}
+
+ctarget_to_zigtarget() {
+ # Zig's Target Format: arch-os-abi
+ local CTARGET="${CTARGET:-${CHOST}}"
+
+ local ZIG_ARCH
+ case "${CTARGET%%-*}" in
+ i?86) ZIG_ARCH=x86;;
+ sparcv9) ZIG_ARCH=sparc64;;
+ *) ZIG_ARCH="${CTARGET%%-*}";; # Same as in CHOST
+ esac
+
+ local ZIG_OS
+ case "${CTARGET}" in
+ *linux*) ZIG_OS=linux;;
+ *apple*) ZIG_OS=macos;;
+ esac
+
+ local ZIG_ABI
+ case "${CTARGET##*-}" in
+ gnu) ZIG_ABI=gnu;;
+ solaris*) ZIG_OS=solaris ZIG_ABI=none;;
+ darwin*) ZIG_ABI=none;;
+ *) ZIG_ABI="${CTARGET##*-}";; # Same as in CHOST
+ esac
+
+ echo "${ZIG_ARCH}-${ZIG_OS}-${ZIG_ABI}"
+}
+
+get_zig_mcpu() {
+ local ZIG_DEFAULT_MCPU=native
+ tc-is-cross-compiler && ZIG_DEFAULT_MCPU=baseline
+ echo "${ZIG_MCPU:-${ZIG_DEFAULT_MCPU}}"
+}
+
+get_zig_target() {
+ local ZIG_DEFAULT_TARGET=native
+ tc-is-cross-compiler && ZIG_DEFAULT_TARGET="$(ctarget_to_zigtarget)"
+ echo "${ZIG_TARGET:-${ZIG_DEFAULT_TARGET}}"
+}
+
+pkg_setup() {
+ llvm_pkg_setup
+ check-reqs_pkg_setup
+}
+
+src_configure() {
+ # Useful for debugging and a little bit more deterministic.
+ export ZIG_LOCAL_CACHE_DIR="${T}/zig-local-cache"
+ export ZIG_GLOBAL_CACHE_DIR="${T}/zig-global-cache"
+
+ local mycmakeargs=(
+ -DZIG_USE_CCACHE=OFF
+ -DZIG_SHARED_LLVM=ON
+ -DZIG_TARGET_TRIPLE="$(get_zig_target)"
+ -DZIG_TARGET_MCPU="$(get_zig_mcpu)"
+ -DZIG_USE_LLVM_CONFIG=ON
+ -DCMAKE_PREFIX_PATH="$(get_llvm_prefix ${LLVM_MAX_SLOT})"
+ -DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr/$(get_libdir)/zig/${PV}"
+ )
+
+ cmake_src_configure
+}
+
+src_compile() {
+ cmake_src_compile
+
+ "${BUILD_DIR}/stage3/bin/zig" env || die "Zig compilation failed"
+
+ if use doc; then
+ cd "${BUILD_DIR}" || die
+ edo ./stage3/bin/zig build std-docs --prefix "${S}/docgen/"
+ edo ./stage3/bin/zig build langref --prefix "${S}/docgen/"
+ fi
+}
+
+src_test() {
+ cd "${BUILD_DIR}" || die
+ local ZIG_TEST_ARGS="-Dstatic-llvm=false -Denable-llvm -Dskip-non-native \
+ -Doptimize=ReleaseSafe -Dtarget=$(get_zig_target) -Dcpu=$(get_zig_mcpu)"
+ local ZIG_TEST_STEPS=(
+ test-cases test-fmt test-behavior test-compiler-rt test-universal-libc test-compare-output
+ test-standalone test-c-abi test-link test-stack-traces test-cli test-asm-link test-translate-c
+ test-run-translated-c test-std
+ )
+
+ local step
+ for step in "${ZIG_TEST_STEPS[@]}" ; do
+ edob ./stage3/bin/zig build ${step} ${ZIG_TEST_ARGS}
+ done
+}
+
+src_install() {
+ use doc && local HTML_DOCS=( "docgen/doc/langref.html" "docgen/doc/std" )
+ cmake_src_install
+
+ cd "${ED}/usr/$(get_libdir)/zig/${PV}/" || die
+ mv lib/zig/ lib2/ || die
+ rm -rf lib/ || die
+ mv lib2/ lib/ || die
+ dosym -r "/usr/$(get_libdir)/zig/${PV}/bin/zig" "/usr/bin/zig-${PV}"
+}
+
+pkg_postinst() {
+ eselect zig update ifunset
+}
+
+pkg_postrm() {
+ eselect zig update ifunset
+}
^ permalink raw reply related [flat|nested] 72+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-lang/zig/
@ 2024-02-28 9:12 Florian Schmaus
0 siblings, 0 replies; 72+ messages in thread
From: Florian Schmaus @ 2024-02-28 9:12 UTC (permalink / raw
To: gentoo-commits
commit: 5dc3eca9297aa7f5908411f7763770a0294631e2
Author: Eric Joldasov <bratishkaerik <AT> getgoogleoff <DOT> me>
AuthorDate: Wed Feb 21 04:19:47 2024 +0000
Commit: Florian Schmaus <flow <AT> gentoo <DOT> org>
CommitDate: Wed Feb 28 09:11:19 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5dc3eca9
dev-lang/zig: add "test-c-import" step in 9999
Extracted from "test-behaviour" in
https://www.github.com/ziglang/zig/pull/19016 .
Signed-off-by: Eric Joldasov <bratishkaerik <AT> getgoogleoff.me>
Closes: https://github.com/gentoo/gentoo/pull/35457
Signed-off-by: Florian Schmaus <flow <AT> gentoo.org>
dev-lang/zig/zig-9999.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-lang/zig/zig-9999.ebuild b/dev-lang/zig/zig-9999.ebuild
index 4628af24780a..d3ce3edd625b 100644
--- a/dev-lang/zig/zig-9999.ebuild
+++ b/dev-lang/zig/zig-9999.ebuild
@@ -179,7 +179,7 @@ src_test() {
local ZIG_TEST_ARGS="-Dstatic-llvm=false -Denable-llvm -Dskip-non-native \
-Doptimize=ReleaseSafe -Dtarget=$(get_zig_target) -Dcpu=$(get_zig_mcpu)"
local ZIG_TEST_STEPS=(
- test-cases test-fmt test-behavior test-compiler-rt test-universal-libc test-compare-output
+ test-fmt test-cases test-behavior test-c-import test-compiler-rt test-universal-libc test-compare-output
test-standalone test-c-abi test-link test-stack-traces test-cli test-asm-link test-translate-c
test-run-translated-c test-std
)
^ permalink raw reply related [flat|nested] 72+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-lang/zig/
@ 2024-02-11 16:02 Michał Górny
0 siblings, 0 replies; 72+ messages in thread
From: Michał Górny @ 2024-02-11 16:02 UTC (permalink / raw
To: gentoo-commits
commit: a689d1251d826a329a937e19dae19bae823cc033
Author: Eric Joldasov <bratishkaerik <AT> getgoogleoff <DOT> me>
AuthorDate: Sun Feb 11 14:58:05 2024 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sun Feb 11 15:57:59 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a689d125
dev-lang/zig: Migrate to llvm-r1 in 9999
Signed-off-by: Eric Joldasov <bratishkaerik <AT> getgoogleoff.me>
Closes: https://github.com/gentoo/gentoo/pull/35273
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
dev-lang/zig/zig-9999.ebuild | 29 ++++++++++++++++-------------
1 file changed, 16 insertions(+), 13 deletions(-)
diff --git a/dev-lang/zig/zig-9999.ebuild b/dev-lang/zig/zig-9999.ebuild
index a29f09a3db19..4628af24780a 100644
--- a/dev-lang/zig/zig-9999.ebuild
+++ b/dev-lang/zig/zig-9999.ebuild
@@ -1,10 +1,12 @@
-# Copyright 2019-2023 Gentoo Authors
+# Copyright 2019-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
-LLVM_MAX_SLOT=17
-inherit edo cmake llvm check-reqs toolchain-funcs
+LLVM_COMPAT=( 17 )
+LLVM_OPTIONAL=1
+
+inherit check-reqs cmake edo llvm-r1 toolchain-funcs
DESCRIPTION="A robust, optimal, and maintainable programming language"
HOMEPAGE="https://ziglang.org/"
@@ -30,7 +32,10 @@ fi
LICENSE="MIT Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT ) || ( Apache-2.0-with-LLVM-exceptions Apache-2.0 MIT BSD-2 ) public-domain BSD-2 ZPL ISC HPND BSD inner-net LGPL-2.1+"
SLOT="$(ver_cut 1-2)"
IUSE="doc +llvm"
-REQUIRED_USE="!llvm? ( !doc )"
+REQUIRED_USE="
+ !llvm? ( !doc )
+ llvm? ( ${LLVM_REQUIRED_USE} )
+"
BUILD_DIR="${S}/build"
@@ -41,9 +46,11 @@ BUILD_DIR="${S}/build"
# options that are passed to LLVM CMake building (excluding "static" ofc).
DEPEND="
llvm? (
- sys-devel/clang:${LLVM_MAX_SLOT}=
- sys-devel/lld:${LLVM_MAX_SLOT}=
- sys-devel/llvm:${LLVM_MAX_SLOT}=[zstd]
+ $(llvm_gen_dep '
+ sys-devel/clang:${LLVM_SLOT}
+ sys-devel/lld:${LLVM_SLOT}
+ sys-devel/llvm:${LLVM_SLOT}[zstd]
+ ')
)
"
@@ -63,10 +70,6 @@ RESTRICT="!llvm? ( test )"
# Zig uses self-hosted compiler only
CHECKREQS_MEMORY="4G"
-llvm_check_deps() {
- has_version "sys-devel/clang:${LLVM_SLOT}"
-}
-
ctarget_to_zigtarget() {
# Zig's Target Format: arch-os-abi
local CTARGET="${CTARGET:-${CHOST}}"
@@ -114,7 +117,7 @@ pkg_setup() {
export ZIG_SYS_INSTALL_DEST="${EPREFIX}/usr/$(get_libdir)/zig/${PV}"
- use llvm && llvm_pkg_setup
+ use llvm && llvm-r1_pkg_setup
check-reqs_pkg_setup
}
@@ -140,7 +143,7 @@ src_configure() {
-DZIG_TARGET_TRIPLE="$(get_zig_target)"
-DZIG_TARGET_MCPU="$(get_zig_mcpu)"
-DZIG_USE_LLVM_CONFIG=ON
- -DCMAKE_PREFIX_PATH="$(get_llvm_prefix ${LLVM_MAX_SLOT})"
+ -DCMAKE_PREFIX_PATH="$(get_llvm_prefix)"
-DCMAKE_INSTALL_PREFIX="${ZIG_SYS_INSTALL_DEST}"
)
^ permalink raw reply related [flat|nested] 72+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-lang/zig/
@ 2023-12-13 7:47 Florian Schmaus
0 siblings, 0 replies; 72+ messages in thread
From: Florian Schmaus @ 2023-12-13 7:47 UTC (permalink / raw
To: gentoo-commits
commit: ff13cba4edbd2a712f1d863b96fa549f74a9e91b
Author: Eric Joldasov <bratishkaerik <AT> getgoogleoff <DOT> me>
AuthorDate: Tue Dec 12 14:35:44 2023 +0000
Commit: Florian Schmaus <flow <AT> gentoo <DOT> org>
CommitDate: Wed Dec 13 07:47:23 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ff13cba4
dev-lang/zig: remove ".max_rss" fields initializers from build.zig in 9999
They are too high and cause errors like below:
* https://www.github.com/ziglang/zig/issues/18263
Signed-off-by: Eric Joldasov <bratishkaerik <AT> getgoogleoff.me>
Closes: https://github.com/gentoo/gentoo/pull/34252
Signed-off-by: Florian Schmaus <flow <AT> gentoo.org>
dev-lang/zig/zig-9999.ebuild | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/dev-lang/zig/zig-9999.ebuild b/dev-lang/zig/zig-9999.ebuild
index 6e98f73a3af4..a29f09a3db19 100644
--- a/dev-lang/zig/zig-9999.ebuild
+++ b/dev-lang/zig/zig-9999.ebuild
@@ -148,6 +148,11 @@ src_configure() {
}
src_compile() {
+ # Remove "limit memory usage" flags, it's already verified by
+ # CHECKREQS_MEMORY and causes unneccessary errors. Upstream set them
+ # according to CI OOM failures, which are higher than during Gentoo build.
+ sed -i -e '/\.max_rss = .*,/d' build.zig || die
+
if ! use llvm; then
$(tc-getCC) -o bootstrap bootstrap.c || die "Zig's bootstrap.c compilation failed"
edob ./bootstrap
^ permalink raw reply related [flat|nested] 72+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-lang/zig/
@ 2023-11-22 11:38 Sam James
0 siblings, 0 replies; 72+ messages in thread
From: Sam James @ 2023-11-22 11:38 UTC (permalink / raw
To: gentoo-commits
commit: 907ccc13308ae0393eb165b43d4fc5a9e5af0ae5
Author: Eric Joldasov <bratishkaerik <AT> getgoogleoff <DOT> me>
AuthorDate: Thu Nov 16 18:05:24 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Nov 22 11:36:50 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=907ccc13
dev-lang/zig: add `llvm` USE-flag for 9999
See upstream PR https://www.github.com/ziglang/zig/pull/17994
and https://www.github.com/ziglang/zig/commit/f8b38a174f0c4a843688fe8adac09dc4f66cd585 .
LLVM-less build cannot build `sys-fs/ncdu` yet (no @cImport support), but we are close.
Signed-off-by: Eric Joldasov <bratishkaerik <AT> getgoogleoff.me>
Closes: https://github.com/gentoo/gentoo/pull/33868
Signed-off-by: Sam James <sam <AT> gentoo.org>
dev-lang/zig/metadata.xml | 3 +++
dev-lang/zig/zig-9999.ebuild | 64 +++++++++++++++++++++++++++++++++++++-------
2 files changed, 57 insertions(+), 10 deletions(-)
diff --git a/dev-lang/zig/metadata.xml b/dev-lang/zig/metadata.xml
index a5a5818faae7..ad21fd6654d5 100644
--- a/dev-lang/zig/metadata.xml
+++ b/dev-lang/zig/metadata.xml
@@ -9,6 +9,9 @@
<email>proxy-maint@gentoo.org</email>
<name>Proxy Maintainers</name>
</maintainer>
+ <use>
+ <flag name="llvm">Build with LLVM backend and extensions enabled.</flag>
+ </use>
<upstream>
<remote-id type="github">ziglang/zig</remote-id>
<bugs-to>https://github.com/ziglang/zig/issues</bugs-to>
diff --git a/dev-lang/zig/zig-9999.ebuild b/dev-lang/zig/zig-9999.ebuild
index 9605234cfc43..6e98f73a3af4 100644
--- a/dev-lang/zig/zig-9999.ebuild
+++ b/dev-lang/zig/zig-9999.ebuild
@@ -29,7 +29,8 @@ fi
# lib/libc/glibc: BSD HPND ISC inner-net LGPL-2.1+
LICENSE="MIT Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT ) || ( Apache-2.0-with-LLVM-exceptions Apache-2.0 MIT BSD-2 ) public-domain BSD-2 ZPL ISC HPND BSD inner-net LGPL-2.1+"
SLOT="$(ver_cut 1-2)"
-IUSE="doc"
+IUSE="doc +llvm"
+REQUIRED_USE="!llvm? ( !doc )"
BUILD_DIR="${S}/build"
@@ -39,9 +40,11 @@ BUILD_DIR="${S}/build"
# You can check https://github.com/ziglang/zig-bootstrap in future, to see
# options that are passed to LLVM CMake building (excluding "static" ofc).
DEPEND="
- sys-devel/clang:${LLVM_MAX_SLOT}=
- sys-devel/lld:${LLVM_MAX_SLOT}=
- sys-devel/llvm:${LLVM_MAX_SLOT}=[zstd]
+ llvm? (
+ sys-devel/clang:${LLVM_MAX_SLOT}=
+ sys-devel/lld:${LLVM_MAX_SLOT}=
+ sys-devel/llvm:${LLVM_MAX_SLOT}=[zstd]
+ )
"
RDEPEND="
@@ -54,6 +57,8 @@ IDEPEND="app-eselect/eselect-zig"
# For now, Zig Build System doesn't support enviromental CFLAGS/LDFLAGS/etc.
QA_FLAGS_IGNORED="usr/.*/zig/${PV}/bin/zig"
+RESTRICT="!llvm? ( test )"
+
# Since commit https://github.com/ziglang/zig/commit/e7d28344fa3ee81d6ad7ca5ce1f83d50d8502118
# Zig uses self-hosted compiler only
CHECKREQS_MEMORY="4G"
@@ -103,14 +108,31 @@ get_zig_target() {
}
pkg_setup() {
- llvm_pkg_setup
+ # Useful for debugging and a little bit more deterministic.
+ export ZIG_LOCAL_CACHE_DIR="${T}/zig-local-cache"
+ export ZIG_GLOBAL_CACHE_DIR="${T}/zig-global-cache"
+
+ export ZIG_SYS_INSTALL_DEST="${EPREFIX}/usr/$(get_libdir)/zig/${PV}"
+
+ use llvm && llvm_pkg_setup
check-reqs_pkg_setup
}
src_configure() {
- # Useful for debugging and a little bit more deterministic.
- export ZIG_LOCAL_CACHE_DIR="${T}/zig-local-cache"
- export ZIG_GLOBAL_CACHE_DIR="${T}/zig-global-cache"
+ if ! use llvm; then
+ mkdir -p "${BUILD_DIR}/stage3" || die
+ # Currently, Zig without LLVM extensions lacks most optimizations.
+ export ZIG_BOOTSTRAP_STAGE3_FLAGS=(
+ -Dtarget="$(get_zig_target)"
+ -Dcpu="$(get_zig_mcpu)"
+ -Doptimize=Debug
+ -Dno-autodocs
+ -Dno-langref
+ -Denable-llvm=false
+ -Dforce-link-libc
+ )
+ return
+ fi
local mycmakeargs=(
-DZIG_USE_CCACHE=OFF
@@ -119,13 +141,20 @@ src_configure() {
-DZIG_TARGET_MCPU="$(get_zig_mcpu)"
-DZIG_USE_LLVM_CONFIG=ON
-DCMAKE_PREFIX_PATH="$(get_llvm_prefix ${LLVM_MAX_SLOT})"
- -DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr/$(get_libdir)/zig/${PV}"
+ -DCMAKE_INSTALL_PREFIX="${ZIG_SYS_INSTALL_DEST}"
)
cmake_src_configure
}
src_compile() {
+ if ! use llvm; then
+ $(tc-getCC) -o bootstrap bootstrap.c || die "Zig's bootstrap.c compilation failed"
+ edob ./bootstrap
+ edo ./zig2 build install --prefix "${BUILD_DIR}/stage3/" "${ZIG_BOOTSTRAP_STAGE3_FLAGS[@]}"
+ return
+ fi
+
cmake_src_compile
"${BUILD_DIR}/stage3/bin/zig" env || die "Zig compilation failed"
@@ -154,8 +183,15 @@ src_test() {
}
src_install() {
+ local DOCS=( "README.md" "doc/build.zig.zon.md" )
use doc && local HTML_DOCS=( "docgen/doc/langref.html" "docgen/doc/std" )
- cmake_src_install
+
+ if ! use llvm; then
+ DESTDIR="${D}" edo ./zig2 build install --prefix "${ZIG_SYS_INSTALL_DEST}" "${ZIG_BOOTSTRAP_STAGE3_FLAGS[@]}"
+ einstalldocs
+ else
+ cmake_src_install
+ fi
cd "${ED}/usr/$(get_libdir)/zig/${PV}/" || die
mv lib/zig/ lib2/ || die
@@ -166,6 +202,14 @@ src_install() {
pkg_postinst() {
eselect zig update ifunset
+
+ if ! use llvm; then
+ elog "Currently, Zig built without LLVM support lacks some"
+ elog "important features such as most optimizations, @cImport, etc."
+ elog "They are listed under \"Building from Source without LLVM\""
+ elog "section of the README file from \"/usr/share/doc/${PF}\" ."
+ elog "It's recommended to use C backend directly with this stage2 build."
+ fi
}
pkg_postrm() {
^ permalink raw reply related [flat|nested] 72+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-lang/zig/
@ 2023-09-26 15:54 Sam James
0 siblings, 0 replies; 72+ messages in thread
From: Sam James @ 2023-09-26 15:54 UTC (permalink / raw
To: gentoo-commits
commit: 4d67993edccbfabf302a222c3a35658d80c900fb
Author: Eric Joldasov <bratishkaerik <AT> getgoogleoff <DOT> me>
AuthorDate: Tue Sep 19 18:34:43 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Sep 26 15:54:23 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4d67993e
dev-lang/zig: update to LLVM 17 for 9999
See also https://www.github.com/ziglang/zig/pull/17202 .
Signed-off-by: Eric Joldasov <bratishkaerik <AT> getgoogleoff.me>
Closes: https://github.com/gentoo/gentoo/pull/32935
Signed-off-by: Sam James <sam <AT> gentoo.org>
dev-lang/zig/zig-9999.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-lang/zig/zig-9999.ebuild b/dev-lang/zig/zig-9999.ebuild
index 1644ef100c5c..e6ab3dbeeb61 100644
--- a/dev-lang/zig/zig-9999.ebuild
+++ b/dev-lang/zig/zig-9999.ebuild
@@ -3,7 +3,7 @@
EAPI=8
-LLVM_MAX_SLOT=16
+LLVM_MAX_SLOT=17
inherit edo cmake llvm check-reqs toolchain-funcs
DESCRIPTION="A robust, optimal, and maintainable programming language"
^ permalink raw reply related [flat|nested] 72+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-lang/zig/
@ 2023-08-25 3:58 Jakov Smolić
0 siblings, 0 replies; 72+ messages in thread
From: Jakov Smolić @ 2023-08-25 3:58 UTC (permalink / raw
To: gentoo-commits
commit: ececf403a1e5ee445cc95c5de14f98e9cccf751e
Author: Eric Joldasov <bratishkaerik <AT> getgoogleoff <DOT> me>
AuthorDate: Fri Aug 4 08:53:38 2023 +0000
Commit: Jakov Smolić <jsmolic <AT> gentoo <DOT> org>
CommitDate: Fri Aug 25 03:58:00 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ececf403
dev-lang/zig: add 0.11.0
Signed-off-by: Eric Joldasov <bratishkaerik <AT> getgoogleoff.me>
Signed-off-by: Jakov Smolić <jsmolic <AT> gentoo.org>
dev-lang/zig/Manifest | 1 +
dev-lang/zig/zig-0.11.0.ebuild | 167 +++++++++++++++++++++++++++++++++++++++++
2 files changed, 168 insertions(+)
diff --git a/dev-lang/zig/Manifest b/dev-lang/zig/Manifest
index 529aa0c2bc35..99b9116507be 100644
--- a/dev-lang/zig/Manifest
+++ b/dev-lang/zig/Manifest
@@ -1 +1,2 @@
DIST zig-0.10.1.tar.xz 15143112 BLAKE2B 4954d95ad763000eedf73a78e62bc0e99d65bba91c7127cdf1ea4503eb67817265daf572f645b7efbe9e24087e690b2768f0b2bc6c43b5fd76eab33143e964fe SHA512 d443adf61556bc95470537c6b0371a0ac99d19a06b15635cf1e5055ae7849039680c9006105e06e1bd6ba0fc12da14c54c1d28ac597c7dee17ee3a5cd9cf79f8
+DIST zig-0.11.0.tar.xz 15275316 BLAKE2B 603e4995a36d214ba71cf05b719a04732c8927995c8207ab8fdd574dca3410cdc5ccc8f6aa9964807afc04a5cbce1a3910a6cde4cf12e585cdf7684833217eb2 SHA512 c19a8ae6d440a16dd5e77941fc77c036d1f284f1784376625e63b65f30b4acad62f9f4217bc818c401f88c2c33f8722f26fc467c3e23c29a89178c4b1882d1c4
diff --git a/dev-lang/zig/zig-0.11.0.ebuild b/dev-lang/zig/zig-0.11.0.ebuild
new file mode 100644
index 000000000000..1644ef100c5c
--- /dev/null
+++ b/dev-lang/zig/zig-0.11.0.ebuild
@@ -0,0 +1,167 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+LLVM_MAX_SLOT=16
+inherit edo cmake llvm check-reqs toolchain-funcs
+
+DESCRIPTION="A robust, optimal, and maintainable programming language"
+HOMEPAGE="https://ziglang.org/"
+if [[ ${PV} == 9999 ]]; then
+ EGIT_REPO_URI="https://github.com/ziglang/zig.git"
+ inherit git-r3
+else
+ SRC_URI="https://ziglang.org/download/${PV}/${P}.tar.xz"
+ KEYWORDS="~amd64 ~arm ~arm64"
+fi
+
+# project itself: MIT
+# There are bunch of projects under "lib/" folder that are needed for cross-compilation.
+# Files that are unnecessary for cross-compilation are removed by upstream
+# and therefore their licenses (if any special) are not included.
+# lib/libunwind: Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )
+# lib/libcxxabi: Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )
+# lib/libcxx: Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )
+# lib/libc/wasi: || ( Apache-2.0-with-LLVM-exceptions Apache-2.0 MIT BSD-2 ) public-domain
+# lib/libc/musl: MIT BSD-2
+# lib/libc/mingw: ZPL public-domain BSD-2 ISC HPND
+# lib/libc/glibc: BSD HPND ISC inner-net LGPL-2.1+
+LICENSE="MIT Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT ) || ( Apache-2.0-with-LLVM-exceptions Apache-2.0 MIT BSD-2 ) public-domain BSD-2 ZPL ISC HPND BSD inner-net LGPL-2.1+"
+SLOT="$(ver_cut 1-2)"
+IUSE="doc"
+
+BUILD_DIR="${S}/build"
+
+# Zig requires zstd and zlib compression support in LLVM, if using LLVM backend.
+# (non-LLVM backends don't require these)
+# They are not required "on their own", so please don't add them here.
+# You can check https://github.com/ziglang/zig-bootstrap in future, to see
+# options that are passed to LLVM CMake building (excluding "static" ofc).
+DEPEND="
+ sys-devel/clang:${LLVM_MAX_SLOT}=
+ sys-devel/lld:${LLVM_MAX_SLOT}=
+ sys-devel/llvm:${LLVM_MAX_SLOT}=[zstd]
+"
+
+RDEPEND="
+ ${DEPEND}
+"
+
+IDEPEND="app-eselect/eselect-zig"
+
+# see https://github.com/ziglang/zig/issues/3382
+# For now, Zig Build System doesn't support enviromental CFLAGS/LDFLAGS/etc.
+QA_FLAGS_IGNORED="usr/.*/zig/${PV}/bin/zig"
+
+# Since commit https://github.com/ziglang/zig/commit/e7d28344fa3ee81d6ad7ca5ce1f83d50d8502118
+# Zig uses self-hosted compiler only
+CHECKREQS_MEMORY="4G"
+
+llvm_check_deps() {
+ has_version "sys-devel/clang:${LLVM_SLOT}"
+}
+
+ctarget_to_zigtarget() {
+ # Zig's Target Format: arch-os-abi
+ local CTARGET="${CTARGET:-${CHOST}}"
+
+ local ZIG_ARCH
+ case "${CTARGET%%-*}" in
+ i?86) ZIG_ARCH=x86;;
+ sparcv9) ZIG_ARCH=sparc64;;
+ *) ZIG_ARCH="${CTARGET%%-*}";; # Same as in CHOST
+ esac
+
+ local ZIG_OS
+ case "${CTARGET}" in
+ *linux*) ZIG_OS=linux;;
+ *apple*) ZIG_OS=macos;;
+ esac
+
+ local ZIG_ABI
+ case "${CTARGET##*-}" in
+ gnu) ZIG_ABI=gnu;;
+ solaris*) ZIG_OS=solaris ZIG_ABI=none;;
+ darwin*) ZIG_ABI=none;;
+ *) ZIG_ABI="${CTARGET##*-}";; # Same as in CHOST
+ esac
+
+ echo "${ZIG_ARCH}-${ZIG_OS}-${ZIG_ABI}"
+}
+
+get_zig_mcpu() {
+ local ZIG_DEFAULT_MCPU=native
+ tc-is-cross-compiler && ZIG_DEFAULT_MCPU=baseline
+ echo "${ZIG_MCPU:-${ZIG_DEFAULT_MCPU}}"
+}
+
+get_zig_target() {
+ local ZIG_DEFAULT_TARGET=native
+ tc-is-cross-compiler && ZIG_DEFAULT_TARGET="$(ctarget_to_zigtarget)"
+ echo "${ZIG_TARGET:-${ZIG_DEFAULT_TARGET}}"
+}
+
+pkg_setup() {
+ llvm_pkg_setup
+ check-reqs_pkg_setup
+}
+
+src_configure() {
+ local mycmakeargs=(
+ -DZIG_USE_CCACHE=OFF
+ -DZIG_SHARED_LLVM=ON
+ -DZIG_TARGET_TRIPLE="$(get_zig_target)"
+ -DZIG_TARGET_MCPU="$(get_zig_mcpu)"
+ -DZIG_USE_LLVM_CONFIG=ON
+ -DCMAKE_PREFIX_PATH="$(get_llvm_prefix ${LLVM_MAX_SLOT})"
+ -DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr/$(get_libdir)/zig/${PV}"
+ )
+
+ cmake_src_configure
+}
+
+src_compile() {
+ cmake_src_compile
+
+ if use doc; then
+ cd "${BUILD_DIR}" || die
+ edo ./stage3/bin/zig build std-docs --prefix "${S}/docgen/"
+ edo ./stage3/bin/zig build langref --prefix "${S}/docgen/"
+ fi
+}
+
+src_test() {
+ cd "${BUILD_DIR}" || die
+ local ZIG_TEST_ARGS="-Dstatic-llvm=false -Denable-llvm -Dskip-non-native \
+ -Doptimize=ReleaseSafe -Dtarget=$(get_zig_target) -Dcpu=$(get_zig_mcpu)"
+ local ZIG_TEST_STEPS=(
+ test-cases test-fmt test-behavior test-compiler-rt test-universal-libc test-compare-output
+ test-standalone test-c-abi test-link test-stack-traces test-cli test-asm-link test-translate-c
+ test-run-translated-c test-std
+ )
+
+ local step
+ for step in "${ZIG_TEST_STEPS[@]}" ; do
+ edob ./stage3/bin/zig build ${step} ${ZIG_TEST_ARGS}
+ done
+}
+
+src_install() {
+ use doc && local HTML_DOCS=( "docgen/doc/langref.html" "docgen/doc/std" )
+ cmake_src_install
+
+ cd "${ED}/usr/$(get_libdir)/zig/${PV}/" || die
+ mv lib/zig/ lib2/ || die
+ rm -rf lib/ || die
+ mv lib2/ lib/ || die
+ dosym -r "/usr/$(get_libdir)/zig/${PV}/bin/zig" "/usr/bin/zig-${PV}"
+}
+
+pkg_postinst() {
+ eselect zig update ifunset
+}
+
+pkg_postrm() {
+ eselect zig update ifunset
+}
^ permalink raw reply related [flat|nested] 72+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-lang/zig/
@ 2023-07-26 3:33 Sam James
0 siblings, 0 replies; 72+ messages in thread
From: Sam James @ 2023-07-26 3:33 UTC (permalink / raw
To: gentoo-commits
commit: 3126404cca731e732d4a413fbd24edc052b5e410
Author: Eric Joldasov <bratishkaerik <AT> getgoogleoff <DOT> me>
AuthorDate: Tue Jul 25 18:30:39 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Jul 26 03:32:52 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3126404c
dev-lang/zig: fix building on 9999 with "doc" USE-flag enabled
ZIG_NO_LANGREF variable was disabled in https://github.com/ziglang/zig/commit/32a175740c8750a7db550011795a4c22c0d0bc93.
Signed-off-by: Eric Joldasov <bratishkaerik <AT> getgoogleoff.me>
Closes: https://github.com/gentoo/gentoo/pull/32035
Signed-off-by: Sam James <sam <AT> gentoo.org>
dev-lang/zig/zig-9999.ebuild | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/dev-lang/zig/zig-9999.ebuild b/dev-lang/zig/zig-9999.ebuild
index dd8650c3aa2c..41467b2d0539 100644
--- a/dev-lang/zig/zig-9999.ebuild
+++ b/dev-lang/zig/zig-9999.ebuild
@@ -116,7 +116,6 @@ src_configure() {
-DZIG_USE_LLVM_CONFIG=ON
-DCMAKE_PREFIX_PATH="$(get_llvm_prefix ${LLVM_MAX_SLOT})"
-DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr/$(get_libdir)/zig/${PV}"
- -DZIG_NO_LANGREF="$(usex !doc ON OFF)"
)
cmake_src_configure
@@ -127,7 +126,7 @@ src_compile() {
if use doc; then
cd "${BUILD_DIR}" || die
- mv ./stage3/doc/langref.html "${S}" || die
+ edo ./stage3/bin/zig run ../doc/docgen.zig -- --zig ./stage3/bin/zig ../doc/langref.html.in "${S}/langref.html"
edo ./stage3/bin/zig test ../lib/std/std.zig --zig-lib-dir ../lib -fno-emit-bin -femit-docs="${S}/std"
fi
}
^ permalink raw reply related [flat|nested] 72+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-lang/zig/
@ 2023-05-13 3:28 Sam James
0 siblings, 0 replies; 72+ messages in thread
From: Sam James @ 2023-05-13 3:28 UTC (permalink / raw
To: gentoo-commits
commit: 17236bf13b73ff1558fec245631e14f370fbe117
Author: Eric Joldasov <bratishkaerik <AT> getgoogleoff <DOT> me>
AuthorDate: Mon May 1 13:58:59 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat May 13 03:28:16 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=17236bf1
dev-lang/zig: update testing process for 9999
Signed-off-by: Eric Joldasov <bratishkaerik <AT> getgoogleoff.me>
Closes: https://github.com/gentoo/gentoo/pull/30616
Signed-off-by: Sam James <sam <AT> gentoo.org>
dev-lang/zig/zig-9999.ebuild | 19 ++++++++++++++-----
1 file changed, 14 insertions(+), 5 deletions(-)
diff --git a/dev-lang/zig/zig-9999.ebuild b/dev-lang/zig/zig-9999.ebuild
index 2346feadd70a..dd8650c3aa2c 100644
--- a/dev-lang/zig/zig-9999.ebuild
+++ b/dev-lang/zig/zig-9999.ebuild
@@ -116,6 +116,7 @@ src_configure() {
-DZIG_USE_LLVM_CONFIG=ON
-DCMAKE_PREFIX_PATH="$(get_llvm_prefix ${LLVM_MAX_SLOT})"
-DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr/$(get_libdir)/zig/${PV}"
+ -DZIG_NO_LANGREF="$(usex !doc ON OFF)"
)
cmake_src_configure
@@ -126,17 +127,25 @@ src_compile() {
if use doc; then
cd "${BUILD_DIR}" || die
- edo ./zig2 run ../doc/docgen.zig -- --zig ./zig2 ../doc/langref.html.in "${S}/langref.html"
- edo ./zig2 test ../lib/std/std.zig --zig-lib-dir ../lib -fno-emit-bin -femit-docs="${S}/std"
+ mv ./stage3/doc/langref.html "${S}" || die
+ edo ./stage3/bin/zig test ../lib/std/std.zig --zig-lib-dir ../lib -fno-emit-bin -femit-docs="${S}/std"
fi
}
src_test() {
cd "${BUILD_DIR}" || die
local ZIG_TEST_ARGS="-Dstatic-llvm=false -Denable-llvm -Dskip-non-native \
- -Drelease -Dtarget=$(get_zig_target) -Dcpu=$(get_zig_mcpu)"
- # TBF zig2 -> stage3/bin/zig when (if) https://github.com/ziglang/zig/pull/14255 will be merged
- edo ./zig2 build test ${ZIG_TEST_ARGS}
+ -Doptimize=ReleaseSafe -Dtarget=$(get_zig_target) -Dcpu=$(get_zig_mcpu)"
+ local ZIG_TEST_STEPS=(
+ test-cases test-fmt test-behavior test-compiler-rt test-universal-libc test-compare-output
+ test-standalone test-c-abi test-link test-stack-traces test-cli test-asm-link test-translate-c
+ test-run-translated-c test-std
+ )
+
+ local step
+ for step in "${ZIG_TEST_STEPS[@]}" ; do
+ edob ./stage3/bin/zig build ${step} ${ZIG_TEST_ARGS}
+ done
}
src_install() {
^ permalink raw reply related [flat|nested] 72+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-lang/zig/
@ 2023-05-13 3:28 Sam James
0 siblings, 0 replies; 72+ messages in thread
From: Sam James @ 2023-05-13 3:28 UTC (permalink / raw
To: gentoo-commits
commit: 02196982135a2b96e825e93d3f2019a146a9350d
Author: Eric Joldasov <bratishkaerik <AT> getgoogleoff <DOT> me>
AuthorDate: Sun Apr 16 07:03:27 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat May 13 03:28:16 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=02196982
dev-lang/zig: update LICENSE
Signed-off-by: Eric Joldasov <bratishkaerik <AT> getgoogleoff.me>
Signed-off-by: Sam James <sam <AT> gentoo.org>
dev-lang/zig/zig-0.10.1-r2.ebuild | 13 ++++++++++++-
dev-lang/zig/zig-9999.ebuild | 13 ++++++++++++-
2 files changed, 24 insertions(+), 2 deletions(-)
diff --git a/dev-lang/zig/zig-0.10.1-r2.ebuild b/dev-lang/zig/zig-0.10.1-r2.ebuild
index fc06e3a6e545..6200470dec94 100644
--- a/dev-lang/zig/zig-0.10.1-r2.ebuild
+++ b/dev-lang/zig/zig-0.10.1-r2.ebuild
@@ -16,7 +16,18 @@ else
KEYWORDS="~amd64 ~arm ~arm64"
fi
-LICENSE="MIT"
+# project itself: MIT
+# There are bunch of projects under "lib/" folder that are needed for cross-compilation.
+# Files that are unnecessary for cross-compilation are removed by upstream
+# and therefore their licenses (if any special) are not included.
+# lib/libunwind: Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )
+# lib/libcxxabi: Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )
+# lib/libcxx: Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )
+# lib/libc/wasi: || ( Apache-2.0-with-LLVM-exceptions Apache-2.0 MIT BSD-2 ) public-domain
+# lib/libc/musl: MIT BSD-2
+# lib/libc/mingw: ZPL public-domain BSD-2 ISC HPND
+# lib/libc/glibc: BSD HPND ISC inner-net LGPL-2.1+
+LICENSE="MIT Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT ) || ( Apache-2.0-with-LLVM-exceptions Apache-2.0 MIT BSD-2 ) public-domain BSD-2 ZPL ISC HPND BSD inner-net LGPL-2.1+"
SLOT="$(ver_cut 1-2)"
IUSE="doc"
diff --git a/dev-lang/zig/zig-9999.ebuild b/dev-lang/zig/zig-9999.ebuild
index 2fbe3863ef40..2346feadd70a 100644
--- a/dev-lang/zig/zig-9999.ebuild
+++ b/dev-lang/zig/zig-9999.ebuild
@@ -16,7 +16,18 @@ else
KEYWORDS="~amd64 ~arm ~arm64"
fi
-LICENSE="MIT"
+# project itself: MIT
+# There are bunch of projects under "lib/" folder that are needed for cross-compilation.
+# Files that are unnecessary for cross-compilation are removed by upstream
+# and therefore their licenses (if any special) are not included.
+# lib/libunwind: Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )
+# lib/libcxxabi: Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )
+# lib/libcxx: Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )
+# lib/libc/wasi: || ( Apache-2.0-with-LLVM-exceptions Apache-2.0 MIT BSD-2 ) public-domain
+# lib/libc/musl: MIT BSD-2
+# lib/libc/mingw: ZPL public-domain BSD-2 ISC HPND
+# lib/libc/glibc: BSD HPND ISC inner-net LGPL-2.1+
+LICENSE="MIT Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT ) || ( Apache-2.0-with-LLVM-exceptions Apache-2.0 MIT BSD-2 ) public-domain BSD-2 ZPL ISC HPND BSD inner-net LGPL-2.1+"
SLOT="$(ver_cut 1-2)"
IUSE="doc"
^ permalink raw reply related [flat|nested] 72+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-lang/zig/
@ 2023-04-07 4:19 Michał Górny
0 siblings, 0 replies; 72+ messages in thread
From: Michał Górny @ 2023-04-07 4:19 UTC (permalink / raw
To: gentoo-commits
commit: 03156f4e282b290c6323a2720f430fe037d4cdb6
Author: Eric Joldasov <bratishkaerik <AT> getgoogleoff <DOT> me>
AuthorDate: Fri Apr 7 04:08:58 2023 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Fri Apr 7 04:19:02 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=03156f4e
dev-lang/zig: update to LLVM 16 for 9999
Signed-off-by: Eric Joldasov <bratishkaerik <AT> getgoogleoff.me>
Closes: https://github.com/gentoo/gentoo/pull/30508
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
dev-lang/zig/zig-9999.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-lang/zig/zig-9999.ebuild b/dev-lang/zig/zig-9999.ebuild
index f0ac403fd612..2fbe3863ef40 100644
--- a/dev-lang/zig/zig-9999.ebuild
+++ b/dev-lang/zig/zig-9999.ebuild
@@ -3,7 +3,7 @@
EAPI=8
-LLVM_MAX_SLOT=15
+LLVM_MAX_SLOT=16
inherit edo cmake llvm check-reqs toolchain-funcs
DESCRIPTION="A robust, optimal, and maintainable programming language"
^ permalink raw reply related [flat|nested] 72+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-lang/zig/
@ 2023-03-10 7:00 Florian Schmaus
0 siblings, 0 replies; 72+ messages in thread
From: Florian Schmaus @ 2023-03-10 7:00 UTC (permalink / raw
To: gentoo-commits
commit: 5e8f76136eb2a9cdb9d50869ecabe88e669008dc
Author: Eric Joldasov <bratishkaerik <AT> getgoogleoff <DOT> me>
AuthorDate: Thu Mar 9 14:06:59 2023 +0000
Commit: Florian Schmaus <flow <AT> gentoo <DOT> org>
CommitDate: Fri Mar 10 07:00:04 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5e8f7613
dev-lang/zig: adjust QA_FLAGS_IGNORED for new placements
Closes: https://bugs.gentoo.org/900543
Signed-off-by: Eric Joldasov <bratishkaerik <AT> getgoogleoff.me>
Signed-off-by: Florian Schmaus <flow <AT> gentoo.org>
dev-lang/zig/zig-0.10.1-r2.ebuild | 2 +-
dev-lang/zig/zig-9999.ebuild | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/dev-lang/zig/zig-0.10.1-r2.ebuild b/dev-lang/zig/zig-0.10.1-r2.ebuild
index 7c16e1d9761c..fc06e3a6e545 100644
--- a/dev-lang/zig/zig-0.10.1-r2.ebuild
+++ b/dev-lang/zig/zig-0.10.1-r2.ebuild
@@ -40,7 +40,7 @@ IDEPEND="app-eselect/eselect-zig"
# see https://github.com/ziglang/zig/issues/3382
# For now, Zig Build System doesn't support enviromental CFLAGS/LDFLAGS/etc.
-QA_FLAGS_IGNORED="usr/bin/zig"
+QA_FLAGS_IGNORED="usr/.*/zig/${PV}/bin/zig"
# see https://ziglang.org/download/0.10.0/release-notes.html#Self-Hosted-Compiler
# 0.10.0 release - ~9.6 GiB, since we use compiler written in C++ for bootstrapping
diff --git a/dev-lang/zig/zig-9999.ebuild b/dev-lang/zig/zig-9999.ebuild
index c744d732215e..f0ac403fd612 100644
--- a/dev-lang/zig/zig-9999.ebuild
+++ b/dev-lang/zig/zig-9999.ebuild
@@ -41,7 +41,7 @@ IDEPEND="app-eselect/eselect-zig"
# see https://github.com/ziglang/zig/issues/3382
# For now, Zig Build System doesn't support enviromental CFLAGS/LDFLAGS/etc.
-QA_FLAGS_IGNORED="usr/bin/zig"
+QA_FLAGS_IGNORED="usr/.*/zig/${PV}/bin/zig"
# Since commit https://github.com/ziglang/zig/commit/e7d28344fa3ee81d6ad7ca5ce1f83d50d8502118
# Zig uses self-hosted compiler only
^ permalink raw reply related [flat|nested] 72+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-lang/zig/
@ 2023-03-09 17:56 Florian Schmaus
0 siblings, 0 replies; 72+ messages in thread
From: Florian Schmaus @ 2023-03-09 17:56 UTC (permalink / raw
To: gentoo-commits
commit: 62c12329b91daf81370acaa9873cebeab8b7f289
Author: Florian Schmaus <flow <AT> gentoo <DOT> org>
AuthorDate: Thu Mar 9 17:55:36 2023 +0000
Commit: Florian Schmaus <flow <AT> gentoo <DOT> org>
CommitDate: Thu Mar 9 17:55:36 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=62c12329
dev-lang/zig: sync live
Signed-off-by: Florian Schmaus <flow <AT> gentoo.org>
dev-lang/zig/zig-9999.ebuild | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/dev-lang/zig/zig-9999.ebuild b/dev-lang/zig/zig-9999.ebuild
index b3846db59b81..c744d732215e 100644
--- a/dev-lang/zig/zig-9999.ebuild
+++ b/dev-lang/zig/zig-9999.ebuild
@@ -35,9 +35,10 @@ DEPEND="
RDEPEND="
${DEPEND}
- app-eselect/eselect-zig
"
+IDEPEND="app-eselect/eselect-zig"
+
# see https://github.com/ziglang/zig/issues/3382
# For now, Zig Build System doesn't support enviromental CFLAGS/LDFLAGS/etc.
QA_FLAGS_IGNORED="usr/bin/zig"
^ permalink raw reply related [flat|nested] 72+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-lang/zig/
@ 2023-03-09 10:54 Florian Schmaus
0 siblings, 0 replies; 72+ messages in thread
From: Florian Schmaus @ 2023-03-09 10:54 UTC (permalink / raw
To: gentoo-commits
commit: f3ea1cde63c36f09e5ed98f763beb89aec062ff5
Author: Florian Schmaus <flow <AT> gentoo <DOT> org>
AuthorDate: Thu Mar 9 10:47:44 2023 +0000
Commit: Florian Schmaus <flow <AT> gentoo <DOT> org>
CommitDate: Thu Mar 9 10:53:59 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f3ea1cde
dev-lang/zig: ensure 'zig' symlink is valid if possible
Signed-off-by: Florian Schmaus <flow <AT> gentoo.org>
dev-lang/zig/zig-0.10.1-r1.ebuild | 6 ++++++
dev-lang/zig/zig-9999.ebuild | 8 ++++++++
2 files changed, 14 insertions(+)
diff --git a/dev-lang/zig/zig-0.10.1-r1.ebuild b/dev-lang/zig/zig-0.10.1-r1.ebuild
index cb8839ac166d..d92a0e709dda 100644
--- a/dev-lang/zig/zig-0.10.1-r1.ebuild
+++ b/dev-lang/zig/zig-0.10.1-r1.ebuild
@@ -155,6 +155,8 @@ src_install() {
}
pkg_postinst() {
+ eselect zig update ifunset
+
elog "0.10.1 release uses self-hosted compiler by default and fixes some bugs from 0.10.0"
elog "But your code still can be un-compilable since some features still not implemented or bugs not fixed"
elog "Upstream recommends:"
@@ -163,3 +165,7 @@ pkg_postinst() {
elog "Also see: https://ziglang.org/download/0.10.0/release-notes.html#Self-Hosted-Compiler"
elog "and https://ziglang.org/download/0.10.0/release-notes.html#How-to-Upgrade"
}
+
+pkg_postrm() {
+ eselect zig update ifunset
+}
diff --git a/dev-lang/zig/zig-9999.ebuild b/dev-lang/zig/zig-9999.ebuild
index 17f5c3e65408..b3846db59b81 100644
--- a/dev-lang/zig/zig-9999.ebuild
+++ b/dev-lang/zig/zig-9999.ebuild
@@ -137,3 +137,11 @@ src_install() {
mv lib2/ lib/ || die
dosym -r "/usr/$(get_libdir)/zig/${PV}/bin/zig" "/usr/bin/zig-${PV}"
}
+
+pkg_postinst() {
+ eselect zig update ifunset
+}
+
+pkg_postrm() {
+ eselect zig update ifunset
+}
^ permalink raw reply related [flat|nested] 72+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-lang/zig/
@ 2023-03-09 10:54 Florian Schmaus
0 siblings, 0 replies; 72+ messages in thread
From: Florian Schmaus @ 2023-03-09 10:54 UTC (permalink / raw
To: gentoo-commits
commit: 8fadfe488122a31156de1ea0118a4f9e7d7943f7
Author: Eric Joldasov <bratishkaerik <AT> getgoogleoff <DOT> me>
AuthorDate: Mon Jan 23 04:09:15 2023 +0000
Commit: Florian Schmaus <flow <AT> gentoo <DOT> org>
CommitDate: Thu Mar 9 10:53:57 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8fadfe48
dev-lang/zig: slotting, initial support for setting ZIG_{MCPU,TARGET}
* Install Zig to "/usr/$(get_libdir)/zig/${PV}", handle
/usr/bin/zig via eselect-zig
* Add functions for getting ZIG_TARGET and ZIG_MCPU (user-provided or
defaults) and use them for building/testing
* Add "doc" USE flag for installing language reference and stdlib
documentation
Closes: https://bugs.gentoo.org/885861
Bug: https://bugs.gentoo.org/890234
Signed-off-by: Eric Joldasov <bratishkaerik <AT> getgoogleoff.me>
Signed-off-by: Florian Schmaus <flow <AT> gentoo.org>
dev-lang/zig/zig-0.10.1-r1.ebuild | 165 ++++++++++++++++++++++++++++++++++++++
dev-lang/zig/zig-9999.ebuild | 82 +++++++++++++++++--
2 files changed, 241 insertions(+), 6 deletions(-)
diff --git a/dev-lang/zig/zig-0.10.1-r1.ebuild b/dev-lang/zig/zig-0.10.1-r1.ebuild
new file mode 100644
index 000000000000..2325724c6f9e
--- /dev/null
+++ b/dev-lang/zig/zig-0.10.1-r1.ebuild
@@ -0,0 +1,165 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+LLVM_MAX_SLOT=15
+inherit edo cmake llvm check-reqs toolchain-funcs
+
+DESCRIPTION="A robust, optimal, and maintainable programming language"
+HOMEPAGE="https://ziglang.org/"
+if [[ ${PV} == 9999 ]]; then
+ EGIT_REPO_URI="https://github.com/ziglang/zig.git"
+ inherit git-r3
+else
+ SRC_URI="https://ziglang.org/download/${PV}/${P}.tar.xz"
+ KEYWORDS="~amd64 ~arm ~arm64"
+fi
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1-2)"
+IUSE="doc"
+
+BUILD_DIR="${S}/build"
+# Zig requires zstd and zlib compression support in LLVM, if using LLVM backend.
+# (non-LLVM backends don't require these)
+# They are not required "on their own", so please don't add them here.
+# You can check https://github.com/ziglang/zig-bootstrap in future, to see
+# options that are passed to LLVM CMake building (excluding "static" ofc).
+DEPEND="
+ sys-devel/clang:${LLVM_MAX_SLOT}=
+ sys-devel/lld:${LLVM_MAX_SLOT}=
+ sys-devel/llvm:${LLVM_MAX_SLOT}=[zstd]
+"
+
+RDEPEND="
+ ${DEPEND}
+ app-eselect/eselect-zig
+"
+
+# see https://github.com/ziglang/zig/issues/3382
+# For now, Zig Build System doesn't support enviromental CFLAGS/LDFLAGS/etc.
+QA_FLAGS_IGNORED="usr/bin/zig"
+
+# see https://ziglang.org/download/0.10.0/release-notes.html#Self-Hosted-Compiler
+# 0.10.0 release - ~9.6 GiB, since we use compiler written in C++ for bootstrapping
+# 0.11.0 release - ~2.8 GiB, since we will (at least according to roadmap) use self-hosted compiler
+# (transpiled to C via C backend) for bootstrapping
+CHECKREQS_MEMORY="10G"
+
+PATCHES=(
+ "${FILESDIR}/zig-0.10.0-build-dir-install-stage3.patch"
+)
+
+llvm_check_deps() {
+ has_version "sys-devel/clang:${LLVM_SLOT}"
+}
+
+ctarget_to_zigtarget() {
+ # Zig's Target Format: arch-os-abi
+ local CTARGET="${CTARGET:-${CHOST}}"
+
+ local ZIG_ARCH
+ case "${CTARGET%%-*}" in
+ i?86) ZIG_ARCH=x86;;
+ sparcv9) ZIG_ARCH=sparc64;;
+ *) ZIG_ARCH="${CTARGET%%-*}";; # Same as in CHOST
+ esac
+
+ local ZIG_OS
+ case "${CTARGET}" in
+ *linux*) ZIG_OS=linux;;
+ *apple*) ZIG_OS=macos;;
+ esac
+
+ local ZIG_ABI
+ case "${CTARGET##*-}" in
+ gnu) ZIG_ABI=gnu;;
+ solaris*) ZIG_OS=solaris ZIG_ABI=none;;
+ darwin*) ZIG_ABI=none;;
+ *) ZIG_ABI="${CTARGET##*-}";; # Same as in CHOST
+ esac
+
+ echo "${ZIG_ARCH}-${ZIG_OS}-${ZIG_ABI}"
+}
+
+get_zig_mcpu() {
+ local ZIG_DEFAULT_MCPU=native
+ tc-is-cross-compiler && ZIG_DEFAULT_MCPU=baseline
+ echo "${ZIG_MCPU:-${ZIG_DEFAULT_MCPU}}"
+}
+
+get_zig_target() {
+ local ZIG_DEFAULT_TARGET=native
+ tc-is-cross-compiler && ZIG_DEFAULT_TARGET="$(ctarget_to_zigtarget)"
+ echo "${ZIG_TARGET:-${ZIG_DEFAULT_TARGET}}"
+}
+
+pkg_setup() {
+ llvm_pkg_setup
+ ewarn "This version requires 10G of memory for building compiler."
+ ewarn "If you don't have enough memory, you can wait until 0.11.0 release"
+ ewarn "or (if you are risky) use 9999 version (currently requires only 4GB)"
+ check-reqs_pkg_setup
+}
+
+src_configure() {
+ local mycmakeargs=(
+ -DZIG_USE_CCACHE=OFF
+ -DZIG_SHARED_LLVM=ON
+ -DZIG_TARGET_TRIPLE="$(get_zig_target)"
+ -DZIG_TARGET_MCPU="$(get_zig_mcpu)"
+ -DZIG_USE_LLVM_CONFIG=ON
+ -DCMAKE_PREFIX_PATH="$(get_llvm_prefix ${LLVM_MAX_SLOT})"
+ -DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr/$(get_libdir)/zig/${PV}"
+ )
+
+ cmake_src_configure
+}
+
+src_compile() {
+ cmake_src_compile
+
+ if use doc; then
+ cd "${BUILD_DIR}" || die
+ edo ./zig2 run ../doc/docgen.zig -- ./zig2 ../doc/langref.html.in "${S}/langref.html"
+ edo ./zig2 test ../lib/std/std.zig --zig-lib-dir ../lib -fno-emit-bin -femit-docs="${S}/std"
+ fi
+}
+
+src_test() {
+ cd "${BUILD_DIR}" || die
+ local ZIG_TEST_ARGS="-Dstatic-llvm=false -Denable-llvm -Dskip-non-native \
+ -Drelease -Dtarget=$(get_zig_target) -Dcpu=$(get_zig_mcpu)"
+ local ZIG_TEST_STEPS=(
+ test-cases test-fmt test-behavior test-compiler-rt test-universal-libc test-compare-output
+ test-standalone test-c-abi test-link test-stack-traces test-cli test-asm-link test-translate-c
+ test-run-translated-c test-std
+ )
+
+ local step
+ for step in "${ZIG_TEST_STEPS[@]}" ; do
+ edob ./stage3/bin/zig build ${step} ${ZIG_TEST_ARGS}
+ done
+}
+
+src_install() {
+ use doc && local HTML_DOCS=( "langref.html" "std" )
+ cmake_src_install
+ cd "${ED}/usr/$(get_libdir)/zig/${PV}/" || die
+ mv lib/zig/ lib2/ || die
+ rm -rf lib/ || die
+ mv lib2/ lib/ || die
+
+ dosym -r "/usr/$(get_libdir)/zig/${PV}/bin/zig" "/usr/bin/zig-${PV}"
+}
+
+pkg_postinst() {
+ elog "0.10.1 release uses self-hosted compiler by default and fixes some bugs from 0.10.0"
+ elog "But your code still can be un-compilable since some features still not implemented or bugs not fixed"
+ elog "Upstream recommends:"
+ elog " * Using old compiler if experiencing such breakage (flag '-fstage1')"
+ elog " * Waiting for release 0.11.0 with old compiler removed (these changes are already merged in 9999)"
+ elog "Also see: https://ziglang.org/download/0.10.0/release-notes.html#Self-Hosted-Compiler"
+ elog "and https://ziglang.org/download/0.10.0/release-notes.html#How-to-Upgrade"
+}
diff --git a/dev-lang/zig/zig-9999.ebuild b/dev-lang/zig/zig-9999.ebuild
index 04794281b8d8..17f5c3e65408 100644
--- a/dev-lang/zig/zig-9999.ebuild
+++ b/dev-lang/zig/zig-9999.ebuild
@@ -1,10 +1,10 @@
-# Copyright 2019-2022 Gentoo Authors
+# Copyright 2019-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
LLVM_MAX_SLOT=15
-inherit cmake llvm check-reqs
+inherit edo cmake llvm check-reqs toolchain-funcs
DESCRIPTION="A robust, optimal, and maintainable programming language"
HOMEPAGE="https://ziglang.org/"
@@ -17,7 +17,8 @@ else
fi
LICENSE="MIT"
-SLOT="0"
+SLOT="$(ver_cut 1-2)"
+IUSE="doc"
BUILD_DIR="${S}/build"
@@ -34,10 +35,11 @@ DEPEND="
RDEPEND="
${DEPEND}
- !dev-lang/zig-bin
+ app-eselect/eselect-zig
"
# see https://github.com/ziglang/zig/issues/3382
+# For now, Zig Build System doesn't support enviromental CFLAGS/LDFLAGS/etc.
QA_FLAGS_IGNORED="usr/bin/zig"
# Since commit https://github.com/ziglang/zig/commit/e7d28344fa3ee81d6ad7ca5ce1f83d50d8502118
@@ -48,6 +50,46 @@ llvm_check_deps() {
has_version "sys-devel/clang:${LLVM_SLOT}"
}
+ctarget_to_zigtarget() {
+ # Zig's Target Format: arch-os-abi
+ local CTARGET="${CTARGET:-${CHOST}}"
+
+ local ZIG_ARCH
+ case "${CTARGET%%-*}" in
+ i?86) ZIG_ARCH=x86;;
+ sparcv9) ZIG_ARCH=sparc64;;
+ *) ZIG_ARCH="${CTARGET%%-*}";; # Same as in CHOST
+ esac
+
+ local ZIG_OS
+ case "${CTARGET}" in
+ *linux*) ZIG_OS=linux;;
+ *apple*) ZIG_OS=macos;;
+ esac
+
+ local ZIG_ABI
+ case "${CTARGET##*-}" in
+ gnu) ZIG_ABI=gnu;;
+ solaris*) ZIG_OS=solaris ZIG_ABI=none;;
+ darwin*) ZIG_ABI=none;;
+ *) ZIG_ABI="${CTARGET##*-}";; # Same as in CHOST
+ esac
+
+ echo "${ZIG_ARCH}-${ZIG_OS}-${ZIG_ABI}"
+}
+
+get_zig_mcpu() {
+ local ZIG_DEFAULT_MCPU=native
+ tc-is-cross-compiler && ZIG_DEFAULT_MCPU=baseline
+ echo "${ZIG_MCPU:-${ZIG_DEFAULT_MCPU}}"
+}
+
+get_zig_target() {
+ local ZIG_DEFAULT_TARGET=native
+ tc-is-cross-compiler && ZIG_DEFAULT_TARGET="$(ctarget_to_zigtarget)"
+ echo "${ZIG_TARGET:-${ZIG_DEFAULT_TARGET}}"
+}
+
pkg_setup() {
llvm_pkg_setup
check-reqs_pkg_setup
@@ -57,13 +99,41 @@ src_configure() {
local mycmakeargs=(
-DZIG_USE_CCACHE=OFF
-DZIG_SHARED_LLVM=ON
- -DCMAKE_PREFIX_PATH=$(get_llvm_prefix ${LLVM_MAX_SLOT})
+ -DZIG_TARGET_TRIPLE="$(get_zig_target)"
+ -DZIG_TARGET_MCPU="$(get_zig_mcpu)"
+ -DZIG_USE_LLVM_CONFIG=ON
+ -DCMAKE_PREFIX_PATH="$(get_llvm_prefix ${LLVM_MAX_SLOT})"
+ -DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr/$(get_libdir)/zig/${PV}"
)
cmake_src_configure
}
+src_compile() {
+ cmake_src_compile
+
+ if use doc; then
+ cd "${BUILD_DIR}" || die
+ edo ./zig2 run ../doc/docgen.zig -- --zig ./zig2 ../doc/langref.html.in "${S}/langref.html"
+ edo ./zig2 test ../lib/std/std.zig --zig-lib-dir ../lib -fno-emit-bin -femit-docs="${S}/std"
+ fi
+}
+
src_test() {
cd "${BUILD_DIR}" || die
- ./zig2 build test -Dstatic-llvm=false -Denable-llvm=true -Dskip-non-native=true || die
+ local ZIG_TEST_ARGS="-Dstatic-llvm=false -Denable-llvm -Dskip-non-native \
+ -Drelease -Dtarget=$(get_zig_target) -Dcpu=$(get_zig_mcpu)"
+ # TBF zig2 -> stage3/bin/zig when (if) https://github.com/ziglang/zig/pull/14255 will be merged
+ edo ./zig2 build test ${ZIG_TEST_ARGS}
+}
+
+src_install() {
+ use doc && local HTML_DOCS=( "langref.html" "std" )
+ cmake_src_install
+
+ cd "${ED}/usr/$(get_libdir)/zig/${PV}/" || die
+ mv lib/zig/ lib2/ || die
+ rm -rf lib/ || die
+ mv lib2/ lib/ || die
+ dosym -r "/usr/$(get_libdir)/zig/${PV}/bin/zig" "/usr/bin/zig-${PV}"
}
^ permalink raw reply related [flat|nested] 72+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-lang/zig/
@ 2023-03-09 10:54 Florian Schmaus
0 siblings, 0 replies; 72+ messages in thread
From: Florian Schmaus @ 2023-03-09 10:54 UTC (permalink / raw
To: gentoo-commits
commit: 765823f832c01d4332d40e59d32b626cb40985a6
Author: Florian Schmaus <flow <AT> gentoo <DOT> org>
AuthorDate: Thu Mar 9 10:46:24 2023 +0000
Commit: Florian Schmaus <flow <AT> gentoo <DOT> org>
CommitDate: Thu Mar 9 10:53:58 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=765823f8
dev-lang/zig: downgrade ewarn to elog
ewarn and higher should, if possible, only be used conditionally and
check-reqs_pkg_setup already issues a warning if the memory requirements
are not met.
Signed-off-by: Florian Schmaus <flow <AT> gentoo.org>
dev-lang/zig/zig-0.10.1-r1.ebuild | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/dev-lang/zig/zig-0.10.1-r1.ebuild b/dev-lang/zig/zig-0.10.1-r1.ebuild
index 2325724c6f9e..cb8839ac166d 100644
--- a/dev-lang/zig/zig-0.10.1-r1.ebuild
+++ b/dev-lang/zig/zig-0.10.1-r1.ebuild
@@ -97,9 +97,9 @@ get_zig_target() {
pkg_setup() {
llvm_pkg_setup
- ewarn "This version requires 10G of memory for building compiler."
- ewarn "If you don't have enough memory, you can wait until 0.11.0 release"
- ewarn "or (if you are risky) use 9999 version (currently requires only 4GB)"
+ elog "This version requires 10G of memory for building compiler."
+ elog "If you don't have enough memory, you can wait until 0.11.0 release"
+ elog "or (if you are risky) use 9999 version (currently requires only 4GB)"
check-reqs_pkg_setup
}
^ permalink raw reply related [flat|nested] 72+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-lang/zig/
@ 2023-01-20 3:54 Sam James
0 siblings, 0 replies; 72+ messages in thread
From: Sam James @ 2023-01-20 3:54 UTC (permalink / raw
To: gentoo-commits
commit: ad227223cb9511c2f563d95aa06558fddfbe728c
Author: Eric Joldasov <bratishkaerik <AT> getgoogleoff <DOT> me>
AuthorDate: Fri Jan 20 03:46:47 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Jan 20 03:54:14 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ad227223
dev-lang/zig: drop 0.10.0-r2
It shouldn't be here.
Signed-off-by: Eric Joldasov <bratishkaerik <AT> getgoogleoff.me>
Closes: https://github.com/gentoo/gentoo/pull/29182
Signed-off-by: Sam James <sam <AT> gentoo.org>
dev-lang/zig/zig-0.10.0-r2.ebuild | 134 --------------------------------------
1 file changed, 134 deletions(-)
diff --git a/dev-lang/zig/zig-0.10.0-r2.ebuild b/dev-lang/zig/zig-0.10.0-r2.ebuild
deleted file mode 100644
index f3d9e009df5a..000000000000
--- a/dev-lang/zig/zig-0.10.0-r2.ebuild
+++ /dev/null
@@ -1,134 +0,0 @@
-# Copyright 2019-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-LLVM_MAX_SLOT=15
-inherit edo cmake llvm check-reqs toolchain-funcs
-
-DESCRIPTION="A robust, optimal, and maintainable programming language"
-HOMEPAGE="https://ziglang.org/"
-if [[ ${PV} == 9999 ]]; then
- EGIT_REPO_URI="https://github.com/ziglang/zig.git"
- inherit git-r3
-else
- SRC_URI="https://ziglang.org/download/${PV}/${P}.tar.xz"
- KEYWORDS="~amd64 ~arm ~arm64"
-fi
-
-LICENSE="MIT"
-SLOT="0"
-
-BUILD_DIR="${S}/build"
-
-# Zig requires zstd and zlib compression support in LLVM, if using LLVM backend.
-# (non-LLVM backends don't require these)
-# They are not required "on their own", so please don't add them here.
-# You can check https://github.com/ziglang/zig-bootstrap in future, to see
-# options that are passed to LLVM CMake building (excluding "static" ofc).
-DEPEND="
- sys-devel/clang:${LLVM_MAX_SLOT}=
- sys-devel/lld:${LLVM_MAX_SLOT}=
- sys-devel/llvm:${LLVM_MAX_SLOT}=[zstd]
-"
-
-RDEPEND="
- ${DEPEND}
- !dev-lang/zig-bin
-"
-
-# see https://github.com/ziglang/zig/issues/3382
-# For now, Zig doesn't support CFLAGS/LDFLAGS/etc.
-QA_FLAGS_IGNORED="usr/bin/zig"
-
-# see https://ziglang.org/download/0.10.0/release-notes.html#Self-Hosted-Compiler
-# 0.10.0 release - ~9.6 GiB, since we use compiler written in C++ for bootstrapping
-# 0.11.0 release - ~2.8 GiB, since we will (at least according to roadmap) use self-hosted compiler
-# (transpiled to C via C backend) for bootstrapping
-CHECKREQS_MEMORY="10G"
-
-PATCHES=(
- "${FILESDIR}/${P}-avoid-cmake-bug.patch"
- "${FILESDIR}/${P}-build-dir-install-stage3.patch"
-)
-
-llvm_check_deps() {
- has_version "sys-devel/clang:${LLVM_SLOT}"
-}
-
-ctarget_to_zigtarget() {
- #Zig's Target Format: arch-os-abi
- local CTARGET="${CTARGET:-${CHOST}}"
-
- local ZIG_ARCH
- case "${CTARGET%%-*}" in
- i?86) ZIG_ARCH=x86;;
- sparcv9) ZIG_ARCH=sparc64;;
- *) ZIG_ARCH=${CTARGET%%-*};; # Same as in CHOST
- esac
-
- local ZIG_OS
- case "${CTARGET}" in
- *linux*) ZIG_OS=linux;;
- *apple*) ZIG_OS=macos;;
- esac
-
- local ZIG_ABI
- case "${CTARGET##*-}" in
- gnu) ZIG_ABI="gnu.2.34";;
- solaris*) ZIG_OS=solaris ZIG_ABI=none;;
- darwin*) ZIG_ABI=none;;
- *) ZIG_ABI=${CTARGET##*-};; # Same as in CHOST
- esac
-
- echo "${ZIG_ARCH}-${ZIG_OS}-${ZIG_ABI}"
-}
-
-pkg_setup() {
- llvm_pkg_setup
- ewarn "This version requires 10G of memory for building compiler."
- ewarn "If you don't have enough memory, you can wait until 0.11.0 release"
- ewarn "or (if you are risky) use 9999 version (currently requires only 4GB)"
- check-reqs_pkg_setup
-}
-
-src_configure() {
- local ZIG_MCPU=native
- tc-is-cross-compiler && ZIG_MCPU=baseline
- local mycmakeargs=(
- -DZIG_USE_CCACHE=OFF
- -DZIG_SHARED_LLVM=ON
- -DZIG_TARGET_TRIPLE=$(ctarget_to_zigtarget)
- -DZIG_TARGET_CPU=${ZIG_MCPU}
- -DZIG_USE_LLVM_CONFIG=ON
- -DCMAKE_PREFIX_PATH=$(get_llvm_prefix ${LLVM_MAX_SLOT})
- )
-
- cmake_src_configure
-}
-
-src_test() {
- cd "${BUILD_DIR}" || die
- local ZIG_TEST_ARGS="-Dstatic-llvm=false -Denable-llvm=true -Dskip-non-native=true -Drelease -Dtarget=native"
- local ZIG_TEST_STEPS=(
- test-cases test-fmt test-behavior test-compiler-rt test-universal-libc test-compare-output
- test-standalone test-c-abi test-link test-stack-traces test-cli test-asm-link test-translate-c
- test-run-translated-c test-std
- )
-
- local step
- for step in "${ZIG_TEST_STEPS[@]}" ; do
- edob ./stage3/bin/zig build ${step} ${ZIG_TEST_ARGS}
- done
-}
-
-pkg_postinst() {
- elog "0.10.0 release introduces self-hosted compiler for general use by default"
- elog "It means that your code can be un-compilable since this compiler has some new or removed features and new or fixed bugs"
- elog "Upstream recommends:"
- elog " * Using old compiler if experiencing such breakage (flag '-fstage1')"
- elog " * Waiting for bugfix release 0.10.1"
- elog " * Waiting for release 0.11.0 with old compiler removed (these changes are already merged in 9999)"
- elog "Also see: https://ziglang.org/download/0.10.0/release-notes.html#Self-Hosted-Compiler"
- elog "and https://ziglang.org/download/0.10.0/release-notes.html#How-to-Upgrade"
-}
^ permalink raw reply related [flat|nested] 72+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-lang/zig/
@ 2023-01-20 1:17 Sam James
0 siblings, 0 replies; 72+ messages in thread
From: Sam James @ 2023-01-20 1:17 UTC (permalink / raw
To: gentoo-commits
commit: 1507d26e8c4f80483bc55fbd5a9bdce843634c10
Author: Eric Joldasov <bratishkaerik <AT> getgoogleoff <DOT> me>
AuthorDate: Thu Jan 19 15:27:31 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Jan 20 01:15:03 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1507d26e
dev-lang/zig: add 0.10.1
Signed-off-by: Eric Joldasov <bratishkaerik <AT> getgoogleoff.me>
Signed-off-by: Sam James <sam <AT> gentoo.org>
dev-lang/zig/Manifest | 1 +
dev-lang/zig/zig-0.10.0-r2.ebuild | 134 ++++++++++++++++++++++++++++++++++++++
dev-lang/zig/zig-0.10.1.ebuild | 99 ++++++++++++++++++++++++++++
3 files changed, 234 insertions(+)
diff --git a/dev-lang/zig/Manifest b/dev-lang/zig/Manifest
index 297043a711ac..22f469292044 100644
--- a/dev-lang/zig/Manifest
+++ b/dev-lang/zig/Manifest
@@ -1 +1,2 @@
DIST zig-0.10.0.tar.xz 14530912 BLAKE2B 5949a44ee039b7d5a163344a0fc26af8dd9cf311ed25c7092a665bb59ec7dec8dc3cd39918d81ef02c707aa8989b038fb21dfba3927fd31153a1404739b4ea3c SHA512 9d83ce51cc0ce404c06da820179c1cc47aa50e573fb1c831a96baa12c6b5226abe85b384110f2ffc4cbdc5f24eaba1f14a4e3249ffeaa248c0d73ba29859e682
+DIST zig-0.10.1.tar.xz 15143112 BLAKE2B 4954d95ad763000eedf73a78e62bc0e99d65bba91c7127cdf1ea4503eb67817265daf572f645b7efbe9e24087e690b2768f0b2bc6c43b5fd76eab33143e964fe SHA512 d443adf61556bc95470537c6b0371a0ac99d19a06b15635cf1e5055ae7849039680c9006105e06e1bd6ba0fc12da14c54c1d28ac597c7dee17ee3a5cd9cf79f8
diff --git a/dev-lang/zig/zig-0.10.0-r2.ebuild b/dev-lang/zig/zig-0.10.0-r2.ebuild
new file mode 100644
index 000000000000..f3d9e009df5a
--- /dev/null
+++ b/dev-lang/zig/zig-0.10.0-r2.ebuild
@@ -0,0 +1,134 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+LLVM_MAX_SLOT=15
+inherit edo cmake llvm check-reqs toolchain-funcs
+
+DESCRIPTION="A robust, optimal, and maintainable programming language"
+HOMEPAGE="https://ziglang.org/"
+if [[ ${PV} == 9999 ]]; then
+ EGIT_REPO_URI="https://github.com/ziglang/zig.git"
+ inherit git-r3
+else
+ SRC_URI="https://ziglang.org/download/${PV}/${P}.tar.xz"
+ KEYWORDS="~amd64 ~arm ~arm64"
+fi
+
+LICENSE="MIT"
+SLOT="0"
+
+BUILD_DIR="${S}/build"
+
+# Zig requires zstd and zlib compression support in LLVM, if using LLVM backend.
+# (non-LLVM backends don't require these)
+# They are not required "on their own", so please don't add them here.
+# You can check https://github.com/ziglang/zig-bootstrap in future, to see
+# options that are passed to LLVM CMake building (excluding "static" ofc).
+DEPEND="
+ sys-devel/clang:${LLVM_MAX_SLOT}=
+ sys-devel/lld:${LLVM_MAX_SLOT}=
+ sys-devel/llvm:${LLVM_MAX_SLOT}=[zstd]
+"
+
+RDEPEND="
+ ${DEPEND}
+ !dev-lang/zig-bin
+"
+
+# see https://github.com/ziglang/zig/issues/3382
+# For now, Zig doesn't support CFLAGS/LDFLAGS/etc.
+QA_FLAGS_IGNORED="usr/bin/zig"
+
+# see https://ziglang.org/download/0.10.0/release-notes.html#Self-Hosted-Compiler
+# 0.10.0 release - ~9.6 GiB, since we use compiler written in C++ for bootstrapping
+# 0.11.0 release - ~2.8 GiB, since we will (at least according to roadmap) use self-hosted compiler
+# (transpiled to C via C backend) for bootstrapping
+CHECKREQS_MEMORY="10G"
+
+PATCHES=(
+ "${FILESDIR}/${P}-avoid-cmake-bug.patch"
+ "${FILESDIR}/${P}-build-dir-install-stage3.patch"
+)
+
+llvm_check_deps() {
+ has_version "sys-devel/clang:${LLVM_SLOT}"
+}
+
+ctarget_to_zigtarget() {
+ #Zig's Target Format: arch-os-abi
+ local CTARGET="${CTARGET:-${CHOST}}"
+
+ local ZIG_ARCH
+ case "${CTARGET%%-*}" in
+ i?86) ZIG_ARCH=x86;;
+ sparcv9) ZIG_ARCH=sparc64;;
+ *) ZIG_ARCH=${CTARGET%%-*};; # Same as in CHOST
+ esac
+
+ local ZIG_OS
+ case "${CTARGET}" in
+ *linux*) ZIG_OS=linux;;
+ *apple*) ZIG_OS=macos;;
+ esac
+
+ local ZIG_ABI
+ case "${CTARGET##*-}" in
+ gnu) ZIG_ABI="gnu.2.34";;
+ solaris*) ZIG_OS=solaris ZIG_ABI=none;;
+ darwin*) ZIG_ABI=none;;
+ *) ZIG_ABI=${CTARGET##*-};; # Same as in CHOST
+ esac
+
+ echo "${ZIG_ARCH}-${ZIG_OS}-${ZIG_ABI}"
+}
+
+pkg_setup() {
+ llvm_pkg_setup
+ ewarn "This version requires 10G of memory for building compiler."
+ ewarn "If you don't have enough memory, you can wait until 0.11.0 release"
+ ewarn "or (if you are risky) use 9999 version (currently requires only 4GB)"
+ check-reqs_pkg_setup
+}
+
+src_configure() {
+ local ZIG_MCPU=native
+ tc-is-cross-compiler && ZIG_MCPU=baseline
+ local mycmakeargs=(
+ -DZIG_USE_CCACHE=OFF
+ -DZIG_SHARED_LLVM=ON
+ -DZIG_TARGET_TRIPLE=$(ctarget_to_zigtarget)
+ -DZIG_TARGET_CPU=${ZIG_MCPU}
+ -DZIG_USE_LLVM_CONFIG=ON
+ -DCMAKE_PREFIX_PATH=$(get_llvm_prefix ${LLVM_MAX_SLOT})
+ )
+
+ cmake_src_configure
+}
+
+src_test() {
+ cd "${BUILD_DIR}" || die
+ local ZIG_TEST_ARGS="-Dstatic-llvm=false -Denable-llvm=true -Dskip-non-native=true -Drelease -Dtarget=native"
+ local ZIG_TEST_STEPS=(
+ test-cases test-fmt test-behavior test-compiler-rt test-universal-libc test-compare-output
+ test-standalone test-c-abi test-link test-stack-traces test-cli test-asm-link test-translate-c
+ test-run-translated-c test-std
+ )
+
+ local step
+ for step in "${ZIG_TEST_STEPS[@]}" ; do
+ edob ./stage3/bin/zig build ${step} ${ZIG_TEST_ARGS}
+ done
+}
+
+pkg_postinst() {
+ elog "0.10.0 release introduces self-hosted compiler for general use by default"
+ elog "It means that your code can be un-compilable since this compiler has some new or removed features and new or fixed bugs"
+ elog "Upstream recommends:"
+ elog " * Using old compiler if experiencing such breakage (flag '-fstage1')"
+ elog " * Waiting for bugfix release 0.10.1"
+ elog " * Waiting for release 0.11.0 with old compiler removed (these changes are already merged in 9999)"
+ elog "Also see: https://ziglang.org/download/0.10.0/release-notes.html#Self-Hosted-Compiler"
+ elog "and https://ziglang.org/download/0.10.0/release-notes.html#How-to-Upgrade"
+}
diff --git a/dev-lang/zig/zig-0.10.1.ebuild b/dev-lang/zig/zig-0.10.1.ebuild
new file mode 100644
index 000000000000..b5ed03b123f1
--- /dev/null
+++ b/dev-lang/zig/zig-0.10.1.ebuild
@@ -0,0 +1,99 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+LLVM_MAX_SLOT=15
+inherit edo cmake llvm check-reqs
+
+DESCRIPTION="A robust, optimal, and maintainable programming language"
+HOMEPAGE="https://ziglang.org/"
+if [[ ${PV} == 9999 ]]; then
+ EGIT_REPO_URI="https://github.com/ziglang/zig.git"
+ inherit git-r3
+else
+ SRC_URI="https://ziglang.org/download/${PV}/${P}.tar.xz"
+ KEYWORDS="~amd64 ~arm ~arm64"
+fi
+
+LICENSE="MIT"
+SLOT="0"
+
+BUILD_DIR="${S}/build"
+
+# Zig requires zstd and zlib compression support in LLVM, if using LLVM backend.
+# (non-LLVM backends don't require these)
+# They are not required "on their own", so please don't add them here.
+# You can check https://github.com/ziglang/zig-bootstrap in future, to see
+# options that are passed to LLVM CMake building (excluding "static" ofc).
+DEPEND="
+ sys-devel/clang:${LLVM_MAX_SLOT}=
+ sys-devel/lld:${LLVM_MAX_SLOT}=
+ sys-devel/llvm:${LLVM_MAX_SLOT}=[zstd]
+"
+
+RDEPEND="
+ ${DEPEND}
+ !dev-lang/zig-bin
+"
+
+# see https://github.com/ziglang/zig/issues/3382
+# For now, Zig doesn't support CFLAGS/LDFLAGS/etc.
+QA_FLAGS_IGNORED="usr/bin/zig"
+
+# see https://ziglang.org/download/0.10.0/release-notes.html#Self-Hosted-Compiler
+# 0.10.0 release - ~9.6 GiB, since we use compiler written in C++ for bootstrapping
+# 0.11.0 release - ~2.8 GiB, since we will (at least according to roadmap) use self-hosted compiler
+# (transpiled to C via C backend) for bootstrapping
+CHECKREQS_MEMORY="10G"
+
+PATCHES=(
+ "${FILESDIR}/zig-0.10.0-build-dir-install-stage3.patch"
+)
+
+llvm_check_deps() {
+ has_version "sys-devel/clang:${LLVM_SLOT}"
+}
+
+pkg_setup() {
+ llvm_pkg_setup
+ ewarn "This version requires 10G of memory for building compiler."
+ ewarn "If you don't have enough memory, you can wait until 0.11.0 release"
+ ewarn "or (if you are risky) use 9999 version (currently requires only 4GB)"
+ check-reqs_pkg_setup
+}
+
+src_configure() {
+ local mycmakeargs=(
+ -DZIG_USE_CCACHE=OFF
+ -DZIG_SHARED_LLVM=ON
+ -DCMAKE_PREFIX_PATH=$(get_llvm_prefix ${LLVM_MAX_SLOT})
+ )
+
+ cmake_src_configure
+}
+
+src_test() {
+ cd "${BUILD_DIR}" || die
+ local ZIG_TEST_ARGS="-Dstatic-llvm=false -Denable-llvm=true -Dskip-non-native=true -Drelease -Dtarget=native"
+ local ZIG_TEST_STEPS=(
+ test-cases test-fmt test-behavior test-compiler-rt test-universal-libc test-compare-output
+ test-standalone test-c-abi test-link test-stack-traces test-cli test-asm-link test-translate-c
+ test-run-translated-c test-std
+ )
+
+ local step
+ for step in "${ZIG_TEST_STEPS[@]}" ; do
+ edob ./stage3/bin/zig build ${step} ${ZIG_TEST_ARGS}
+ done
+}
+
+pkg_postinst() {
+ elog "0.10.1 release uses self-hosted compiler by default and fixes some bugs from 0.10.0"
+ elog "But your code still can be un-compilable since some features still not implemented or bugs not fixed"
+ elog "Upstream recommends:"
+ elog " * Using old compiler if experiencing such breakage (flag '-fstage1')"
+ elog " * Waiting for release 0.11.0 with old compiler removed (these changes are already merged in 9999)"
+ elog "Also see: https://ziglang.org/download/0.10.0/release-notes.html#Self-Hosted-Compiler"
+ elog "and https://ziglang.org/download/0.10.0/release-notes.html#How-to-Upgrade"
+}
^ permalink raw reply related [flat|nested] 72+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-lang/zig/
@ 2023-01-14 19:17 Sam James
0 siblings, 0 replies; 72+ messages in thread
From: Sam James @ 2023-01-14 19:17 UTC (permalink / raw
To: gentoo-commits
commit: e27d250289fea5fed738efbc2f64b5e6e5a86386
Author: Eric Joldasov <bratishkaerik <AT> getgoogleoff <DOT> me>
AuthorDate: Fri Jan 13 11:57:44 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Jan 14 19:14:52 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e27d2502
dev-lang/zig: use "edob" for testing 0.10.0
As suggested by Sam James. I'm not touching live version yet as PR is not
merged yet and upstream plans to add some tests [that requires network
access] for their newly-created package manager (literally today) and related stuff (TLS
client/server etc.). I'll try to cooperate with them and add option that
will skip these tests.
Signed-off-by: Eric Joldasov <bratishkaerik <AT> getgoogleoff.me>
Closes: https://github.com/gentoo/gentoo/pull/29090
Signed-off-by: Sam James <sam <AT> gentoo.org>
dev-lang/zig/zig-0.10.0-r1.ebuild | 29 ++++++++++++-----------------
1 file changed, 12 insertions(+), 17 deletions(-)
diff --git a/dev-lang/zig/zig-0.10.0-r1.ebuild b/dev-lang/zig/zig-0.10.0-r1.ebuild
index f47f22799167..4d9a45ee5fb0 100644
--- a/dev-lang/zig/zig-0.10.0-r1.ebuild
+++ b/dev-lang/zig/zig-0.10.0-r1.ebuild
@@ -4,7 +4,7 @@
EAPI=8
LLVM_MAX_SLOT=15
-inherit cmake llvm check-reqs
+inherit edo cmake llvm check-reqs
DESCRIPTION="A robust, optimal, and maintainable programming language"
HOMEPAGE="https://ziglang.org/"
@@ -76,22 +76,17 @@ src_configure() {
src_test() {
cd "${BUILD_DIR}" || 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
+ local ZIG_TEST_ARGS="-Dstatic-llvm=false -Denable-llvm=true -Dskip-non-native=true -Drelease -Dtarget=native"
+ local ZIG_TEST_STEPS=(
+ test-cases test-fmt test-behavior test-compiler-rt test-universal-libc test-compare-output
+ test-standalone test-c-abi test-link test-stack-traces test-cli test-asm-link test-translate-c
+ test-run-translated-c test-std
+ )
+
+ local step
+ for step in "${ZIG_TEST_STEPS[@]}" ; do
+ edob ./stage3/bin/zig build ${step} ${ZIG_TEST_ARGS}
+ done
}
pkg_postinst() {
^ permalink raw reply related [flat|nested] 72+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-lang/zig/
@ 2022-12-14 9:20 Sam James
0 siblings, 0 replies; 72+ messages in thread
From: Sam James @ 2022-12-14 9:20 UTC (permalink / raw
To: gentoo-commits
commit: 71cc785aae8ce2453258188b87e307ca42906d32
Author: Eric Joldasov <bratishkaerik <AT> getgoogleoff <DOT> me>
AuthorDate: Wed Dec 7 01:59:30 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Dec 14 09:19:10 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=71cc785a
dev-lang/zig: relax memory requirements for 9999
https://www.github.com/ziglang/zig/commit/e7d28344fa3ee81d6ad7ca5ce1f83d50d8502118
was merged recently, so memory usage (when building) drops from ~10GB to ~4GB
Bug: https://bugs.gentoo.org/823086
Signed-off-by: Eric Joldasov <bratishkaerik <AT> getgoogleoff.me>
Closes: https://github.com/gentoo/gentoo/pull/28581
Signed-off-by: Sam James <sam <AT> gentoo.org>
dev-lang/zig/zig-0.10.0.ebuild | 13 +++++++++----
dev-lang/zig/zig-9999.ebuild | 11 +++++------
2 files changed, 14 insertions(+), 10 deletions(-)
diff --git a/dev-lang/zig/zig-0.10.0.ebuild b/dev-lang/zig/zig-0.10.0.ebuild
index 0ab54280a9ba..c4a1219ddb22 100644
--- a/dev-lang/zig/zig-0.10.0.ebuild
+++ b/dev-lang/zig/zig-0.10.0.ebuild
@@ -21,7 +21,8 @@ SLOT="0"
BUILD_DIR="${S}/build"
-# Zig requires zstd and zlib compression support in LLVM, if using LLVM backend (non-LLVM backends don't require these).
+# Zig requires zstd and zlib compression support in LLVM, if using LLVM backend.
+# (non-LLVM backends don't require these)
# They are not required "on their own", so please don't add them here.
# You can check https://github.com/ziglang/zig-bootstrap in future, to see
# options that are passed to LLVM CMake building (excluding "static" ofc).
@@ -52,6 +53,9 @@ llvm_check_deps() {
pkg_setup() {
llvm_pkg_setup
+ ewarn "This version requires 10G of memory for building compiler."
+ ewarn "If you don't have enough memory, you can wait until 0.11.0 release"
+ ewarn "or (if you are risky) use 9999 version (currently requires only 4GB)"
check-reqs_pkg_setup
}
@@ -73,9 +77,10 @@ src_test() {
pkg_postinst() {
elog "0.10.0 release introduces self-hosted compiler for general use by default"
elog "It means that your code can be un-compilable since this compiler has some new or removed features and new or fixed bugs"
- elog "Upstream recommends using stage1 if experiencing such breakage,"
- elog "until bugfix release 0.10.1 or release 0.11.0 where old compiler will be fully replaced"
- elog "You can use old compiler by using '-fstage1' flag"
+ elog "Upstream recommends:"
+ elog " * Using old compiler if experiencing such breakage (flag '-fstage1')"
+ elog " * Waiting for bugfix release 0.10.1"
+ elog " * Waiting for release 0.11.0 with old compiler removed (these changes are already merged in 9999)"
elog "Also see: https://ziglang.org/download/0.10.0/release-notes.html#Self-Hosted-Compiler"
elog "and https://ziglang.org/download/0.10.0/release-notes.html#How-to-Upgrade"
}
diff --git a/dev-lang/zig/zig-9999.ebuild b/dev-lang/zig/zig-9999.ebuild
index a19a2873f8cd..04794281b8d8 100644
--- a/dev-lang/zig/zig-9999.ebuild
+++ b/dev-lang/zig/zig-9999.ebuild
@@ -21,7 +21,8 @@ SLOT="0"
BUILD_DIR="${S}/build"
-# Zig requires zstd and zlib compression support in LLVM, if using LLVM backend (non-LLVM backends don't require these).
+# Zig requires zstd and zlib compression support in LLVM, if using LLVM backend.
+# (non-LLVM backends don't require these)
# They are not required "on their own", so please don't add them here.
# You can check https://github.com/ziglang/zig-bootstrap in future, to see
# options that are passed to LLVM CMake building (excluding "static" ofc).
@@ -39,11 +40,9 @@ RDEPEND="
# see https://github.com/ziglang/zig/issues/3382
QA_FLAGS_IGNORED="usr/bin/zig"
-# see https://ziglang.org/download/0.10.0/release-notes.html#Self-Hosted-Compiler
-# 0.10.0 release - 9.6 GiB, since we use compiler written in C++ for bootstrapping
-# 0.11.0 release - ~2.8 GiB, since we will (at least according to roadmap) use self-hosted compiler
-# (transpiled to C via C backend) for bootstrapping
-CHECKREQS_MEMORY="10G"
+# Since commit https://github.com/ziglang/zig/commit/e7d28344fa3ee81d6ad7ca5ce1f83d50d8502118
+# Zig uses self-hosted compiler only
+CHECKREQS_MEMORY="4G"
llvm_check_deps() {
has_version "sys-devel/clang:${LLVM_SLOT}"
^ permalink raw reply related [flat|nested] 72+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-lang/zig/
@ 2022-11-08 4:09 Sam James
0 siblings, 0 replies; 72+ messages in thread
From: Sam James @ 2022-11-08 4:09 UTC (permalink / raw
To: gentoo-commits
commit: bd7fdcec46962af3a5a61ba74a2d1455a14d2c68
Author: Eric Joldasov <bratishkaerik <AT> getgoogleoff <DOT> me>
AuthorDate: Tue Nov 8 03:36:52 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Nov 8 04:08:54 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bd7fdcec
dev-lang/zig: drop "threads" and "test" USE flags for 9999
See commit f28480799d348da161f8d121df2fb99c73250ab3.
Signed-off-by: Eric Joldasov <bratishkaerik <AT> getgoogleoff.me>
Closes: https://github.com/gentoo/gentoo/pull/28177
Signed-off-by: Sam James <sam <AT> gentoo.org>
dev-lang/zig/zig-9999.ebuild | 3 ---
1 file changed, 3 deletions(-)
diff --git a/dev-lang/zig/zig-9999.ebuild b/dev-lang/zig/zig-9999.ebuild
index bbd0bb53f3a0..a19a2873f8cd 100644
--- a/dev-lang/zig/zig-9999.ebuild
+++ b/dev-lang/zig/zig-9999.ebuild
@@ -18,8 +18,6 @@ fi
LICENSE="MIT"
SLOT="0"
-IUSE="test +threads"
-RESTRICT="!test? ( test )"
BUILD_DIR="${S}/build"
@@ -60,7 +58,6 @@ src_configure() {
local mycmakeargs=(
-DZIG_USE_CCACHE=OFF
-DZIG_SHARED_LLVM=ON
- -DZIG_SINGLE_THREADED="$(usex !threads)"
-DCMAKE_PREFIX_PATH=$(get_llvm_prefix ${LLVM_MAX_SLOT})
)
^ permalink raw reply related [flat|nested] 72+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-lang/zig/
@ 2022-11-07 6:52 Sam James
0 siblings, 0 replies; 72+ messages in thread
From: Sam James @ 2022-11-07 6:52 UTC (permalink / raw
To: gentoo-commits
commit: 9c3e47685b03e771b87da1f38df6cb534530c3d6
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon Nov 7 06:51:41 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Nov 7 06:52:05 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9c3e4768
dev-lang/zig: style tweaks
Have all functions be together.
Signed-off-by: Sam James <sam <AT> gentoo.org>
dev-lang/zig/zig-0.10.0.ebuild | 14 +++++++-------
dev-lang/zig/zig-9999.ebuild | 12 ++++++------
2 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/dev-lang/zig/zig-0.10.0.ebuild b/dev-lang/zig/zig-0.10.0.ebuild
index 451df4ef6f6d..0ab54280a9ba 100644
--- a/dev-lang/zig/zig-0.10.0.ebuild
+++ b/dev-lang/zig/zig-0.10.0.ebuild
@@ -36,9 +36,9 @@ RDEPEND="
!dev-lang/zig-bin
"
-llvm_check_deps() {
- has_version "sys-devel/clang:${LLVM_SLOT}"
-}
+# see https://github.com/ziglang/zig/issues/3382
+# For now, Zig doesn't support CFLAGS/LDFLAGS/etc.
+QA_FLAGS_IGNORED="usr/bin/zig"
# see https://ziglang.org/download/0.10.0/release-notes.html#Self-Hosted-Compiler
# 0.10.0 release - ~9.6 GiB, since we use compiler written in C++ for bootstrapping
@@ -46,6 +46,10 @@ llvm_check_deps() {
# (transpiled to C via C backend) for bootstrapping
CHECKREQS_MEMORY="10G"
+llvm_check_deps() {
+ has_version "sys-devel/clang:${LLVM_SLOT}"
+}
+
pkg_setup() {
llvm_pkg_setup
check-reqs_pkg_setup
@@ -66,10 +70,6 @@ src_test() {
./zig2 build test -Dstatic-llvm=false -Denable-llvm=true -Dskip-non-native=true || die
}
-# see https://github.com/ziglang/zig/issues/3382
-# For now, Zig doesn't support CFLAGS/LDFLAGS/etc.
-QA_FLAGS_IGNORED="usr/bin/zig"
-
pkg_postinst() {
elog "0.10.0 release introduces self-hosted compiler for general use by default"
elog "It means that your code can be un-compilable since this compiler has some new or removed features and new or fixed bugs"
diff --git a/dev-lang/zig/zig-9999.ebuild b/dev-lang/zig/zig-9999.ebuild
index b5b25d1f884f..bbd0bb53f3a0 100644
--- a/dev-lang/zig/zig-9999.ebuild
+++ b/dev-lang/zig/zig-9999.ebuild
@@ -38,9 +38,8 @@ RDEPEND="
!dev-lang/zig-bin
"
-llvm_check_deps() {
- has_version "sys-devel/clang:${LLVM_SLOT}"
-}
+# see https://github.com/ziglang/zig/issues/3382
+QA_FLAGS_IGNORED="usr/bin/zig"
# see https://ziglang.org/download/0.10.0/release-notes.html#Self-Hosted-Compiler
# 0.10.0 release - 9.6 GiB, since we use compiler written in C++ for bootstrapping
@@ -48,6 +47,10 @@ llvm_check_deps() {
# (transpiled to C via C backend) for bootstrapping
CHECKREQS_MEMORY="10G"
+llvm_check_deps() {
+ has_version "sys-devel/clang:${LLVM_SLOT}"
+}
+
pkg_setup() {
llvm_pkg_setup
check-reqs_pkg_setup
@@ -68,6 +71,3 @@ src_test() {
cd "${BUILD_DIR}" || die
./zig2 build test -Dstatic-llvm=false -Denable-llvm=true -Dskip-non-native=true || die
}
-
-# see https://github.com/ziglang/zig/issues/3382
-QA_FLAGS_IGNORED="usr/bin/zig"
^ permalink raw reply related [flat|nested] 72+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-lang/zig/
@ 2022-11-07 6:52 Sam James
0 siblings, 0 replies; 72+ messages in thread
From: Sam James @ 2022-11-07 6:52 UTC (permalink / raw
To: gentoo-commits
commit: f28480799d348da161f8d121df2fb99c73250ab3
Author: Eric Joldasov <bratishkaerik <AT> getgoogleoff <DOT> me>
AuthorDate: Tue Nov 1 03:56:36 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Nov 7 06:51:57 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f2848079
dev-lang/zig: add 0.10.0
Drop "threads" USE flag, since this is default and well-tested
configuration by upstream.
Drop "test" USE flag, since it doesn't require special dependencies (or preparations)
necessary to run tests.
Bug: https://bugs.gentoo.org/876181
Signed-off-by: Eric Joldasov <bratishkaerik <AT> getgoogleoff.me>
Signed-off-by: Sam James <sam <AT> gentoo.org>
dev-lang/zig/Manifest | 1 +
dev-lang/zig/{zig-9999.ebuild => zig-0.10.0.ebuild} | 17 ++++++++++++-----
dev-lang/zig/zig-9999.ebuild | 9 ++++-----
3 files changed, 17 insertions(+), 10 deletions(-)
diff --git a/dev-lang/zig/Manifest b/dev-lang/zig/Manifest
index f18eeb3ba012..fd2ecb470579 100644
--- a/dev-lang/zig/Manifest
+++ b/dev-lang/zig/Manifest
@@ -1,2 +1,3 @@
+DIST zig-0.10.0.tar.xz 14530912 BLAKE2B 5949a44ee039b7d5a163344a0fc26af8dd9cf311ed25c7092a665bb59ec7dec8dc3cd39918d81ef02c707aa8989b038fb21dfba3927fd31153a1404739b4ea3c SHA512 9d83ce51cc0ce404c06da820179c1cc47aa50e573fb1c831a96baa12c6b5226abe85b384110f2ffc4cbdc5f24eaba1f14a4e3249ffeaa248c0d73ba29859e682
DIST zig-0.9.1-fix-detecting-abi.patch 22233 BLAKE2B fa523c4c4c23a74c0b4f85c6d2d91ef98b31d25694bb9dbc7988b82db972a16ab273aa9f1883cfa8ca79ef7fc56fca67d0a8656ba248b6db47bc902b7ac64a93 SHA512 259967f88f54c20f556bd9d67189ce3a2cfeb0250f0cee4dffb29020d976d61265a5dd9ae9cfcadfb7b1e152b47ee17f4184eafac2b80495f4ee8f98733cd692
DIST zig-0.9.1.tar.xz 13940828 BLAKE2B 996b0e945f61b01dddbb7c8674a9e2d2d01b93eb48fdfd2c986496330990ffa64cba15f8bd8518b90ef6f514759ba6cc3fd31d6044c5b11b92bf92e3f7f15303 SHA512 0b8a5f9b7e34e4252536f59bc91429f1e76b2bf8e01f024095919f6ecf34db56b5c86c554fbb94bdcb5255394c87f2c87519c8f34c631f53816927ec0882ae2d
diff --git a/dev-lang/zig/zig-9999.ebuild b/dev-lang/zig/zig-0.10.0.ebuild
similarity index 61%
copy from dev-lang/zig/zig-9999.ebuild
copy to dev-lang/zig/zig-0.10.0.ebuild
index f4f7a100d588..451df4ef6f6d 100644
--- a/dev-lang/zig/zig-9999.ebuild
+++ b/dev-lang/zig/zig-0.10.0.ebuild
@@ -18,8 +18,6 @@ fi
LICENSE="MIT"
SLOT="0"
-IUSE="test +threads"
-RESTRICT="!test? ( test )"
BUILD_DIR="${S}/build"
@@ -42,7 +40,10 @@ llvm_check_deps() {
has_version "sys-devel/clang:${LLVM_SLOT}"
}
-# see https://github.com/ziglang/zig/wiki/Troubleshooting-Build-Issues#high-memory-requirements
+# see https://ziglang.org/download/0.10.0/release-notes.html#Self-Hosted-Compiler
+# 0.10.0 release - ~9.6 GiB, since we use compiler written in C++ for bootstrapping
+# 0.11.0 release - ~2.8 GiB, since we will (at least according to roadmap) use self-hosted compiler
+# (transpiled to C via C backend) for bootstrapping
CHECKREQS_MEMORY="10G"
pkg_setup() {
@@ -54,7 +55,6 @@ src_configure() {
local mycmakeargs=(
-DZIG_USE_CCACHE=OFF
-DZIG_SHARED_LLVM=ON
- -DZIG_SINGLE_THREADED="$(usex !threads)"
-DCMAKE_PREFIX_PATH=$(get_llvm_prefix ${LLVM_MAX_SLOT})
)
@@ -67,8 +67,15 @@ src_test() {
}
# see https://github.com/ziglang/zig/issues/3382
+# For now, Zig doesn't support CFLAGS/LDFLAGS/etc.
QA_FLAGS_IGNORED="usr/bin/zig"
pkg_postinst() {
- elog "If you want to use stage1 backend, use -fstage1 flag"
+ elog "0.10.0 release introduces self-hosted compiler for general use by default"
+ elog "It means that your code can be un-compilable since this compiler has some new or removed features and new or fixed bugs"
+ elog "Upstream recommends using stage1 if experiencing such breakage,"
+ elog "until bugfix release 0.10.1 or release 0.11.0 where old compiler will be fully replaced"
+ elog "You can use old compiler by using '-fstage1' flag"
+ elog "Also see: https://ziglang.org/download/0.10.0/release-notes.html#Self-Hosted-Compiler"
+ elog "and https://ziglang.org/download/0.10.0/release-notes.html#How-to-Upgrade"
}
diff --git a/dev-lang/zig/zig-9999.ebuild b/dev-lang/zig/zig-9999.ebuild
index f4f7a100d588..b5b25d1f884f 100644
--- a/dev-lang/zig/zig-9999.ebuild
+++ b/dev-lang/zig/zig-9999.ebuild
@@ -42,7 +42,10 @@ llvm_check_deps() {
has_version "sys-devel/clang:${LLVM_SLOT}"
}
-# see https://github.com/ziglang/zig/wiki/Troubleshooting-Build-Issues#high-memory-requirements
+# see https://ziglang.org/download/0.10.0/release-notes.html#Self-Hosted-Compiler
+# 0.10.0 release - 9.6 GiB, since we use compiler written in C++ for bootstrapping
+# 0.11.0 release - ~2.8 GiB, since we will (at least according to roadmap) use self-hosted compiler
+# (transpiled to C via C backend) for bootstrapping
CHECKREQS_MEMORY="10G"
pkg_setup() {
@@ -68,7 +71,3 @@ src_test() {
# see https://github.com/ziglang/zig/issues/3382
QA_FLAGS_IGNORED="usr/bin/zig"
-
-pkg_postinst() {
- elog "If you want to use stage1 backend, use -fstage1 flag"
-}
^ permalink raw reply related [flat|nested] 72+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-lang/zig/
@ 2022-10-30 9:40 Sam James
0 siblings, 0 replies; 72+ messages in thread
From: Sam James @ 2022-10-30 9:40 UTC (permalink / raw
To: gentoo-commits
commit: 044b0969623c0c23f5884a22dfa58b02929b5086
Author: Eric Joldasov <bratishkaerik <AT> getgoogleoff <DOT> me>
AuthorDate: Wed Oct 26 19:00:03 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Oct 30 09:39:38 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=044b0969
dev-lang/zig: requires zstd support in LLVM
Starting with https://github.com/ziglang/zig/commit/d42a719e8f7ba31a9e18d6be9d58691b0b38c69a Zig requires zstd compression support.
Zig requires zstd and zlib compression support in LLVM, if using LLVM backend (non-LLVM backends don't require these).
They are not required "on their own", so please don't add them to
dependencies.
You can check https://github.com/ziglang/zig-bootstrap in future, to see
options that are passed to LLVM CMake building (excluding "static" ofc).
Signed-off-by: Eric Joldasov <bratishkaerik <AT> getgoogleoff.me>
Closes: https://github.com/gentoo/gentoo/pull/27964
Signed-off-by: Sam James <sam <AT> gentoo.org>
dev-lang/zig/zig-9999.ebuild | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/dev-lang/zig/zig-9999.ebuild b/dev-lang/zig/zig-9999.ebuild
index cc18f6e8a041..f4f7a100d588 100644
--- a/dev-lang/zig/zig-9999.ebuild
+++ b/dev-lang/zig/zig-9999.ebuild
@@ -23,11 +23,14 @@ RESTRICT="!test? ( test )"
BUILD_DIR="${S}/build"
+# Zig requires zstd and zlib compression support in LLVM, if using LLVM backend (non-LLVM backends don't require these).
+# They are not required "on their own", so please don't add them here.
+# You can check https://github.com/ziglang/zig-bootstrap in future, to see
+# options that are passed to LLVM CMake building (excluding "static" ofc).
DEPEND="
sys-devel/clang:${LLVM_MAX_SLOT}=
sys-devel/lld:${LLVM_MAX_SLOT}=
- sys-devel/llvm:${LLVM_MAX_SLOT}=
- >=sys-libs/zlib-1.2.12
+ sys-devel/llvm:${LLVM_MAX_SLOT}=[zstd]
"
RDEPEND="
^ permalink raw reply related [flat|nested] 72+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-lang/zig/
@ 2022-10-20 23:34 Sam James
0 siblings, 0 replies; 72+ messages in thread
From: Sam James @ 2022-10-20 23:34 UTC (permalink / raw
To: gentoo-commits
commit: 0fd7c39bf9fca8c661b43d0cbd1a4bfba284bcb5
Author: Eric Joldasov <bratishkaerik <AT> getgoogleoff <DOT> me>
AuthorDate: Wed Oct 19 15:34:20 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Oct 20 23:33:31 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0fd7c39b
dev-lang/zig: use standard CMake procedure for building/installing
Upstream PR https://github.com/ziglang/zig/pull/13036
Signed-off-by: Eric Joldasov <bratishkaerik <AT> getgoogleoff.me>
Closes: https://github.com/gentoo/gentoo/pull/27849
Signed-off-by: Sam James <sam <AT> gentoo.org>
dev-lang/zig/zig-9999.ebuild | 9 +--------
1 file changed, 1 insertion(+), 8 deletions(-)
diff --git a/dev-lang/zig/zig-9999.ebuild b/dev-lang/zig/zig-9999.ebuild
index cfc9d487b029..cc18f6e8a041 100644
--- a/dev-lang/zig/zig-9999.ebuild
+++ b/dev-lang/zig/zig-9999.ebuild
@@ -53,7 +53,6 @@ src_configure() {
-DZIG_SHARED_LLVM=ON
-DZIG_SINGLE_THREADED="$(usex !threads)"
-DCMAKE_PREFIX_PATH=$(get_llvm_prefix ${LLVM_MAX_SLOT})
- -DCMAKE_INSTALL_PREFIX="${BUILD_DIR}/stage3"
)
cmake_src_configure
@@ -61,13 +60,7 @@ src_configure() {
src_test() {
cd "${BUILD_DIR}" || die
- ./stage3/bin/zig build test -Dstatic-llvm=false -Denable-llvm=true || die
-}
-
-src_install() {
- cd "${BUILD_DIR}" || die
- DESTDIR="${D}" ./zig2 build install -Denable-stage1=true -Dstatic-llvm=false -Denable-llvm=true --prefix "${EPREFIX}"/usr || die
- dodoc ../README.md
+ ./zig2 build test -Dstatic-llvm=false -Denable-llvm=true -Dskip-non-native=true || die
}
# see https://github.com/ziglang/zig/issues/3382
^ permalink raw reply related [flat|nested] 72+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-lang/zig/
@ 2022-10-15 15:18 Sam James
0 siblings, 0 replies; 72+ messages in thread
From: Sam James @ 2022-10-15 15:18 UTC (permalink / raw
To: gentoo-commits
commit: 0589d0cb2e6afad82048dc5108b7bc357927c790
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat Oct 15 15:17:20 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Oct 15 15:17:20 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0589d0cb
dev-lang/zig: fix MissingSlotDep on LLD
LLD is slotted now.
Signed-off-by: Sam James <sam <AT> gentoo.org>
dev-lang/zig/{zig-0.9.1-r1.ebuild => zig-0.9.1-r2.ebuild} | 7 +++----
dev-lang/zig/zig-9999.ebuild | 7 +++----
2 files changed, 6 insertions(+), 8 deletions(-)
diff --git a/dev-lang/zig/zig-0.9.1-r1.ebuild b/dev-lang/zig/zig-0.9.1-r2.ebuild
similarity index 90%
rename from dev-lang/zig/zig-0.9.1-r1.ebuild
rename to dev-lang/zig/zig-0.9.1-r2.ebuild
index 10a957c326e9..4adbe994a8f3 100644
--- a/dev-lang/zig/zig-0.9.1-r1.ebuild
+++ b/dev-lang/zig/zig-0.9.1-r2.ebuild
@@ -32,10 +32,9 @@ PATCHES=(
BUILD_DIR="${S}/build"
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-devel/clang:${LLVM_MAX_SLOT}=
+ sys-devel/lld:${LLVM_MAX_SLOT}=
+ sys-devel/llvm:${LLVM_MAX_SLOT}=
>=sys-libs/zlib-1.2.12
"
diff --git a/dev-lang/zig/zig-9999.ebuild b/dev-lang/zig/zig-9999.ebuild
index 92d014036577..cfc9d487b029 100644
--- a/dev-lang/zig/zig-9999.ebuild
+++ b/dev-lang/zig/zig-9999.ebuild
@@ -24,10 +24,9 @@ RESTRICT="!test? ( test )"
BUILD_DIR="${S}/build"
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-devel/clang:${LLVM_MAX_SLOT}=
+ sys-devel/lld:${LLVM_MAX_SLOT}=
+ sys-devel/llvm:${LLVM_MAX_SLOT}=
>=sys-libs/zlib-1.2.12
"
^ permalink raw reply related [flat|nested] 72+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-lang/zig/
@ 2022-09-19 3:40 Sam James
0 siblings, 0 replies; 72+ messages in thread
From: Sam James @ 2022-09-19 3:40 UTC (permalink / raw
To: gentoo-commits
commit: d49ff59b4a3fb539e41219d67b2319dfe6356dca
Author: Eric Joldasov <bratishkaerik <AT> getgoogleoff <DOT> me>
AuthorDate: Wed Sep 14 14:36:42 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Sep 19 03:40:44 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d49ff59b
dev-lang/zig: update to LLVM 15 for 9999
Closes: https://bugs.gentoo.org/871462
Signed-off-by: Eric Joldasov <bratishkaerik <AT> getgoogleoff.me>
Closes: https://github.com/gentoo/gentoo/pull/27221
Signed-off-by: Sam James <sam <AT> gentoo.org>
dev-lang/zig/zig-9999.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-lang/zig/zig-9999.ebuild b/dev-lang/zig/zig-9999.ebuild
index 373a6036ccb1..92d014036577 100644
--- a/dev-lang/zig/zig-9999.ebuild
+++ b/dev-lang/zig/zig-9999.ebuild
@@ -3,7 +3,7 @@
EAPI=8
-LLVM_MAX_SLOT=14
+LLVM_MAX_SLOT=15
inherit cmake llvm check-reqs
DESCRIPTION="A robust, optimal, and maintainable programming language"
^ permalink raw reply related [flat|nested] 72+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-lang/zig/
@ 2022-08-22 8:18 Jakov Smolić
0 siblings, 0 replies; 72+ messages in thread
From: Jakov Smolić @ 2022-08-22 8:18 UTC (permalink / raw
To: gentoo-commits
commit: 7b3b491cb416d13765051c3957ccb7d624a4d61b
Author: Eric Joldasov <bratishkaerik <AT> getgoogleoff <DOT> me>
AuthorDate: Tue Jul 26 21:33:45 2022 +0000
Commit: Jakov Smolić <jsmolic <AT> gentoo <DOT> org>
CommitDate: Mon Aug 22 08:16:09 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7b3b491c
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 <AT> mail.ru>
Signed-off-by: Eric Joldasov <bratishkaerik <AT> getgoogleoff.me>
Signed-off-by: Jakov Smolić <jsmolic <AT> gentoo.org>
dev-lang/zig/zig-9999.ebuild | 22 +++++++++++-----------
1 file 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"
^ permalink raw reply related [flat|nested] 72+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-lang/zig/
@ 2022-08-22 8:18 Jakov Smolić
0 siblings, 0 replies; 72+ messages in thread
From: Jakov Smolić @ 2022-08-22 8:18 UTC (permalink / raw
To: gentoo-commits
commit: b3ec45a03e6e61d4ef3f74514f5b9efcb2fe1cd2
Author: Eric Joldasov <bratishkaerik <AT> getgoogleoff <DOT> me>
AuthorDate: Tue Jul 26 21:22:48 2022 +0000
Commit: Jakov Smolić <jsmolic <AT> gentoo <DOT> org>
CommitDate: Mon Aug 22 08:16:08 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b3ec45a0
dev-lang/zig: add myself as a maintainer
Signed-off-by: Eric Joldasov <bratishkaerik <AT> getgoogleoff.me>
Signed-off-by: Jakov Smolić <jsmolic <AT> gentoo.org>
dev-lang/zig/metadata.xml | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-)
diff --git a/dev-lang/zig/metadata.xml b/dev-lang/zig/metadata.xml
index e74e7f06b800..c12ebabd226e 100644
--- a/dev-lang/zig/metadata.xml
+++ b/dev-lang/zig/metadata.xml
@@ -1,7 +1,14 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <!-- maintainer-needed -->
+ <maintainer type="person" proxied="yes">
+ <email>bratishkaerik@getgoogleoff.me</email>
+ <name>Eric Joldasov</name>
+ </maintainer>
+ <maintainer type="project" proxied="proxy">
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+ </maintainer>
<use>
<flag name="stage2">Install stage2 compiler (written in Zig) alongside stage1 compiler (written in C++ and Zig)</flag>
</use>
^ permalink raw reply related [flat|nested] 72+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-lang/zig/
@ 2022-05-27 7:45 Joonas Niilola
0 siblings, 0 replies; 72+ messages in thread
From: Joonas Niilola @ 2022-05-27 7:45 UTC (permalink / raw
To: gentoo-commits
commit: ed84231a31840b229dcc3d15a0141d16019299e5
Author: BratishkaErik <bratishkaerik <AT> getgoogleoff <DOT> me>
AuthorDate: Fri May 20 13:02:20 2022 +0000
Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Fri May 27 07:45:27 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ed84231a
dev-lang/zig: add QA_FLAGS_IGNORED
Signed-off-by: BratishkaErik <bratishkaerik <AT> getgoogleoff.me>
Closes: https://github.com/gentoo/gentoo/pull/25573
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>
dev-lang/zig/zig-9999.ebuild | 3 +++
1 file changed, 3 insertions(+)
diff --git a/dev-lang/zig/zig-9999.ebuild b/dev-lang/zig/zig-9999.ebuild
index c63dc88b02c2..87dc59b0c0c7 100644
--- a/dev-lang/zig/zig-9999.ebuild
+++ b/dev-lang/zig/zig-9999.ebuild
@@ -89,6 +89,9 @@ src_install() {
fi
}
+# see https://github.com/ziglang/zig/issues/3382
+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"
}
^ permalink raw reply related [flat|nested] 72+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-lang/zig/
@ 2022-05-27 7:45 Joonas Niilola
0 siblings, 0 replies; 72+ messages in thread
From: Joonas Niilola @ 2022-05-27 7:45 UTC (permalink / raw
To: gentoo-commits
commit: f6f5d1401b938537fe4791c27546a28799d44bea
Author: BratishkaErik <bratishkaerik <AT> getgoogleoff <DOT> me>
AuthorDate: Fri May 20 12:46:26 2022 +0000
Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Fri May 27 07:45:27 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f6f5d140
dev-lang/zig: explain stage1 and stage2, add bugs-to field
Signed-off-by: BratishkaErik <bratishkaerik <AT> getgoogleoff.me>
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>
dev-lang/zig/metadata.xml | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/dev-lang/zig/metadata.xml b/dev-lang/zig/metadata.xml
index 6555f4c1c940..e74e7f06b800 100644
--- a/dev-lang/zig/metadata.xml
+++ b/dev-lang/zig/metadata.xml
@@ -3,9 +3,10 @@
<pkgmetadata>
<!-- maintainer-needed -->
<use>
- <flag name="stage2">Install stage2 alongside stage1</flag>
+ <flag name="stage2">Install stage2 compiler (written in Zig) alongside stage1 compiler (written in C++ and Zig)</flag>
</use>
<upstream>
<remote-id type="github">ziglang/zig</remote-id>
+ <bugs-to>https://github.com/ziglang/zig/issues</bugs-to>
</upstream>
</pkgmetadata>
^ permalink raw reply related [flat|nested] 72+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-lang/zig/
@ 2022-04-30 8:13 Joonas Niilola
0 siblings, 0 replies; 72+ messages in thread
From: Joonas Niilola @ 2022-04-30 8:13 UTC (permalink / raw
To: gentoo-commits
commit: 0ace574c3772b362224c6b7bcefc13466f7c9282
Author: BratishkaErik <bratishkaerik <AT> getgoogleoff <DOT> me>
AuthorDate: Mon Apr 18 10:18:22 2022 +0000
Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Sat Apr 30 08:13:20 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0ace574c
dev-lang/zig: update SRC_URI
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: BratishkaErik <bratishkaerik <AT> getgoogleoff.me>
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>
dev-lang/zig/Manifest | 2 +-
dev-lang/zig/zig-0.9.1.ebuild | 2 +-
dev-lang/zig/zig-9999.ebuild | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/dev-lang/zig/Manifest b/dev-lang/zig/Manifest
index 5ad647692d59..daf4475076f0 100644
--- a/dev-lang/zig/Manifest
+++ b/dev-lang/zig/Manifest
@@ -1 +1 @@
-DIST zig-0.9.1.tar.gz 22010374 BLAKE2B 24d6c945640aac1f7fd0eaf69937638181fb210c1f0be3110bc4e779cab3d56ef89286604b467013d52223a466addcb9bb81c85bbcf007d430a400669acf6279 SHA512 a9dc5fea25dde511122056832449658b00dbcf6d6bbfe658b375968a7bdb06c690abbdfe00c1afcfa481442392b051dcef5a5a5e81d4ceb23fa98a866b900f37
+DIST zig-0.9.1.tar.xz 13940828 BLAKE2B 996b0e945f61b01dddbb7c8674a9e2d2d01b93eb48fdfd2c986496330990ffa64cba15f8bd8518b90ef6f514759ba6cc3fd31d6044c5b11b92bf92e3f7f15303 SHA512 0b8a5f9b7e34e4252536f59bc91429f1e76b2bf8e01f024095919f6ecf34db56b5c86c554fbb94bdcb5255394c87f2c87519c8f34c631f53816927ec0882ae2d
diff --git a/dev-lang/zig/zig-0.9.1.ebuild b/dev-lang/zig/zig-0.9.1.ebuild
index 1ce53e760265..a0e3522a22a0 100644
--- a/dev-lang/zig/zig-0.9.1.ebuild
+++ b/dev-lang/zig/zig-0.9.1.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == 9999 ]]; then
EGIT_REPO_URI="https://github.com/ziglang/zig.git"
inherit git-r3
else
- SRC_URI="https://github.com/ziglang/zig/archive/${PV}.tar.gz -> ${P}.tar.gz"
+ SRC_URI="https://ziglang.org/download/${PV}/${P}.tar.xz"
KEYWORDS="~amd64 ~arm ~arm64"
fi
diff --git a/dev-lang/zig/zig-9999.ebuild b/dev-lang/zig/zig-9999.ebuild
index 1ce53e760265..a0e3522a22a0 100644
--- a/dev-lang/zig/zig-9999.ebuild
+++ b/dev-lang/zig/zig-9999.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == 9999 ]]; then
EGIT_REPO_URI="https://github.com/ziglang/zig.git"
inherit git-r3
else
- SRC_URI="https://github.com/ziglang/zig/archive/${PV}.tar.gz -> ${P}.tar.gz"
+ SRC_URI="https://ziglang.org/download/${PV}/${P}.tar.xz"
KEYWORDS="~amd64 ~arm ~arm64"
fi
^ permalink raw reply related [flat|nested] 72+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-lang/zig/
@ 2022-04-17 20:05 Sam James
0 siblings, 0 replies; 72+ messages in thread
From: Sam James @ 2022-04-17 20:05 UTC (permalink / raw
To: gentoo-commits
commit: 05016b7429c5beea45667fbc7dbaa2de3d197991
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Apr 17 20:05:01 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Apr 17 20:05:46 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=05016b74
dev-lang/zig: fix UnusedLocalUse
Signed-off-by: Sam James <sam <AT> gentoo.org>
dev-lang/zig/metadata.xml | 3 ---
1 file changed, 3 deletions(-)
diff --git a/dev-lang/zig/metadata.xml b/dev-lang/zig/metadata.xml
index 4ae3c4b0e388..9a74b67c8634 100644
--- a/dev-lang/zig/metadata.xml
+++ b/dev-lang/zig/metadata.xml
@@ -2,9 +2,6 @@
<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<!-- maintainer-needed -->
- <use>
- <flag name="experimental">Enable builds that do not support all of LLVM's target architectures</flag>
- </use>
<upstream>
<remote-id type="github">ziglang/zig</remote-id>
</upstream>
^ permalink raw reply related [flat|nested] 72+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-lang/zig/
@ 2022-03-29 10:50 Ionen Wolkens
0 siblings, 0 replies; 72+ messages in thread
From: Ionen Wolkens @ 2022-03-29 10:50 UTC (permalink / raw
To: gentoo-commits
commit: 1c1aedd190ddd20cb3ac99aaba07b281b5f4f388
Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Tue Mar 29 10:34:16 2022 +0000
Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Tue Mar 29 10:50:20 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1c1aedd1
dev-lang/zig: propagate #836310 fix to other versions + live
Thanks for 0.9.1 fix.
Bug: https://bugs.gentoo.org/836310
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>
dev-lang/zig/zig-0.7.1.ebuild | 5 +++++
dev-lang/zig/zig-0.8.1-r1.ebuild | 5 +++++
dev-lang/zig/zig-9999.ebuild | 5 +++++
3 files changed, 15 insertions(+)
diff --git a/dev-lang/zig/zig-0.7.1.ebuild b/dev-lang/zig/zig-0.7.1.ebuild
index 39cf045b3b38..1c70ae2f502d 100644
--- a/dev-lang/zig/zig-0.7.1.ebuild
+++ b/dev-lang/zig/zig-0.7.1.ebuild
@@ -49,6 +49,11 @@ llvm_check_deps() {
# see https://github.com/ziglang/zig/wiki/Troubleshooting-Build-Issues#high-memory-requirements
CHECKREQS_MEMORY="6G"
+pkg_setup() {
+ llvm_pkg_setup
+ check-reqs_pkg_setup
+}
+
src_configure() {
local mycmakeargs=(
-DZIG_USE_CCACHE=OFF
diff --git a/dev-lang/zig/zig-0.8.1-r1.ebuild b/dev-lang/zig/zig-0.8.1-r1.ebuild
index 86befea8144c..0390c51f9678 100644
--- a/dev-lang/zig/zig-0.8.1-r1.ebuild
+++ b/dev-lang/zig/zig-0.8.1-r1.ebuild
@@ -48,6 +48,11 @@ llvm_check_deps() {
# see https://github.com/ziglang/zig/wiki/Troubleshooting-Build-Issues#high-memory-requirements
CHECKREQS_MEMORY="10G"
+pkg_setup() {
+ llvm_pkg_setup
+ check-reqs_pkg_setup
+}
+
src_configure() {
local mycmakeargs=(
-DZIG_USE_CCACHE=OFF
diff --git a/dev-lang/zig/zig-9999.ebuild b/dev-lang/zig/zig-9999.ebuild
index 30aa4b234c28..1ce53e760265 100644
--- a/dev-lang/zig/zig-9999.ebuild
+++ b/dev-lang/zig/zig-9999.ebuild
@@ -47,6 +47,11 @@ llvm_check_deps() {
# see https://github.com/ziglang/zig/wiki/Troubleshooting-Build-Issues#high-memory-requirements
CHECKREQS_MEMORY="10G"
+pkg_setup() {
+ llvm_pkg_setup
+ check-reqs_pkg_setup
+}
+
src_configure() {
local mycmakeargs=(
-DZIG_USE_CCACHE=OFF
^ permalink raw reply related [flat|nested] 72+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-lang/zig/
@ 2022-03-29 7:20 Joonas Niilola
0 siblings, 0 replies; 72+ messages in thread
From: Joonas Niilola @ 2022-03-29 7:20 UTC (permalink / raw
To: gentoo-commits
commit: 716f9df176f41d165541932174bb10968a180f65
Author: Joonas Niilola <juippis <AT> gentoo <DOT> org>
AuthorDate: Tue Mar 29 07:18:59 2022 +0000
Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Tue Mar 29 07:20:39 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=716f9df1
dev-lang/zig: fix pkg_setup on 0.9.1
- two eclasses export pkg_setup causing a conflict.
Closes: https://bugs.gentoo.org/836310
Thanks-to: Ionen Wolkens <ionen <AT> gentoo.org>
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>
dev-lang/zig/zig-0.9.1.ebuild | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/dev-lang/zig/zig-0.9.1.ebuild b/dev-lang/zig/zig-0.9.1.ebuild
index 30aa4b234c28..1ce53e760265 100644
--- a/dev-lang/zig/zig-0.9.1.ebuild
+++ b/dev-lang/zig/zig-0.9.1.ebuild
@@ -47,6 +47,11 @@ llvm_check_deps() {
# see https://github.com/ziglang/zig/wiki/Troubleshooting-Build-Issues#high-memory-requirements
CHECKREQS_MEMORY="10G"
+pkg_setup() {
+ llvm_pkg_setup
+ check-reqs_pkg_setup
+}
+
src_configure() {
local mycmakeargs=(
-DZIG_USE_CCACHE=OFF
^ permalink raw reply related [flat|nested] 72+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-lang/zig/
@ 2022-03-28 7:51 Florian Schmaus
0 siblings, 0 replies; 72+ messages in thread
From: Florian Schmaus @ 2022-03-28 7:51 UTC (permalink / raw
To: gentoo-commits
commit: d3e007705a1dbe686551fba460f2294285043db0
Author: BratishkaErik <bratishkaerik <AT> getgoogleoff <DOT> me>
AuthorDate: Thu Mar 24 13:43:14 2022 +0000
Commit: Florian Schmaus <flow <AT> gentoo <DOT> org>
CommitDate: Mon Mar 28 07:49:42 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d3e00770
dev-lang/zig: add memory requirement via check-reqs
see https://github.com/ziglang/zig/issues/6485
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: BratishkaErik <bratishkaerik <AT> getgoogleoff.me>
Closes: https://github.com/gentoo/gentoo/pull/24734
Signed-off-by: Florian Schmaus <flow <AT> gentoo.org>
dev-lang/zig/zig-0.7.1.ebuild | 9 ++++++---
dev-lang/zig/zig-0.8.1-r1.ebuild | 9 ++++++---
dev-lang/zig/zig-0.9.1.ebuild | 7 +++++--
dev-lang/zig/zig-9999.ebuild | 11 +++++++----
4 files changed, 24 insertions(+), 12 deletions(-)
diff --git a/dev-lang/zig/zig-0.7.1.ebuild b/dev-lang/zig/zig-0.7.1.ebuild
index d775cde187a1..39cf045b3b38 100644
--- a/dev-lang/zig/zig-0.7.1.ebuild
+++ b/dev-lang/zig/zig-0.7.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 2019-2021 Gentoo Authors
+# Copyright 2019-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
-inherit cmake llvm
+inherit cmake llvm check-reqs
DESCRIPTION="A robust, optimal, and maintainable programming language"
HOMEPAGE="https://ziglang.org/"
@@ -46,6 +46,9 @@ llvm_check_deps() {
has_version "sys-devel/clang:${LLVM_SLOT}"
}
+# see https://github.com/ziglang/zig/wiki/Troubleshooting-Build-Issues#high-memory-requirements
+CHECKREQS_MEMORY="6G"
+
src_configure() {
local mycmakeargs=(
-DZIG_USE_CCACHE=OFF
diff --git a/dev-lang/zig/zig-0.8.1-r1.ebuild b/dev-lang/zig/zig-0.8.1-r1.ebuild
index 659a2ac1dbca..86befea8144c 100644
--- a/dev-lang/zig/zig-0.8.1-r1.ebuild
+++ b/dev-lang/zig/zig-0.8.1-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 2019-2021 Gentoo Authors
+# Copyright 2019-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
-inherit cmake llvm
+inherit cmake llvm check-reqs
DESCRIPTION="A robust, optimal, and maintainable programming language"
HOMEPAGE="https://ziglang.org/"
@@ -45,6 +45,9 @@ llvm_check_deps() {
has_version "sys-devel/clang:${LLVM_SLOT}"
}
+# see https://github.com/ziglang/zig/wiki/Troubleshooting-Build-Issues#high-memory-requirements
+CHECKREQS_MEMORY="10G"
+
src_configure() {
local mycmakeargs=(
-DZIG_USE_CCACHE=OFF
diff --git a/dev-lang/zig/zig-0.9.1.ebuild b/dev-lang/zig/zig-0.9.1.ebuild
index f3e935ec2f28..30aa4b234c28 100644
--- a/dev-lang/zig/zig-0.9.1.ebuild
+++ b/dev-lang/zig/zig-0.9.1.ebuild
@@ -1,10 +1,10 @@
# Copyright 2019-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
LLVM_MAX_SLOT=13
-inherit cmake llvm
+inherit cmake llvm check-reqs
DESCRIPTION="A robust, optimal, and maintainable programming language"
HOMEPAGE="https://ziglang.org/"
@@ -44,6 +44,9 @@ llvm_check_deps() {
has_version "sys-devel/clang:${LLVM_SLOT}"
}
+# see https://github.com/ziglang/zig/wiki/Troubleshooting-Build-Issues#high-memory-requirements
+CHECKREQS_MEMORY="10G"
+
src_configure() {
local mycmakeargs=(
-DZIG_USE_CCACHE=OFF
diff --git a/dev-lang/zig/zig-9999.ebuild b/dev-lang/zig/zig-9999.ebuild
index ca45b1e7e4dc..30aa4b234c28 100644
--- a/dev-lang/zig/zig-9999.ebuild
+++ b/dev-lang/zig/zig-9999.ebuild
@@ -1,10 +1,10 @@
-# Copyright 2019-2021 Gentoo Authors
+# Copyright 2019-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
LLVM_MAX_SLOT=13
-inherit cmake llvm
+inherit cmake llvm check-reqs
DESCRIPTION="A robust, optimal, and maintainable programming language"
HOMEPAGE="https://ziglang.org/"
@@ -13,7 +13,7 @@ if [[ ${PV} == 9999 ]]; then
inherit git-r3
else
SRC_URI="https://github.com/ziglang/zig/archive/${PV}.tar.gz -> ${P}.tar.gz"
- KEYWORDS="~amd64 ~arm64"
+ KEYWORDS="~amd64 ~arm ~arm64"
fi
LICENSE="MIT"
@@ -44,6 +44,9 @@ llvm_check_deps() {
has_version "sys-devel/clang:${LLVM_SLOT}"
}
+# see https://github.com/ziglang/zig/wiki/Troubleshooting-Build-Issues#high-memory-requirements
+CHECKREQS_MEMORY="10G"
+
src_configure() {
local mycmakeargs=(
-DZIG_USE_CCACHE=OFF
^ permalink raw reply related [flat|nested] 72+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-lang/zig/
@ 2022-03-28 7:50 Florian Schmaus
0 siblings, 0 replies; 72+ messages in thread
From: Florian Schmaus @ 2022-03-28 7:50 UTC (permalink / raw
To: gentoo-commits
commit: 71788ddcccc1f81644d6f8413ad87830e2411d68
Author: BratishkaErik <bratishkaerik <AT> getgoogleoff <DOT> me>
AuthorDate: Thu Mar 24 13:39:52 2022 +0000
Commit: Florian Schmaus <flow <AT> gentoo <DOT> org>
CommitDate: Mon Mar 28 07:49:41 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=71788ddc
dev-lang/zig: drop old version
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: BratishkaErik <bratishkaerik <AT> getgoogleoff.me>
Signed-off-by: Florian Schmaus <flow <AT> gentoo.org>
dev-lang/zig/Manifest | 2 --
dev-lang/zig/zig-0.8.0.ebuild | 60 -------------------------------------------
dev-lang/zig/zig-0.9.0.ebuild | 59 ------------------------------------------
3 files changed, 121 deletions(-)
diff --git a/dev-lang/zig/Manifest b/dev-lang/zig/Manifest
index 04d7cb8f955c..8262b5e6ecfd 100644
--- a/dev-lang/zig/Manifest
+++ b/dev-lang/zig/Manifest
@@ -1,5 +1,3 @@
DIST zig-0.7.1.tar.gz 16082917 BLAKE2B 401bb079f2d0e2ad26837940e3b79c14237a492bd0b4df616f91b8b454ebd4ac3de36b2c988369c9eaaf7c2df4f95d4b1bb97760629f813ac8c7220e9542e12b SHA512 ad0b36f7b40481aca03940adfd42d34a724922993fc29a23a80412dc087ca6ce4876a400dc9bb7da455564521a88ea205c218988759ff6c56251a08232bfa41a
-DIST zig-0.8.0.tar.gz 19596459 BLAKE2B 7b688fdd201ce7b0b1e12127c4b1bf898699de18f410021e09bb056a56666aa8de512688a0048d6ac0ea8d6b7dfdb86e1a5416d2fab0a4911e16269d7b6be2a4 SHA512 2082810d5ab0560167766e80f0853e5ff99e32b1935836a6a0029b8e1c88061c55dd0c285cbcc506f4c38aac8477ec7162b771537699be9b3d387de94e3baa57
DIST zig-0.8.1.tar.gz 19643170 BLAKE2B bc52f3399b3355a1fc7675329870dd107b21798fc562a9e55cd4a7c838cfdb2ed58ae3a01e3841a1a58c82fe27bec8758703b654b7548b9e431728aaabcd7ea6 SHA512 36bea566eee3dc5c00f2713cbc6616258dbadd3ee994749339f124f8b70c691cfe7fdce6a00194f879679ea417dadb3bcc244f8b79153957a426fea2d52caaf5
-DIST zig-0.9.0.tar.gz 21994175 BLAKE2B aadef89d5fddc3e802965125625e62140ac37bdac40b29ab8b7652056589c037cbed5d4e46889f335b3c296fb4ae2a7cafd5d064a02d728a8325ad515cdc8c7a SHA512 fef36221e818364b45cf65de210b0a9d535c411a510371a3ab4dfd6f4621c0a16dba786169f115a006966875102acc742abee19a74d83e2bc999ea5b8304b879
DIST zig-0.9.1.tar.gz 22010374 BLAKE2B 24d6c945640aac1f7fd0eaf69937638181fb210c1f0be3110bc4e779cab3d56ef89286604b467013d52223a466addcb9bb81c85bbcf007d430a400669acf6279 SHA512 a9dc5fea25dde511122056832449658b00dbcf6d6bbfe658b375968a7bdb06c690abbdfe00c1afcfa481442392b051dcef5a5a5e81d4ceb23fa98a866b900f37
diff --git a/dev-lang/zig/zig-0.8.0.ebuild b/dev-lang/zig/zig-0.8.0.ebuild
deleted file mode 100644
index 3a6741c72cdc..000000000000
--- a/dev-lang/zig/zig-0.8.0.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 2019-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake llvm
-
-DESCRIPTION="A robust, optimal, and maintainable programming language"
-HOMEPAGE="https://ziglang.org/"
-LICENSE="MIT"
-SLOT="0"
-IUSE="+experimental test"
-RESTRICT="!test? ( test )"
-
-if [[ ${PV} == 9999 ]]; then
- EGIT_REPO_URI="https://github.com/ziglang/zig.git"
- inherit git-r3
-else
- SRC_URI="https://github.com/ziglang/zig/archive/${PV}.tar.gz -> ${P}.tar.gz"
- KEYWORDS="~amd64"
-fi
-
-BUILD_DIR="${S}/build"
-
-# According to zig's author, zig builds that do not support all targets are not
-# supported by the upstream project.
-ALL_LLVM_TARGETS=(
- AArch64 AMDGPU ARM AVR BPF Hexagon Lanai Mips MSP430 NVPTX
- PowerPC RISCV Sparc SystemZ WebAssembly X86 XCore
-)
-ALL_LLVM_TARGETS=( "${ALL_LLVM_TARGETS[@]/#/llvm_targets_}" )
-LLVM_TARGET_USEDEPS="${ALL_LLVM_TARGETS[@]}"
-
-LLVM_MAX_SLOT=12
-
-RDEPEND="
- sys-devel/clang:${LLVM_MAX_SLOT}
- >=sys-devel/lld-12.0.0
- <sys-devel/lld-13.0.0
- sys-devel/llvm:${LLVM_MAX_SLOT}
- !experimental? ( sys-devel/llvm:${LLVM_MAX_SLOT}[${LLVM_TARGET_USEDEPS// /,}] )
-"
-DEPEND="${RDEPEND}"
-
-llvm_check_deps() {
- has_version "sys-devel/clang:${LLVM_SLOT}"
-}
-
-src_configure() {
- local mycmakeargs=(
- -DZIG_USE_CCACHE=OFF
- -DZIG_PREFER_CLANG_CPP_DYLIB=ON
- )
- cmake_src_configure
-}
-
-src_test() {
- cd "${BUILD_DIR}" || die
- ./zig build test || die
-}
diff --git a/dev-lang/zig/zig-0.9.0.ebuild b/dev-lang/zig/zig-0.9.0.ebuild
deleted file mode 100644
index a433638a0feb..000000000000
--- a/dev-lang/zig/zig-0.9.0.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 2019-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-LLVM_MAX_SLOT=13
-inherit cmake llvm
-
-DESCRIPTION="A robust, optimal, and maintainable programming language"
-HOMEPAGE="https://ziglang.org/"
-if [[ ${PV} == 9999 ]]; then
- EGIT_REPO_URI="https://github.com/ziglang/zig.git"
- inherit git-r3
-else
- SRC_URI="https://github.com/ziglang/zig/archive/${PV}.tar.gz -> ${P}.tar.gz"
- KEYWORDS="~amd64 ~arm ~arm64"
-fi
-
-LICENSE="MIT"
-SLOT="0"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-BUILD_DIR="${S}/build"
-
-# According to zig's author, zig builds that do not support all targets are not
-# supported by the upstream project.
-ALL_LLVM_TARGETS=(
- AArch64 AMDGPU ARM AVR BPF Hexagon Lanai Mips MSP430 NVPTX
- PowerPC RISCV Sparc SystemZ WebAssembly X86 XCore
-)
-ALL_LLVM_TARGETS=( "${ALL_LLVM_TARGETS[@]/#/llvm_targets_}" )
-LLVM_TARGET_USEDEPS="${ALL_LLVM_TARGETS[@]}"
-
-RDEPEND="
- 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}[${LLVM_TARGET_USEDEPS// /,}]
-"
-DEPEND="${RDEPEND}"
-
-llvm_check_deps() {
- has_version "sys-devel/clang:${LLVM_SLOT}"
-}
-
-src_configure() {
- local mycmakeargs=(
- -DZIG_USE_CCACHE=OFF
- -DZIG_PREFER_CLANG_CPP_DYLIB=ON
- )
-
- cmake_src_configure
-}
-
-src_test() {
- cd "${BUILD_DIR}" || die
- ./zig build test || die
-}
^ permalink raw reply related [flat|nested] 72+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-lang/zig/
@ 2022-03-08 13:17 Florian Schmaus
0 siblings, 0 replies; 72+ messages in thread
From: Florian Schmaus @ 2022-03-08 13:17 UTC (permalink / raw
To: gentoo-commits
commit: e9c309cc793b64322187e89b35822a5be0032c03
Author: BratishkaErik <bratishkaerik <AT> getgoogleoff <DOT> me>
AuthorDate: Sat Mar 5 14:04:19 2022 +0000
Commit: Florian Schmaus <flow <AT> gentoo <DOT> org>
CommitDate: Tue Mar 8 13:17:28 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e9c309cc
dev-lang/zig: New version 0.9.1
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: BratishkaErik <bratishkaerik <AT> getgoogleoff.me>
Closes: https://github.com/gentoo/gentoo/pull/24412
Signed-off-by: Florian Schmaus <flow <AT> gentoo.org>
dev-lang/zig/Manifest | 1 +
dev-lang/zig/zig-0.9.1.ebuild | 59 +++++++++++++++++++++++++++++++++++++++++++
2 files changed, 60 insertions(+)
diff --git a/dev-lang/zig/Manifest b/dev-lang/zig/Manifest
index ae56387e0a78..04d7cb8f955c 100644
--- a/dev-lang/zig/Manifest
+++ b/dev-lang/zig/Manifest
@@ -2,3 +2,4 @@ DIST zig-0.7.1.tar.gz 16082917 BLAKE2B 401bb079f2d0e2ad26837940e3b79c14237a492bd
DIST zig-0.8.0.tar.gz 19596459 BLAKE2B 7b688fdd201ce7b0b1e12127c4b1bf898699de18f410021e09bb056a56666aa8de512688a0048d6ac0ea8d6b7dfdb86e1a5416d2fab0a4911e16269d7b6be2a4 SHA512 2082810d5ab0560167766e80f0853e5ff99e32b1935836a6a0029b8e1c88061c55dd0c285cbcc506f4c38aac8477ec7162b771537699be9b3d387de94e3baa57
DIST zig-0.8.1.tar.gz 19643170 BLAKE2B bc52f3399b3355a1fc7675329870dd107b21798fc562a9e55cd4a7c838cfdb2ed58ae3a01e3841a1a58c82fe27bec8758703b654b7548b9e431728aaabcd7ea6 SHA512 36bea566eee3dc5c00f2713cbc6616258dbadd3ee994749339f124f8b70c691cfe7fdce6a00194f879679ea417dadb3bcc244f8b79153957a426fea2d52caaf5
DIST zig-0.9.0.tar.gz 21994175 BLAKE2B aadef89d5fddc3e802965125625e62140ac37bdac40b29ab8b7652056589c037cbed5d4e46889f335b3c296fb4ae2a7cafd5d064a02d728a8325ad515cdc8c7a SHA512 fef36221e818364b45cf65de210b0a9d535c411a510371a3ab4dfd6f4621c0a16dba786169f115a006966875102acc742abee19a74d83e2bc999ea5b8304b879
+DIST zig-0.9.1.tar.gz 22010374 BLAKE2B 24d6c945640aac1f7fd0eaf69937638181fb210c1f0be3110bc4e779cab3d56ef89286604b467013d52223a466addcb9bb81c85bbcf007d430a400669acf6279 SHA512 a9dc5fea25dde511122056832449658b00dbcf6d6bbfe658b375968a7bdb06c690abbdfe00c1afcfa481442392b051dcef5a5a5e81d4ceb23fa98a866b900f37
diff --git a/dev-lang/zig/zig-0.9.1.ebuild b/dev-lang/zig/zig-0.9.1.ebuild
new file mode 100644
index 000000000000..f3e935ec2f28
--- /dev/null
+++ b/dev-lang/zig/zig-0.9.1.ebuild
@@ -0,0 +1,59 @@
+# Copyright 2019-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+LLVM_MAX_SLOT=13
+inherit cmake llvm
+
+DESCRIPTION="A robust, optimal, and maintainable programming language"
+HOMEPAGE="https://ziglang.org/"
+if [[ ${PV} == 9999 ]]; then
+ EGIT_REPO_URI="https://github.com/ziglang/zig.git"
+ inherit git-r3
+else
+ SRC_URI="https://github.com/ziglang/zig/archive/${PV}.tar.gz -> ${P}.tar.gz"
+ KEYWORDS="~amd64 ~arm ~arm64"
+fi
+
+LICENSE="MIT"
+SLOT="0"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+BUILD_DIR="${S}/build"
+
+# According to zig's author, zig builds that do not support all targets are not
+# supported by the upstream project.
+ALL_LLVM_TARGETS=(
+ AArch64 AMDGPU ARM AVR BPF Hexagon Lanai Mips MSP430 NVPTX
+ PowerPC RISCV Sparc SystemZ WebAssembly X86 XCore
+)
+ALL_LLVM_TARGETS=( "${ALL_LLVM_TARGETS[@]/#/llvm_targets_}" )
+LLVM_TARGET_USEDEPS="${ALL_LLVM_TARGETS[@]}"
+
+RDEPEND="
+ 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}[${LLVM_TARGET_USEDEPS// /,}]
+"
+DEPEND="${RDEPEND}"
+
+llvm_check_deps() {
+ has_version "sys-devel/clang:${LLVM_SLOT}"
+}
+
+src_configure() {
+ local mycmakeargs=(
+ -DZIG_USE_CCACHE=OFF
+ -DZIG_PREFER_CLANG_CPP_DYLIB=ON
+ )
+
+ cmake_src_configure
+}
+
+src_test() {
+ cd "${BUILD_DIR}" || die
+ ./zig build test || die
+}
^ permalink raw reply related [flat|nested] 72+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-lang/zig/
@ 2021-12-25 17:27 Arthur Zamarin
0 siblings, 0 replies; 72+ messages in thread
From: Arthur Zamarin @ 2021-12-25 17:27 UTC (permalink / raw
To: gentoo-commits
commit: c5dfae2cff3c10778fe25921e5be13ba7f57906b
Author: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Sat Dec 25 17:25:54 2021 +0000
Commit: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Sat Dec 25 17:25:54 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c5dfae2c
dev-lang/zig: Keyword 0.9.0 arm, #796596
Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>
dev-lang/zig/zig-0.9.0.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-lang/zig/zig-0.9.0.ebuild b/dev-lang/zig/zig-0.9.0.ebuild
index ca45b1e7e4dc..a433638a0feb 100644
--- a/dev-lang/zig/zig-0.9.0.ebuild
+++ b/dev-lang/zig/zig-0.9.0.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == 9999 ]]; then
inherit git-r3
else
SRC_URI="https://github.com/ziglang/zig/archive/${PV}.tar.gz -> ${P}.tar.gz"
- KEYWORDS="~amd64 ~arm64"
+ KEYWORDS="~amd64 ~arm ~arm64"
fi
LICENSE="MIT"
^ permalink raw reply related [flat|nested] 72+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-lang/zig/
@ 2021-12-25 10:21 Sam James
0 siblings, 0 replies; 72+ messages in thread
From: Sam James @ 2021-12-25 10:21 UTC (permalink / raw
To: gentoo-commits
commit: c178342dee4cd125fc0447c90dab8ad1dbf19945
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat Dec 25 10:21:17 2021 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Dec 25 10:21:17 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c178342d
dev-lang/zig: fix WhitespaceFound
Signed-off-by: Sam James <sam <AT> gentoo.org>
dev-lang/zig/zig-0.9.0.ebuild | 2 +-
dev-lang/zig/zig-9999.ebuild | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/dev-lang/zig/zig-0.9.0.ebuild b/dev-lang/zig/zig-0.9.0.ebuild
index c49decab3bfc..ca45b1e7e4dc 100644
--- a/dev-lang/zig/zig-0.9.0.ebuild
+++ b/dev-lang/zig/zig-0.9.0.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == 9999 ]]; then
EGIT_REPO_URI="https://github.com/ziglang/zig.git"
inherit git-r3
else
- SRC_URI="https://github.com/ziglang/zig/archive/${PV}.tar.gz -> ${P}.tar.gz"
+ SRC_URI="https://github.com/ziglang/zig/archive/${PV}.tar.gz -> ${P}.tar.gz"
KEYWORDS="~amd64 ~arm64"
fi
diff --git a/dev-lang/zig/zig-9999.ebuild b/dev-lang/zig/zig-9999.ebuild
index c49decab3bfc..ca45b1e7e4dc 100644
--- a/dev-lang/zig/zig-9999.ebuild
+++ b/dev-lang/zig/zig-9999.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == 9999 ]]; then
EGIT_REPO_URI="https://github.com/ziglang/zig.git"
inherit git-r3
else
- SRC_URI="https://github.com/ziglang/zig/archive/${PV}.tar.gz -> ${P}.tar.gz"
+ SRC_URI="https://github.com/ziglang/zig/archive/${PV}.tar.gz -> ${P}.tar.gz"
KEYWORDS="~amd64 ~arm64"
fi
^ permalink raw reply related [flat|nested] 72+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-lang/zig/
@ 2021-12-25 10:20 Sam James
0 siblings, 0 replies; 72+ messages in thread
From: Sam James @ 2021-12-25 10:20 UTC (permalink / raw
To: gentoo-commits
commit: a8d16bb82ffe4a7369ed05479eb593c7f99452e9
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat Dec 25 10:20:13 2021 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Dec 25 10:20:37 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a8d16bb8
dev-lang/zig: add 0.9.0
Signed-off-by: Sam James <sam <AT> gentoo.org>
dev-lang/zig/Manifest | 1 +
dev-lang/zig/{zig-9999.ebuild => zig-0.9.0.ebuild} | 22 +++++++++++-----------
dev-lang/zig/zig-9999.ebuild | 22 +++++++++++-----------
3 files changed, 23 insertions(+), 22 deletions(-)
diff --git a/dev-lang/zig/Manifest b/dev-lang/zig/Manifest
index 77e8cc7d0e3d..ae56387e0a78 100644
--- a/dev-lang/zig/Manifest
+++ b/dev-lang/zig/Manifest
@@ -1,3 +1,4 @@
DIST zig-0.7.1.tar.gz 16082917 BLAKE2B 401bb079f2d0e2ad26837940e3b79c14237a492bd0b4df616f91b8b454ebd4ac3de36b2c988369c9eaaf7c2df4f95d4b1bb97760629f813ac8c7220e9542e12b SHA512 ad0b36f7b40481aca03940adfd42d34a724922993fc29a23a80412dc087ca6ce4876a400dc9bb7da455564521a88ea205c218988759ff6c56251a08232bfa41a
DIST zig-0.8.0.tar.gz 19596459 BLAKE2B 7b688fdd201ce7b0b1e12127c4b1bf898699de18f410021e09bb056a56666aa8de512688a0048d6ac0ea8d6b7dfdb86e1a5416d2fab0a4911e16269d7b6be2a4 SHA512 2082810d5ab0560167766e80f0853e5ff99e32b1935836a6a0029b8e1c88061c55dd0c285cbcc506f4c38aac8477ec7162b771537699be9b3d387de94e3baa57
DIST zig-0.8.1.tar.gz 19643170 BLAKE2B bc52f3399b3355a1fc7675329870dd107b21798fc562a9e55cd4a7c838cfdb2ed58ae3a01e3841a1a58c82fe27bec8758703b654b7548b9e431728aaabcd7ea6 SHA512 36bea566eee3dc5c00f2713cbc6616258dbadd3ee994749339f124f8b70c691cfe7fdce6a00194f879679ea417dadb3bcc244f8b79153957a426fea2d52caaf5
+DIST zig-0.9.0.tar.gz 21994175 BLAKE2B aadef89d5fddc3e802965125625e62140ac37bdac40b29ab8b7652056589c037cbed5d4e46889f335b3c296fb4ae2a7cafd5d064a02d728a8325ad515cdc8c7a SHA512 fef36221e818364b45cf65de210b0a9d535c411a510371a3ab4dfd6f4621c0a16dba786169f115a006966875102acc742abee19a74d83e2bc999ea5b8304b879
diff --git a/dev-lang/zig/zig-9999.ebuild b/dev-lang/zig/zig-0.9.0.ebuild
similarity index 86%
copy from dev-lang/zig/zig-9999.ebuild
copy to dev-lang/zig/zig-0.9.0.ebuild
index 6aa6d288a706..c49decab3bfc 100644
--- a/dev-lang/zig/zig-9999.ebuild
+++ b/dev-lang/zig/zig-0.9.0.ebuild
@@ -3,23 +3,24 @@
EAPI=7
+LLVM_MAX_SLOT=13
inherit cmake llvm
DESCRIPTION="A robust, optimal, and maintainable programming language"
HOMEPAGE="https://ziglang.org/"
-LICENSE="MIT"
-SLOT="0"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
if [[ ${PV} == 9999 ]]; then
EGIT_REPO_URI="https://github.com/ziglang/zig.git"
inherit git-r3
else
- SRC_URI="https://github.com/ziglang/zig/archive/${PV}.tar.gz -> ${P}.tar.gz"
- KEYWORDS="~amd64"
+ SRC_URI="https://github.com/ziglang/zig/archive/${PV}.tar.gz -> ${P}.tar.gz"
+ KEYWORDS="~amd64 ~arm64"
fi
+LICENSE="MIT"
+SLOT="0"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
BUILD_DIR="${S}/build"
# According to zig's author, zig builds that do not support all targets are not
@@ -31,12 +32,10 @@ ALL_LLVM_TARGETS=(
ALL_LLVM_TARGETS=( "${ALL_LLVM_TARGETS[@]/#/llvm_targets_}" )
LLVM_TARGET_USEDEPS="${ALL_LLVM_TARGETS[@]}"
-LLVM_MAX_SLOT=13
-
RDEPEND="
sys-devel/clang:${LLVM_MAX_SLOT}
- >=sys-devel/lld-12.0.0
- <sys-devel/lld-14.0.0
+ >=sys-devel/lld-${LLVM_MAX_SLOT}
+ <sys-devel/lld-$((${LLVM_MAX_SLOT} + 1))
sys-devel/llvm:${LLVM_MAX_SLOT}[${LLVM_TARGET_USEDEPS// /,}]
"
DEPEND="${RDEPEND}"
@@ -50,6 +49,7 @@ src_configure() {
-DZIG_USE_CCACHE=OFF
-DZIG_PREFER_CLANG_CPP_DYLIB=ON
)
+
cmake_src_configure
}
diff --git a/dev-lang/zig/zig-9999.ebuild b/dev-lang/zig/zig-9999.ebuild
index 6aa6d288a706..c49decab3bfc 100644
--- a/dev-lang/zig/zig-9999.ebuild
+++ b/dev-lang/zig/zig-9999.ebuild
@@ -3,23 +3,24 @@
EAPI=7
+LLVM_MAX_SLOT=13
inherit cmake llvm
DESCRIPTION="A robust, optimal, and maintainable programming language"
HOMEPAGE="https://ziglang.org/"
-LICENSE="MIT"
-SLOT="0"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
if [[ ${PV} == 9999 ]]; then
EGIT_REPO_URI="https://github.com/ziglang/zig.git"
inherit git-r3
else
- SRC_URI="https://github.com/ziglang/zig/archive/${PV}.tar.gz -> ${P}.tar.gz"
- KEYWORDS="~amd64"
+ SRC_URI="https://github.com/ziglang/zig/archive/${PV}.tar.gz -> ${P}.tar.gz"
+ KEYWORDS="~amd64 ~arm64"
fi
+LICENSE="MIT"
+SLOT="0"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
BUILD_DIR="${S}/build"
# According to zig's author, zig builds that do not support all targets are not
@@ -31,12 +32,10 @@ ALL_LLVM_TARGETS=(
ALL_LLVM_TARGETS=( "${ALL_LLVM_TARGETS[@]/#/llvm_targets_}" )
LLVM_TARGET_USEDEPS="${ALL_LLVM_TARGETS[@]}"
-LLVM_MAX_SLOT=13
-
RDEPEND="
sys-devel/clang:${LLVM_MAX_SLOT}
- >=sys-devel/lld-12.0.0
- <sys-devel/lld-14.0.0
+ >=sys-devel/lld-${LLVM_MAX_SLOT}
+ <sys-devel/lld-$((${LLVM_MAX_SLOT} + 1))
sys-devel/llvm:${LLVM_MAX_SLOT}[${LLVM_TARGET_USEDEPS// /,}]
"
DEPEND="${RDEPEND}"
@@ -50,6 +49,7 @@ src_configure() {
-DZIG_USE_CCACHE=OFF
-DZIG_PREFER_CLANG_CPP_DYLIB=ON
)
+
cmake_src_configure
}
^ permalink raw reply related [flat|nested] 72+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-lang/zig/
@ 2021-11-21 9:52 Michał Górny
0 siblings, 0 replies; 72+ messages in thread
From: Michał Górny @ 2021-11-21 9:52 UTC (permalink / raw
To: gentoo-commits
commit: a4c78c736ff3dd8bef9f6278858fcebbd3da3a1f
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sun Nov 21 09:49:30 2021 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sun Nov 21 09:52:27 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a4c78c73
dev-lang/zig: Keyword 0.8.1-r1 arm64, #796596
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
dev-lang/zig/zig-0.8.1-r1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-lang/zig/zig-0.8.1-r1.ebuild b/dev-lang/zig/zig-0.8.1-r1.ebuild
index 6d44bbced52f..659a2ac1dbca 100644
--- a/dev-lang/zig/zig-0.8.1-r1.ebuild
+++ b/dev-lang/zig/zig-0.8.1-r1.ebuild
@@ -17,7 +17,7 @@ if [[ ${PV} == 9999 ]]; then
inherit git-r3
else
SRC_URI="https://github.com/ziglang/zig/archive/${PV}.tar.gz -> ${P}.tar.gz"
- KEYWORDS="~amd64"
+ KEYWORDS="~amd64 ~arm64"
fi
BUILD_DIR="${S}/build"
^ permalink raw reply related [flat|nested] 72+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-lang/zig/
@ 2021-11-05 13:39 罗百科
0 siblings, 0 replies; 72+ messages in thread
From: 罗百科 @ 2021-11-05 13:39 UTC (permalink / raw
To: gentoo-commits
commit: a9506d0fdd5713698e24b41ce4f6f5afea2bd7ad
Author: Patrick Lauer <patrick <AT> gentoo <DOT> org>
AuthorDate: Fri Nov 5 13:38:53 2021 +0000
Commit: 罗百科 <patrick <AT> gentoo <DOT> org>
CommitDate: Fri Nov 5 13:39:17 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a9506d0f
dev-lang/zig: Disable experimental useflag for newest
Doesn't build otherwise, can't be fixed easily as
upstream assumes full LLVM_TARGETS available
Bug: https://bugs.gentoo.org/800206
Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Patrick Lauer <patrick <AT> gentoo.org>
dev-lang/zig/{zig-0.8.1.ebuild => zig-0.8.1-r1.ebuild} | 5 ++---
dev-lang/zig/zig-9999.ebuild | 5 ++---
2 files changed, 4 insertions(+), 6 deletions(-)
diff --git a/dev-lang/zig/zig-0.8.1.ebuild b/dev-lang/zig/zig-0.8.1-r1.ebuild
similarity index 89%
rename from dev-lang/zig/zig-0.8.1.ebuild
rename to dev-lang/zig/zig-0.8.1-r1.ebuild
index 3a6741c72cd..6d44bbced52 100644
--- a/dev-lang/zig/zig-0.8.1.ebuild
+++ b/dev-lang/zig/zig-0.8.1-r1.ebuild
@@ -9,7 +9,7 @@ DESCRIPTION="A robust, optimal, and maintainable programming language"
HOMEPAGE="https://ziglang.org/"
LICENSE="MIT"
SLOT="0"
-IUSE="+experimental test"
+IUSE="test"
RESTRICT="!test? ( test )"
if [[ ${PV} == 9999 ]]; then
@@ -37,8 +37,7 @@ RDEPEND="
sys-devel/clang:${LLVM_MAX_SLOT}
>=sys-devel/lld-12.0.0
<sys-devel/lld-13.0.0
- sys-devel/llvm:${LLVM_MAX_SLOT}
- !experimental? ( sys-devel/llvm:${LLVM_MAX_SLOT}[${LLVM_TARGET_USEDEPS// /,}] )
+ sys-devel/llvm:${LLVM_MAX_SLOT}[${LLVM_TARGET_USEDEPS// /,}]
"
DEPEND="${RDEPEND}"
diff --git a/dev-lang/zig/zig-9999.ebuild b/dev-lang/zig/zig-9999.ebuild
index ecb9704d75a..6aa6d288a70 100644
--- a/dev-lang/zig/zig-9999.ebuild
+++ b/dev-lang/zig/zig-9999.ebuild
@@ -9,7 +9,7 @@ DESCRIPTION="A robust, optimal, and maintainable programming language"
HOMEPAGE="https://ziglang.org/"
LICENSE="MIT"
SLOT="0"
-IUSE="+experimental test"
+IUSE="test"
RESTRICT="!test? ( test )"
if [[ ${PV} == 9999 ]]; then
@@ -37,8 +37,7 @@ RDEPEND="
sys-devel/clang:${LLVM_MAX_SLOT}
>=sys-devel/lld-12.0.0
<sys-devel/lld-14.0.0
- sys-devel/llvm:${LLVM_MAX_SLOT}
- !experimental? ( sys-devel/llvm:${LLVM_MAX_SLOT}[${LLVM_TARGET_USEDEPS// /,}] )
+ sys-devel/llvm:${LLVM_MAX_SLOT}[${LLVM_TARGET_USEDEPS// /,}]
"
DEPEND="${RDEPEND}"
^ permalink raw reply related [flat|nested] 72+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-lang/zig/
@ 2021-10-30 23:32 Sam James
0 siblings, 0 replies; 72+ messages in thread
From: Sam James @ 2021-10-30 23:32 UTC (permalink / raw
To: gentoo-commits
commit: 8b4a7071f8c7de45efe15c23bbf85e1cdd858df3
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat Oct 30 23:31:22 2021 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Oct 30 23:31:51 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8b4a7071
dev-lang/zig: depend on LLVM 13 in live ebuild
Closes: https://bugs.gentoo.org/816084
Reported-by: Martin Sekera <sekerama <AT> gmail.com>
Signed-off-by: Sam James <sam <AT> gentoo.org>
dev-lang/zig/zig-9999.ebuild | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/dev-lang/zig/zig-9999.ebuild b/dev-lang/zig/zig-9999.ebuild
index 3a6741c72cd..ecb9704d75a 100644
--- a/dev-lang/zig/zig-9999.ebuild
+++ b/dev-lang/zig/zig-9999.ebuild
@@ -31,12 +31,12 @@ ALL_LLVM_TARGETS=(
ALL_LLVM_TARGETS=( "${ALL_LLVM_TARGETS[@]/#/llvm_targets_}" )
LLVM_TARGET_USEDEPS="${ALL_LLVM_TARGETS[@]}"
-LLVM_MAX_SLOT=12
+LLVM_MAX_SLOT=13
RDEPEND="
sys-devel/clang:${LLVM_MAX_SLOT}
>=sys-devel/lld-12.0.0
- <sys-devel/lld-13.0.0
+ <sys-devel/lld-14.0.0
sys-devel/llvm:${LLVM_MAX_SLOT}
!experimental? ( sys-devel/llvm:${LLVM_MAX_SLOT}[${LLVM_TARGET_USEDEPS// /,}] )
"
^ permalink raw reply related [flat|nested] 72+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-lang/zig/
@ 2021-10-30 23:32 Sam James
0 siblings, 0 replies; 72+ messages in thread
From: Sam James @ 2021-10-30 23:32 UTC (permalink / raw
To: gentoo-commits
commit: c666e88e9a5c2e0abf663d6b96d01db72ca4b138
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat Oct 30 23:30:18 2021 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Oct 30 23:31:50 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c666e88e
dev-lang/zig: add 0.8.1
Signed-off-by: Sam James <sam <AT> gentoo.org>
dev-lang/zig/Manifest | 1 +
dev-lang/zig/zig-0.8.1.ebuild | 60 +++++++++++++++++++++++++++++++++++++++++++
2 files changed, 61 insertions(+)
diff --git a/dev-lang/zig/Manifest b/dev-lang/zig/Manifest
index 877fd7c31c1..77e8cc7d0e3 100644
--- a/dev-lang/zig/Manifest
+++ b/dev-lang/zig/Manifest
@@ -1,2 +1,3 @@
DIST zig-0.7.1.tar.gz 16082917 BLAKE2B 401bb079f2d0e2ad26837940e3b79c14237a492bd0b4df616f91b8b454ebd4ac3de36b2c988369c9eaaf7c2df4f95d4b1bb97760629f813ac8c7220e9542e12b SHA512 ad0b36f7b40481aca03940adfd42d34a724922993fc29a23a80412dc087ca6ce4876a400dc9bb7da455564521a88ea205c218988759ff6c56251a08232bfa41a
DIST zig-0.8.0.tar.gz 19596459 BLAKE2B 7b688fdd201ce7b0b1e12127c4b1bf898699de18f410021e09bb056a56666aa8de512688a0048d6ac0ea8d6b7dfdb86e1a5416d2fab0a4911e16269d7b6be2a4 SHA512 2082810d5ab0560167766e80f0853e5ff99e32b1935836a6a0029b8e1c88061c55dd0c285cbcc506f4c38aac8477ec7162b771537699be9b3d387de94e3baa57
+DIST zig-0.8.1.tar.gz 19643170 BLAKE2B bc52f3399b3355a1fc7675329870dd107b21798fc562a9e55cd4a7c838cfdb2ed58ae3a01e3841a1a58c82fe27bec8758703b654b7548b9e431728aaabcd7ea6 SHA512 36bea566eee3dc5c00f2713cbc6616258dbadd3ee994749339f124f8b70c691cfe7fdce6a00194f879679ea417dadb3bcc244f8b79153957a426fea2d52caaf5
diff --git a/dev-lang/zig/zig-0.8.1.ebuild b/dev-lang/zig/zig-0.8.1.ebuild
new file mode 100644
index 00000000000..3a6741c72cd
--- /dev/null
+++ b/dev-lang/zig/zig-0.8.1.ebuild
@@ -0,0 +1,60 @@
+# Copyright 2019-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake llvm
+
+DESCRIPTION="A robust, optimal, and maintainable programming language"
+HOMEPAGE="https://ziglang.org/"
+LICENSE="MIT"
+SLOT="0"
+IUSE="+experimental test"
+RESTRICT="!test? ( test )"
+
+if [[ ${PV} == 9999 ]]; then
+ EGIT_REPO_URI="https://github.com/ziglang/zig.git"
+ inherit git-r3
+else
+ SRC_URI="https://github.com/ziglang/zig/archive/${PV}.tar.gz -> ${P}.tar.gz"
+ KEYWORDS="~amd64"
+fi
+
+BUILD_DIR="${S}/build"
+
+# According to zig's author, zig builds that do not support all targets are not
+# supported by the upstream project.
+ALL_LLVM_TARGETS=(
+ AArch64 AMDGPU ARM AVR BPF Hexagon Lanai Mips MSP430 NVPTX
+ PowerPC RISCV Sparc SystemZ WebAssembly X86 XCore
+)
+ALL_LLVM_TARGETS=( "${ALL_LLVM_TARGETS[@]/#/llvm_targets_}" )
+LLVM_TARGET_USEDEPS="${ALL_LLVM_TARGETS[@]}"
+
+LLVM_MAX_SLOT=12
+
+RDEPEND="
+ sys-devel/clang:${LLVM_MAX_SLOT}
+ >=sys-devel/lld-12.0.0
+ <sys-devel/lld-13.0.0
+ sys-devel/llvm:${LLVM_MAX_SLOT}
+ !experimental? ( sys-devel/llvm:${LLVM_MAX_SLOT}[${LLVM_TARGET_USEDEPS// /,}] )
+"
+DEPEND="${RDEPEND}"
+
+llvm_check_deps() {
+ has_version "sys-devel/clang:${LLVM_SLOT}"
+}
+
+src_configure() {
+ local mycmakeargs=(
+ -DZIG_USE_CCACHE=OFF
+ -DZIG_PREFER_CLANG_CPP_DYLIB=ON
+ )
+ cmake_src_configure
+}
+
+src_test() {
+ cd "${BUILD_DIR}" || die
+ ./zig build test || die
+}
^ permalink raw reply related [flat|nested] 72+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-lang/zig/
@ 2021-07-03 15:46 Joonas Niilola
0 siblings, 0 replies; 72+ messages in thread
From: Joonas Niilola @ 2021-07-03 15:46 UTC (permalink / raw
To: gentoo-commits
commit: 77a79765c7e6c8421c5591bd80954098631e3114
Author: Aisha Tammy <floss <AT> bsd <DOT> ac>
AuthorDate: Tue Jun 22 19:34:00 2021 +0000
Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Sat Jul 3 15:40:19 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=77a79765
dev-lang/zig: enable tests for 0.7.1
Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Aisha Tammy <gentoo <AT> aisha.cc>
Closes: https://github.com/gentoo/gentoo/pull/21296
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>
dev-lang/zig/zig-0.7.1.ebuild | 10 +++++++++-
1 file changed, 9 insertions(+), 1 deletion(-)
diff --git a/dev-lang/zig/zig-0.7.1.ebuild b/dev-lang/zig/zig-0.7.1.ebuild
index 063604d4ceb..18ac8c97dc0 100644
--- a/dev-lang/zig/zig-0.7.1.ebuild
+++ b/dev-lang/zig/zig-0.7.1.ebuild
@@ -9,7 +9,8 @@ DESCRIPTION="A robust, optimal, and maintainable programming language"
HOMEPAGE="https://ziglang.org/"
LICENSE="MIT"
SLOT="0"
-IUSE="+experimental"
+IUSE="+experimental test"
+RESTRICT="!test? ( test )"
if [[ ${PV} == 9999 ]]; then
EGIT_REPO_URI="https://github.com/ziglang/zig.git"
@@ -19,6 +20,8 @@ else
KEYWORDS="~amd64"
fi
+BUILD_DIR="${S}/build"
+
# According to zig's author, zig builds that do not support all targets are not
# supported by the upstream project.
ALL_LLVM_TARGETS=(
@@ -50,3 +53,8 @@ src_configure() {
)
cmake_src_configure
}
+
+src_test() {
+ cd "${BUILD_DIR}"
+ ./zig build test || die
+}
^ permalink raw reply related [flat|nested] 72+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-lang/zig/
@ 2021-07-03 15:46 Joonas Niilola
0 siblings, 0 replies; 72+ messages in thread
From: Joonas Niilola @ 2021-07-03 15:46 UTC (permalink / raw
To: gentoo-commits
commit: ae36192c403d573af8ccf00c28b3d13009fb9661
Author: Aisha Tammy <floss <AT> bsd <DOT> ac>
AuthorDate: Tue Jun 22 19:33:17 2021 +0000
Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Sat Jul 3 15:40:14 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ae36192c
dev-lang/zig: version bump to 0.8.0
Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Aisha Tammy <gentoo <AT> aisha.cc>
Closes: https://github.com/gentoo/gentoo/pull/21175
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>
dev-lang/zig/Manifest | 1 +
dev-lang/zig/{zig-9999.ebuild => zig-0.8.0.ebuild} | 16 ++++++++++++----
dev-lang/zig/zig-9999.ebuild | 16 ++++++++++++----
3 files changed, 25 insertions(+), 8 deletions(-)
diff --git a/dev-lang/zig/Manifest b/dev-lang/zig/Manifest
index 54f58f160a2..877fd7c31c1 100644
--- a/dev-lang/zig/Manifest
+++ b/dev-lang/zig/Manifest
@@ -1 +1,2 @@
DIST zig-0.7.1.tar.gz 16082917 BLAKE2B 401bb079f2d0e2ad26837940e3b79c14237a492bd0b4df616f91b8b454ebd4ac3de36b2c988369c9eaaf7c2df4f95d4b1bb97760629f813ac8c7220e9542e12b SHA512 ad0b36f7b40481aca03940adfd42d34a724922993fc29a23a80412dc087ca6ce4876a400dc9bb7da455564521a88ea205c218988759ff6c56251a08232bfa41a
+DIST zig-0.8.0.tar.gz 19596459 BLAKE2B 7b688fdd201ce7b0b1e12127c4b1bf898699de18f410021e09bb056a56666aa8de512688a0048d6ac0ea8d6b7dfdb86e1a5416d2fab0a4911e16269d7b6be2a4 SHA512 2082810d5ab0560167766e80f0853e5ff99e32b1935836a6a0029b8e1c88061c55dd0c285cbcc506f4c38aac8477ec7162b771537699be9b3d387de94e3baa57
diff --git a/dev-lang/zig/zig-9999.ebuild b/dev-lang/zig/zig-0.8.0.ebuild
similarity index 85%
copy from dev-lang/zig/zig-9999.ebuild
copy to dev-lang/zig/zig-0.8.0.ebuild
index 063604d4ceb..b33c67c5132 100644
--- a/dev-lang/zig/zig-9999.ebuild
+++ b/dev-lang/zig/zig-0.8.0.ebuild
@@ -9,7 +9,8 @@ DESCRIPTION="A robust, optimal, and maintainable programming language"
HOMEPAGE="https://ziglang.org/"
LICENSE="MIT"
SLOT="0"
-IUSE="+experimental"
+IUSE="+experimental test"
+RESTRICT="!test? ( test )"
if [[ ${PV} == 9999 ]]; then
EGIT_REPO_URI="https://github.com/ziglang/zig.git"
@@ -19,6 +20,8 @@ else
KEYWORDS="~amd64"
fi
+BUILD_DIR="${S}/build"
+
# According to zig's author, zig builds that do not support all targets are not
# supported by the upstream project.
ALL_LLVM_TARGETS=(
@@ -28,12 +31,12 @@ ALL_LLVM_TARGETS=(
ALL_LLVM_TARGETS=( "${ALL_LLVM_TARGETS[@]/#/llvm_targets_}" )
LLVM_TARGET_USEDEPS="${ALL_LLVM_TARGETS[@]}"
-LLVM_MAX_SLOT=11
+LLVM_MAX_SLOT=12
RDEPEND="
sys-devel/clang:${LLVM_MAX_SLOT}
- >=sys-devel/lld-11.0.0
- <sys-devel/lld-12.0.0
+ >=sys-devel/lld-12.0.0
+ <sys-devel/lld-13.0.0
sys-devel/llvm:${LLVM_MAX_SLOT}
!experimental? ( sys-devel/llvm:${LLVM_MAX_SLOT}[${LLVM_TARGET_USEDEPS// /,}] )
"
@@ -50,3 +53,8 @@ src_configure() {
)
cmake_src_configure
}
+
+src_test() {
+ cd "${BUILD_DIR}"
+ ./zig build test || die
+}
diff --git a/dev-lang/zig/zig-9999.ebuild b/dev-lang/zig/zig-9999.ebuild
index 063604d4ceb..b33c67c5132 100644
--- a/dev-lang/zig/zig-9999.ebuild
+++ b/dev-lang/zig/zig-9999.ebuild
@@ -9,7 +9,8 @@ DESCRIPTION="A robust, optimal, and maintainable programming language"
HOMEPAGE="https://ziglang.org/"
LICENSE="MIT"
SLOT="0"
-IUSE="+experimental"
+IUSE="+experimental test"
+RESTRICT="!test? ( test )"
if [[ ${PV} == 9999 ]]; then
EGIT_REPO_URI="https://github.com/ziglang/zig.git"
@@ -19,6 +20,8 @@ else
KEYWORDS="~amd64"
fi
+BUILD_DIR="${S}/build"
+
# According to zig's author, zig builds that do not support all targets are not
# supported by the upstream project.
ALL_LLVM_TARGETS=(
@@ -28,12 +31,12 @@ ALL_LLVM_TARGETS=(
ALL_LLVM_TARGETS=( "${ALL_LLVM_TARGETS[@]/#/llvm_targets_}" )
LLVM_TARGET_USEDEPS="${ALL_LLVM_TARGETS[@]}"
-LLVM_MAX_SLOT=11
+LLVM_MAX_SLOT=12
RDEPEND="
sys-devel/clang:${LLVM_MAX_SLOT}
- >=sys-devel/lld-11.0.0
- <sys-devel/lld-12.0.0
+ >=sys-devel/lld-12.0.0
+ <sys-devel/lld-13.0.0
sys-devel/llvm:${LLVM_MAX_SLOT}
!experimental? ( sys-devel/llvm:${LLVM_MAX_SLOT}[${LLVM_TARGET_USEDEPS// /,}] )
"
@@ -50,3 +53,8 @@ src_configure() {
)
cmake_src_configure
}
+
+src_test() {
+ cd "${BUILD_DIR}"
+ ./zig build test || die
+}
^ permalink raw reply related [flat|nested] 72+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-lang/zig/
@ 2021-07-03 15:46 Joonas Niilola
0 siblings, 0 replies; 72+ messages in thread
From: Joonas Niilola @ 2021-07-03 15:46 UTC (permalink / raw
To: gentoo-commits
commit: 9cd7a519ad961a6b4ddaa85c9abc59059a2c997e
Author: Joonas Niilola <juippis <AT> gentoo <DOT> org>
AuthorDate: Sat Jul 3 15:40:59 2021 +0000
Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Sat Jul 3 15:40:59 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9cd7a519
dev-lang/zig: add missing dies
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>
dev-lang/zig/zig-0.7.1.ebuild | 2 +-
dev-lang/zig/zig-0.8.0.ebuild | 2 +-
dev-lang/zig/zig-9999.ebuild | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/dev-lang/zig/zig-0.7.1.ebuild b/dev-lang/zig/zig-0.7.1.ebuild
index 18ac8c97dc0..d775cde187a 100644
--- a/dev-lang/zig/zig-0.7.1.ebuild
+++ b/dev-lang/zig/zig-0.7.1.ebuild
@@ -55,6 +55,6 @@ src_configure() {
}
src_test() {
- cd "${BUILD_DIR}"
+ cd "${BUILD_DIR}" || die
./zig build test || die
}
diff --git a/dev-lang/zig/zig-0.8.0.ebuild b/dev-lang/zig/zig-0.8.0.ebuild
index b33c67c5132..3a6741c72cd 100644
--- a/dev-lang/zig/zig-0.8.0.ebuild
+++ b/dev-lang/zig/zig-0.8.0.ebuild
@@ -55,6 +55,6 @@ src_configure() {
}
src_test() {
- cd "${BUILD_DIR}"
+ cd "${BUILD_DIR}" || die
./zig build test || die
}
diff --git a/dev-lang/zig/zig-9999.ebuild b/dev-lang/zig/zig-9999.ebuild
index b33c67c5132..3a6741c72cd 100644
--- a/dev-lang/zig/zig-9999.ebuild
+++ b/dev-lang/zig/zig-9999.ebuild
@@ -55,6 +55,6 @@ src_configure() {
}
src_test() {
- cd "${BUILD_DIR}"
+ cd "${BUILD_DIR}" || die
./zig build test || die
}
^ permalink raw reply related [flat|nested] 72+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-lang/zig/
@ 2021-03-06 12:25 Michał Górny
0 siblings, 0 replies; 72+ messages in thread
From: Michał Górny @ 2021-03-06 12:25 UTC (permalink / raw
To: gentoo-commits
commit: 94c592547c3432b88b98b3c6401ace18c56ca88d
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sat Mar 6 12:10:35 2021 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sat Mar 6 12:24:58 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=94c59254
dev-lang/zig: Remove old
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
dev-lang/zig/Manifest | 1 -
dev-lang/zig/zig-0.5.0.ebuild | 61 -------------------------------------------
2 files changed, 62 deletions(-)
diff --git a/dev-lang/zig/Manifest b/dev-lang/zig/Manifest
index fb74e7a263d..54f58f160a2 100644
--- a/dev-lang/zig/Manifest
+++ b/dev-lang/zig/Manifest
@@ -1,2 +1 @@
-DIST zig-0.5.0.tar.gz 15743912 BLAKE2B 1a28dffebc24200cf51e1d94ff7203c8de5641e1a299eff58e808a5a8f3257fc8ff771699a0f90733702b90e5536990adc5bf41b973b4ea642081ef788f7a83d SHA512 9fc2ef827421e54e8db98ce3474ba3bbe9119b0b9aa30b4edd78d73277d2384067b5c78f4ebbca350a97ac230131e7f71e6d54c1e75fc74e1833ce6c51c402df
DIST zig-0.7.1.tar.gz 16082917 BLAKE2B 401bb079f2d0e2ad26837940e3b79c14237a492bd0b4df616f91b8b454ebd4ac3de36b2c988369c9eaaf7c2df4f95d4b1bb97760629f813ac8c7220e9542e12b SHA512 ad0b36f7b40481aca03940adfd42d34a724922993fc29a23a80412dc087ca6ce4876a400dc9bb7da455564521a88ea205c218988759ff6c56251a08232bfa41a
diff --git a/dev-lang/zig/zig-0.5.0.ebuild b/dev-lang/zig/zig-0.5.0.ebuild
deleted file mode 100644
index 223f162cfd9..00000000000
--- a/dev-lang/zig/zig-0.5.0.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake llvm
-
-DESCRIPTION="A robust, optimal, and maintainable programming language"
-HOMEPAGE="https://ziglang.org/"
-LICENSE="MIT"
-SLOT="0"
-IUSE="+experimental"
-
-if [[ ${PV} == 9999 ]]; then
- EGIT_REPO_URI="https://github.com/ziglang/zig.git"
- inherit git-r3
-else
- SRC_URI="https://github.com/ziglang/zig/archive/${PV}.tar.gz -> ${P}.tar.gz"
- KEYWORDS="~amd64"
-fi
-
-ALL_LLVM_TARGETS=( AArch64 AMDGPU ARM BPF Hexagon Lanai Mips MSP430 NVPTX
- PowerPC Sparc SystemZ WebAssembly X86 XCore )
-ALL_LLVM_TARGETS=( "${ALL_LLVM_TARGETS[@]/#/llvm_targets_}" )
-# According to zig's author, zig builds that do not support all targets are not
-# supported by the upstream project.
-LLVM_TARGET_USEDEPS=${ALL_LLVM_TARGETS[@]}
-
-RDEPEND="
- sys-devel/llvm:9
- !experimental? ( sys-devel/llvm:9[${LLVM_TARGET_USEDEPS// /,}] )
- sys-devel/clang:9
-"
-
-DEPEND="${RDEPEND}"
-
-LLVM_MAX_SLOT=9
-
-llvm_check_deps() {
- has_version "sys-devel/clang:${LLVM_SLOT}"
-}
-
-src_prepare() {
- if use experimental; then
- sed -i '/^NEED_TARGET(/d' cmake/Findllvm.cmake || die "unable to modify cmake/Findllvm.cmake"
- fi
-
- sed -i 's/--prefix "${CMAKE_INSTALL_PREFIX}"/--prefix ".\/${CMAKE_INSTALL_PREFIX}"/' CMakeLists.txt || \
- die "unable to fix install path"
-
- cmake_src_prepare
-}
-
-src_configure() {
- local mycmakeargs=(
- -DCLANG_INCLUDE_DIRS="$(llvm-config --includedir)"
- -DCLANG_LIBDIRS="$(llvm-config --libdir)"
- )
-
- cmake_src_configure
-}
^ permalink raw reply related [flat|nested] 72+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-lang/zig/
@ 2021-03-04 17:42 Joonas Niilola
0 siblings, 0 replies; 72+ messages in thread
From: Joonas Niilola @ 2021-03-04 17:42 UTC (permalink / raw
To: gentoo-commits
commit: 41ff4d6bedc52f042d13e3e4ab34ee519f2a1baf
Author: Aisha Tammy <gentoo <AT> aisha <DOT> cc>
AuthorDate: Mon Feb 22 22:54:50 2021 +0000
Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Thu Mar 4 17:42:33 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=41ff4d6b
dev-lang/zig: version bump to 0.7.1
Package-Manager: Portage-3.0.14, Repoman-3.0.2
Signed-off-by: Aisha Tammy <gentoo <AT> aisha.cc>
Closes: https://github.com/gentoo/gentoo/pull/19606
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>
dev-lang/zig/Manifest | 1 +
dev-lang/zig/metadata.xml | 9 ++++-
dev-lang/zig/{zig-9999.ebuild => zig-0.7.1.ebuild} | 41 +++++++++-------------
dev-lang/zig/zig-9999.ebuild | 41 +++++++++-------------
4 files changed, 41 insertions(+), 51 deletions(-)
diff --git a/dev-lang/zig/Manifest b/dev-lang/zig/Manifest
index 681529cf54a..fb74e7a263d 100644
--- a/dev-lang/zig/Manifest
+++ b/dev-lang/zig/Manifest
@@ -1 +1,2 @@
DIST zig-0.5.0.tar.gz 15743912 BLAKE2B 1a28dffebc24200cf51e1d94ff7203c8de5641e1a299eff58e808a5a8f3257fc8ff771699a0f90733702b90e5536990adc5bf41b973b4ea642081ef788f7a83d SHA512 9fc2ef827421e54e8db98ce3474ba3bbe9119b0b9aa30b4edd78d73277d2384067b5c78f4ebbca350a97ac230131e7f71e6d54c1e75fc74e1833ce6c51c402df
+DIST zig-0.7.1.tar.gz 16082917 BLAKE2B 401bb079f2d0e2ad26837940e3b79c14237a492bd0b4df616f91b8b454ebd4ac3de36b2c988369c9eaaf7c2df4f95d4b1bb97760629f813ac8c7220e9542e12b SHA512 ad0b36f7b40481aca03940adfd42d34a724922993fc29a23a80412dc087ca6ce4876a400dc9bb7da455564521a88ea205c218988759ff6c56251a08232bfa41a
diff --git a/dev-lang/zig/metadata.xml b/dev-lang/zig/metadata.xml
index 486ff3e79f0..bd080b506d5 100644
--- a/dev-lang/zig/metadata.xml
+++ b/dev-lang/zig/metadata.xml
@@ -1,7 +1,14 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <!-- maintainer-needed -->
+ <maintainer type="person">
+ <email>gentoo@aisha.cc</email>
+ <name>Aisha Tammy</name>
+ </maintainer>
+ <maintainer type="project">
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+ </maintainer>
<use>
<flag name="experimental">Enable builds that do not support all of LLVM's target architectures</flag>
</use>
diff --git a/dev-lang/zig/zig-9999.ebuild b/dev-lang/zig/zig-0.7.1.ebuild
similarity index 52%
copy from dev-lang/zig/zig-9999.ebuild
copy to dev-lang/zig/zig-0.7.1.ebuild
index 223f162cfd9..063604d4ceb 100644
--- a/dev-lang/zig/zig-9999.ebuild
+++ b/dev-lang/zig/zig-0.7.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2019-2020 Gentoo Authors
+# Copyright 2019-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -19,43 +19,34 @@ else
KEYWORDS="~amd64"
fi
-ALL_LLVM_TARGETS=( AArch64 AMDGPU ARM BPF Hexagon Lanai Mips MSP430 NVPTX
- PowerPC Sparc SystemZ WebAssembly X86 XCore )
-ALL_LLVM_TARGETS=( "${ALL_LLVM_TARGETS[@]/#/llvm_targets_}" )
# According to zig's author, zig builds that do not support all targets are not
# supported by the upstream project.
-LLVM_TARGET_USEDEPS=${ALL_LLVM_TARGETS[@]}
+ALL_LLVM_TARGETS=(
+ AArch64 AMDGPU ARM AVR BPF Hexagon Lanai Mips MSP430 NVPTX
+ PowerPC RISCV Sparc SystemZ WebAssembly X86 XCore
+)
+ALL_LLVM_TARGETS=( "${ALL_LLVM_TARGETS[@]/#/llvm_targets_}" )
+LLVM_TARGET_USEDEPS="${ALL_LLVM_TARGETS[@]}"
+
+LLVM_MAX_SLOT=11
RDEPEND="
- sys-devel/llvm:9
- !experimental? ( sys-devel/llvm:9[${LLVM_TARGET_USEDEPS// /,}] )
- sys-devel/clang:9
+ sys-devel/clang:${LLVM_MAX_SLOT}
+ >=sys-devel/lld-11.0.0
+ <sys-devel/lld-12.0.0
+ sys-devel/llvm:${LLVM_MAX_SLOT}
+ !experimental? ( sys-devel/llvm:${LLVM_MAX_SLOT}[${LLVM_TARGET_USEDEPS// /,}] )
"
-
DEPEND="${RDEPEND}"
-LLVM_MAX_SLOT=9
-
llvm_check_deps() {
has_version "sys-devel/clang:${LLVM_SLOT}"
}
-src_prepare() {
- if use experimental; then
- sed -i '/^NEED_TARGET(/d' cmake/Findllvm.cmake || die "unable to modify cmake/Findllvm.cmake"
- fi
-
- sed -i 's/--prefix "${CMAKE_INSTALL_PREFIX}"/--prefix ".\/${CMAKE_INSTALL_PREFIX}"/' CMakeLists.txt || \
- die "unable to fix install path"
-
- cmake_src_prepare
-}
-
src_configure() {
local mycmakeargs=(
- -DCLANG_INCLUDE_DIRS="$(llvm-config --includedir)"
- -DCLANG_LIBDIRS="$(llvm-config --libdir)"
+ -DZIG_USE_CCACHE=OFF
+ -DZIG_PREFER_CLANG_CPP_DYLIB=ON
)
-
cmake_src_configure
}
diff --git a/dev-lang/zig/zig-9999.ebuild b/dev-lang/zig/zig-9999.ebuild
index 223f162cfd9..063604d4ceb 100644
--- a/dev-lang/zig/zig-9999.ebuild
+++ b/dev-lang/zig/zig-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2019-2020 Gentoo Authors
+# Copyright 2019-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -19,43 +19,34 @@ else
KEYWORDS="~amd64"
fi
-ALL_LLVM_TARGETS=( AArch64 AMDGPU ARM BPF Hexagon Lanai Mips MSP430 NVPTX
- PowerPC Sparc SystemZ WebAssembly X86 XCore )
-ALL_LLVM_TARGETS=( "${ALL_LLVM_TARGETS[@]/#/llvm_targets_}" )
# According to zig's author, zig builds that do not support all targets are not
# supported by the upstream project.
-LLVM_TARGET_USEDEPS=${ALL_LLVM_TARGETS[@]}
+ALL_LLVM_TARGETS=(
+ AArch64 AMDGPU ARM AVR BPF Hexagon Lanai Mips MSP430 NVPTX
+ PowerPC RISCV Sparc SystemZ WebAssembly X86 XCore
+)
+ALL_LLVM_TARGETS=( "${ALL_LLVM_TARGETS[@]/#/llvm_targets_}" )
+LLVM_TARGET_USEDEPS="${ALL_LLVM_TARGETS[@]}"
+
+LLVM_MAX_SLOT=11
RDEPEND="
- sys-devel/llvm:9
- !experimental? ( sys-devel/llvm:9[${LLVM_TARGET_USEDEPS// /,}] )
- sys-devel/clang:9
+ sys-devel/clang:${LLVM_MAX_SLOT}
+ >=sys-devel/lld-11.0.0
+ <sys-devel/lld-12.0.0
+ sys-devel/llvm:${LLVM_MAX_SLOT}
+ !experimental? ( sys-devel/llvm:${LLVM_MAX_SLOT}[${LLVM_TARGET_USEDEPS// /,}] )
"
-
DEPEND="${RDEPEND}"
-LLVM_MAX_SLOT=9
-
llvm_check_deps() {
has_version "sys-devel/clang:${LLVM_SLOT}"
}
-src_prepare() {
- if use experimental; then
- sed -i '/^NEED_TARGET(/d' cmake/Findllvm.cmake || die "unable to modify cmake/Findllvm.cmake"
- fi
-
- sed -i 's/--prefix "${CMAKE_INSTALL_PREFIX}"/--prefix ".\/${CMAKE_INSTALL_PREFIX}"/' CMakeLists.txt || \
- die "unable to fix install path"
-
- cmake_src_prepare
-}
-
src_configure() {
local mycmakeargs=(
- -DCLANG_INCLUDE_DIRS="$(llvm-config --includedir)"
- -DCLANG_LIBDIRS="$(llvm-config --libdir)"
+ -DZIG_USE_CCACHE=OFF
+ -DZIG_PREFER_CLANG_CPP_DYLIB=ON
)
-
cmake_src_configure
}
^ permalink raw reply related [flat|nested] 72+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-lang/zig/
@ 2021-01-04 2:10 Matt Turner
0 siblings, 0 replies; 72+ messages in thread
From: Matt Turner @ 2021-01-04 2:10 UTC (permalink / raw
To: gentoo-commits
commit: 0f57068d8fc8ac70eff03d22f45d7642ebbb19be
Author: Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Sat Jan 2 23:27:28 2021 +0000
Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Mon Jan 4 02:10:22 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0f57068d
dev-lang/zig: Drop to maintainer-needed@
Multiple open bugs on the package; maintainer has not committed in 15
months and has no bugzilla activity in a year.
Closes: https://bugs.gentoo.org/691582
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>
Closes: https://github.com/gentoo/gentoo/pull/18920
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>
dev-lang/zig/metadata.xml | 9 +--------
1 file changed, 1 insertion(+), 8 deletions(-)
diff --git a/dev-lang/zig/metadata.xml b/dev-lang/zig/metadata.xml
index 514f150afb0..486ff3e79f0 100644
--- a/dev-lang/zig/metadata.xml
+++ b/dev-lang/zig/metadata.xml
@@ -1,14 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer type="person">
- <email>n@nirf.de</email>
- <name>Nick Erdmann</name>
- </maintainer>
- <maintainer type="project">
- <email>proxy-maint@gentoo.org</email>
- <name>Proxy Maintainers</name>
- </maintainer>
+ <!-- maintainer-needed -->
<use>
<flag name="experimental">Enable builds that do not support all of LLVM's target architectures</flag>
</use>
^ permalink raw reply related [flat|nested] 72+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-lang/zig/
@ 2020-01-06 12:23 Andreas Sturmlechner
0 siblings, 0 replies; 72+ messages in thread
From: Andreas Sturmlechner @ 2020-01-06 12:23 UTC (permalink / raw
To: gentoo-commits
commit: 0a2f7dda89a2ee2092cbcbf62a88976f409ab217
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Mon Jan 6 10:53:05 2020 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon Jan 6 12:23:31 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0a2f7dda
dev-lang/zig: Switch to cmake.eclass
Package-Manager: Portage-2.3.84, Repoman-2.3.20
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
dev-lang/zig/zig-0.5.0.ebuild | 8 ++++----
dev-lang/zig/zig-9999.ebuild | 8 ++++----
2 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/dev-lang/zig/zig-0.5.0.ebuild b/dev-lang/zig/zig-0.5.0.ebuild
index 7189e4ddc62..223f162cfd9 100644
--- a/dev-lang/zig/zig-0.5.0.ebuild
+++ b/dev-lang/zig/zig-0.5.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 2019 Gentoo Authors
+# Copyright 2019-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
-inherit cmake-utils llvm
+inherit cmake llvm
DESCRIPTION="A robust, optimal, and maintainable programming language"
HOMEPAGE="https://ziglang.org/"
@@ -48,7 +48,7 @@ src_prepare() {
sed -i 's/--prefix "${CMAKE_INSTALL_PREFIX}"/--prefix ".\/${CMAKE_INSTALL_PREFIX}"/' CMakeLists.txt || \
die "unable to fix install path"
- cmake-utils_src_prepare
+ cmake_src_prepare
}
src_configure() {
@@ -57,5 +57,5 @@ src_configure() {
-DCLANG_LIBDIRS="$(llvm-config --libdir)"
)
- cmake-utils_src_configure
+ cmake_src_configure
}
diff --git a/dev-lang/zig/zig-9999.ebuild b/dev-lang/zig/zig-9999.ebuild
index 7189e4ddc62..223f162cfd9 100644
--- a/dev-lang/zig/zig-9999.ebuild
+++ b/dev-lang/zig/zig-9999.ebuild
@@ -1,9 +1,9 @@
-# Copyright 2019 Gentoo Authors
+# Copyright 2019-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
-inherit cmake-utils llvm
+inherit cmake llvm
DESCRIPTION="A robust, optimal, and maintainable programming language"
HOMEPAGE="https://ziglang.org/"
@@ -48,7 +48,7 @@ src_prepare() {
sed -i 's/--prefix "${CMAKE_INSTALL_PREFIX}"/--prefix ".\/${CMAKE_INSTALL_PREFIX}"/' CMakeLists.txt || \
die "unable to fix install path"
- cmake-utils_src_prepare
+ cmake_src_prepare
}
src_configure() {
@@ -57,5 +57,5 @@ src_configure() {
-DCLANG_LIBDIRS="$(llvm-config --libdir)"
)
- cmake-utils_src_configure
+ cmake_src_configure
}
^ permalink raw reply related [flat|nested] 72+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-lang/zig/
@ 2019-10-01 6:14 Joonas Niilola
0 siblings, 0 replies; 72+ messages in thread
From: Joonas Niilola @ 2019-10-01 6:14 UTC (permalink / raw
To: gentoo-commits
commit: d9e4c6fa5bdc0c29bec7f02d47e51e5a782efa3e
Author: Nick Erdmann <n <AT> nirf <DOT> de>
AuthorDate: Fri Sep 27 06:05:26 2019 +0000
Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Tue Oct 1 06:14:02 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d9e4c6fa
dev-lang/zig: bump to 0.5.0
Signed-off-by: Nick Erdmann <n <AT> nirf.de>
Closes: https://github.com/gentoo/gentoo/pull/13107
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>
dev-lang/zig/Manifest | 1 +
dev-lang/zig/zig-0.5.0.ebuild | 61 +++++++++++++++++++++++++++++++++++++++++++
2 files changed, 62 insertions(+)
diff --git a/dev-lang/zig/Manifest b/dev-lang/zig/Manifest
index d5a4c7c3d61..a3f8c62566b 100644
--- a/dev-lang/zig/Manifest
+++ b/dev-lang/zig/Manifest
@@ -1 +1,2 @@
DIST zig-0.4.0.tar.gz 8924757 BLAKE2B 5ca3377f205694ff02360900b49eee7347cdf1cdaef90f1be071eff2610425ed453dfb35928fbe65b25f151b7153ab838c887d362ed3cd746f07833ae42510fd SHA512 423915730bc4ae9a67db3731a96471467826d16e59b87b3541f3e8ed2436f941939f22ccbebdb9a958a195b05360eb65f5be1658b32a01cc8db55c6e581eb039
+DIST zig-0.5.0.tar.gz 15743912 BLAKE2B 1a28dffebc24200cf51e1d94ff7203c8de5641e1a299eff58e808a5a8f3257fc8ff771699a0f90733702b90e5536990adc5bf41b973b4ea642081ef788f7a83d SHA512 9fc2ef827421e54e8db98ce3474ba3bbe9119b0b9aa30b4edd78d73277d2384067b5c78f4ebbca350a97ac230131e7f71e6d54c1e75fc74e1833ce6c51c402df
diff --git a/dev-lang/zig/zig-0.5.0.ebuild b/dev-lang/zig/zig-0.5.0.ebuild
new file mode 100644
index 00000000000..7189e4ddc62
--- /dev/null
+++ b/dev-lang/zig/zig-0.5.0.ebuild
@@ -0,0 +1,61 @@
+# Copyright 2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake-utils llvm
+
+DESCRIPTION="A robust, optimal, and maintainable programming language"
+HOMEPAGE="https://ziglang.org/"
+LICENSE="MIT"
+SLOT="0"
+IUSE="+experimental"
+
+if [[ ${PV} == 9999 ]]; then
+ EGIT_REPO_URI="https://github.com/ziglang/zig.git"
+ inherit git-r3
+else
+ SRC_URI="https://github.com/ziglang/zig/archive/${PV}.tar.gz -> ${P}.tar.gz"
+ KEYWORDS="~amd64"
+fi
+
+ALL_LLVM_TARGETS=( AArch64 AMDGPU ARM BPF Hexagon Lanai Mips MSP430 NVPTX
+ PowerPC Sparc SystemZ WebAssembly X86 XCore )
+ALL_LLVM_TARGETS=( "${ALL_LLVM_TARGETS[@]/#/llvm_targets_}" )
+# According to zig's author, zig builds that do not support all targets are not
+# supported by the upstream project.
+LLVM_TARGET_USEDEPS=${ALL_LLVM_TARGETS[@]}
+
+RDEPEND="
+ sys-devel/llvm:9
+ !experimental? ( sys-devel/llvm:9[${LLVM_TARGET_USEDEPS// /,}] )
+ sys-devel/clang:9
+"
+
+DEPEND="${RDEPEND}"
+
+LLVM_MAX_SLOT=9
+
+llvm_check_deps() {
+ has_version "sys-devel/clang:${LLVM_SLOT}"
+}
+
+src_prepare() {
+ if use experimental; then
+ sed -i '/^NEED_TARGET(/d' cmake/Findllvm.cmake || die "unable to modify cmake/Findllvm.cmake"
+ fi
+
+ sed -i 's/--prefix "${CMAKE_INSTALL_PREFIX}"/--prefix ".\/${CMAKE_INSTALL_PREFIX}"/' CMakeLists.txt || \
+ die "unable to fix install path"
+
+ cmake-utils_src_prepare
+}
+
+src_configure() {
+ local mycmakeargs=(
+ -DCLANG_INCLUDE_DIRS="$(llvm-config --includedir)"
+ -DCLANG_LIBDIRS="$(llvm-config --libdir)"
+ )
+
+ cmake-utils_src_configure
+}
^ permalink raw reply related [flat|nested] 72+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-lang/zig/
@ 2019-09-20 16:18 Joonas Niilola
0 siblings, 0 replies; 72+ messages in thread
From: Joonas Niilola @ 2019-09-20 16:18 UTC (permalink / raw
To: gentoo-commits
commit: 197fbe7ff1c6b45cf3816ae3c30fbe4cd03e4086
Author: Nick Erdmann <n <AT> nirf <DOT> de>
AuthorDate: Fri Sep 20 14:04:57 2019 +0000
Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Fri Sep 20 15:59:45 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=197fbe7f
dev-lang/zig: require llvm 9
Signed-off-by: Nick Erdmann <n <AT> nirf.de>
Closes: https://github.com/gentoo/gentoo/pull/12979
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>
dev-lang/zig/zig-9999.ebuild | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/dev-lang/zig/zig-9999.ebuild b/dev-lang/zig/zig-9999.ebuild
index 055f1f17b8a..7189e4ddc62 100644
--- a/dev-lang/zig/zig-9999.ebuild
+++ b/dev-lang/zig/zig-9999.ebuild
@@ -27,14 +27,14 @@ ALL_LLVM_TARGETS=( "${ALL_LLVM_TARGETS[@]/#/llvm_targets_}" )
LLVM_TARGET_USEDEPS=${ALL_LLVM_TARGETS[@]}
RDEPEND="
- sys-devel/llvm:8
- !experimental? ( sys-devel/llvm:8[${LLVM_TARGET_USEDEPS// /,}] )
- sys-devel/clang:8
+ sys-devel/llvm:9
+ !experimental? ( sys-devel/llvm:9[${LLVM_TARGET_USEDEPS// /,}] )
+ sys-devel/clang:9
"
DEPEND="${RDEPEND}"
-LLVM_MAX_SLOT=8
+LLVM_MAX_SLOT=9
llvm_check_deps() {
has_version "sys-devel/clang:${LLVM_SLOT}"
^ permalink raw reply related [flat|nested] 72+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-lang/zig/
@ 2019-09-08 15:59 Joonas Niilola
0 siblings, 0 replies; 72+ messages in thread
From: Joonas Niilola @ 2019-09-08 15:59 UTC (permalink / raw
To: gentoo-commits
commit: 220ace90a4fdcec12c40466284e4a4bb3e01fd10
Author: Nick Erdmann <n <AT> nirf <DOT> de>
AuthorDate: Fri Aug 2 14:59:01 2019 +0000
Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Sun Sep 8 15:59:35 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=220ace90
dev-lang/zig: add version 9999
Signed-off-by: Nick Erdmann <n <AT> nirf.de>
Closes: https://github.com/gentoo/gentoo/pull/12599
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>
dev-lang/zig/zig-9999.ebuild | 61 ++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 61 insertions(+)
diff --git a/dev-lang/zig/zig-9999.ebuild b/dev-lang/zig/zig-9999.ebuild
new file mode 100644
index 00000000000..055f1f17b8a
--- /dev/null
+++ b/dev-lang/zig/zig-9999.ebuild
@@ -0,0 +1,61 @@
+# Copyright 2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake-utils llvm
+
+DESCRIPTION="A robust, optimal, and maintainable programming language"
+HOMEPAGE="https://ziglang.org/"
+LICENSE="MIT"
+SLOT="0"
+IUSE="+experimental"
+
+if [[ ${PV} == 9999 ]]; then
+ EGIT_REPO_URI="https://github.com/ziglang/zig.git"
+ inherit git-r3
+else
+ SRC_URI="https://github.com/ziglang/zig/archive/${PV}.tar.gz -> ${P}.tar.gz"
+ KEYWORDS="~amd64"
+fi
+
+ALL_LLVM_TARGETS=( AArch64 AMDGPU ARM BPF Hexagon Lanai Mips MSP430 NVPTX
+ PowerPC Sparc SystemZ WebAssembly X86 XCore )
+ALL_LLVM_TARGETS=( "${ALL_LLVM_TARGETS[@]/#/llvm_targets_}" )
+# According to zig's author, zig builds that do not support all targets are not
+# supported by the upstream project.
+LLVM_TARGET_USEDEPS=${ALL_LLVM_TARGETS[@]}
+
+RDEPEND="
+ sys-devel/llvm:8
+ !experimental? ( sys-devel/llvm:8[${LLVM_TARGET_USEDEPS// /,}] )
+ sys-devel/clang:8
+"
+
+DEPEND="${RDEPEND}"
+
+LLVM_MAX_SLOT=8
+
+llvm_check_deps() {
+ has_version "sys-devel/clang:${LLVM_SLOT}"
+}
+
+src_prepare() {
+ if use experimental; then
+ sed -i '/^NEED_TARGET(/d' cmake/Findllvm.cmake || die "unable to modify cmake/Findllvm.cmake"
+ fi
+
+ sed -i 's/--prefix "${CMAKE_INSTALL_PREFIX}"/--prefix ".\/${CMAKE_INSTALL_PREFIX}"/' CMakeLists.txt || \
+ die "unable to fix install path"
+
+ cmake-utils_src_prepare
+}
+
+src_configure() {
+ local mycmakeargs=(
+ -DCLANG_INCLUDE_DIRS="$(llvm-config --includedir)"
+ -DCLANG_LIBDIRS="$(llvm-config --libdir)"
+ )
+
+ cmake-utils_src_configure
+}
^ permalink raw reply related [flat|nested] 72+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-lang/zig/
@ 2019-08-07 18:28 Joonas Niilola
0 siblings, 0 replies; 72+ messages in thread
From: Joonas Niilola @ 2019-08-07 18:28 UTC (permalink / raw
To: gentoo-commits
commit: 29888e3202978f866bd0f2494711d2defd2290ed
Author: Nick Erdmann <n <AT> nirf <DOT> de>
AuthorDate: Sat Aug 3 15:07:53 2019 +0000
Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Wed Aug 7 18:28:16 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=29888e32
dev-lang/zig: remove zig-0.4.0.ebuild
Signed-off-by: Nick Erdmann <n <AT> nirf.de>
Closes: https://github.com/gentoo/gentoo/pull/12606
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>
dev-lang/zig/zig-0.4.0-r1.ebuild | 2 ++
dev-lang/zig/zig-0.4.0.ebuild | 56 ----------------------------------------
2 files changed, 2 insertions(+), 56 deletions(-)
diff --git a/dev-lang/zig/zig-0.4.0-r1.ebuild b/dev-lang/zig/zig-0.4.0-r1.ebuild
index de7dd259a3d..bedd9d7ba9b 100644
--- a/dev-lang/zig/zig-0.4.0-r1.ebuild
+++ b/dev-lang/zig/zig-0.4.0-r1.ebuild
@@ -38,6 +38,8 @@ PATCHES=(
"${FILESDIR}/zig-0.4.0-r1-suppress-warnings.patch"
)
+LLVM_MAX_SLOT=8
+
src_prepare() {
if use experimental; then
sed -i '/^NEED_TARGET(/d' cmake/Findllvm.cmake || die "unable to modify cmake/Findllvm.cmake"
diff --git a/dev-lang/zig/zig-0.4.0.ebuild b/dev-lang/zig/zig-0.4.0.ebuild
deleted file mode 100644
index 606e696a4c5..00000000000
--- a/dev-lang/zig/zig-0.4.0.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake-utils
-
-DESCRIPTION="A robust, optimal, and maintainable programming language"
-HOMEPAGE="https://ziglang.org/"
-LICENSE="MIT"
-SLOT="0"
-IUSE="+experimental"
-
-if [[ ${PV} == 9999 ]]; then
- EGIT_REPO_URI="https://github.com/ziglang/zig.git"
- inherit git-r3
-else
- SRC_URI="https://github.com/ziglang/zig/archive/${PV}.tar.gz -> ${P}.tar.gz"
- KEYWORDS="~amd64"
-fi
-
-ALL_LLVM_TARGETS=( AArch64 AMDGPU ARM BPF Hexagon Lanai Mips MSP430 NVPTX
- PowerPC Sparc SystemZ WebAssembly X86 XCore )
-ALL_LLVM_TARGETS=( "${ALL_LLVM_TARGETS[@]/#/llvm_targets_}" )
-# According to zig's author, zig builds that do not support all targets are not
-# supported by the upstream project.
-LLVM_TARGET_USEDEPS=${ALL_LLVM_TARGETS[@]}
-
-RDEPEND="
- sys-devel/llvm:8
- !experimental? ( sys-devel/llvm:8[${LLVM_TARGET_USEDEPS// /,}] )
-"
-
-DEPEND="${RDEPEND}"
-
-src_prepare() {
- if use experimental; then
- sed -i '/^NEED_TARGET(/d' cmake/Findllvm.cmake || die "unable to modify cmake/Findllvm.cmake"
- fi
-
- sed -i '/^install(TARGETS zig_cpp/d' CMakeLists.txt || die "unable to modify CMakeLists.txt"
- sed -i '/install(TARGETS embedded/d' CMakeLists.txt || die "unable to modify CMakeLists.txt"
-
- # Suppress error messages
- sed -i '/if(NOT(CMAKE_BUILD_TYPE/,/endif()/d' cmake/Findllvm.cmake || die "unable to modify cmake/Findllvm.cmake"
-
- cmake-utils_src_prepare
-}
-
-src_configure() {
- local mycmakeargs=(
- -DBUILD_SHARED_LIBS=OFF
- )
-
- cmake-utils_src_configure
-}
^ permalink raw reply related [flat|nested] 72+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-lang/zig/
@ 2019-08-02 9:07 Joonas Niilola
0 siblings, 0 replies; 72+ messages in thread
From: Joonas Niilola @ 2019-08-02 9:07 UTC (permalink / raw
To: gentoo-commits
commit: efbc7eb4725347d59e62e66403b037b17d4223b0
Author: Joonas Niilola <juippis <AT> gentoo <DOT> org>
AuthorDate: Fri Aug 2 09:07:26 2019 +0000
Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Fri Aug 2 09:07:26 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=efbc7eb4
dev-lang/zig: specify LLVM SLOT
Package-Manager: Portage-2.3.69, Repoman-2.3.16
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>
dev-lang/zig/zig-0.4.0.ebuild | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/dev-lang/zig/zig-0.4.0.ebuild b/dev-lang/zig/zig-0.4.0.ebuild
index 5edf8df8887..606e696a4c5 100644
--- a/dev-lang/zig/zig-0.4.0.ebuild
+++ b/dev-lang/zig/zig-0.4.0.ebuild
@@ -27,8 +27,8 @@ ALL_LLVM_TARGETS=( "${ALL_LLVM_TARGETS[@]/#/llvm_targets_}" )
LLVM_TARGET_USEDEPS=${ALL_LLVM_TARGETS[@]}
RDEPEND="
- =sys-devel/llvm-8*
- !experimental? ( =sys-devel/llvm-8*[${LLVM_TARGET_USEDEPS// /,}] )
+ sys-devel/llvm:8
+ !experimental? ( sys-devel/llvm:8[${LLVM_TARGET_USEDEPS// /,}] )
"
DEPEND="${RDEPEND}"
^ permalink raw reply related [flat|nested] 72+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-lang/zig/
@ 2019-08-02 8:37 Joonas Niilola
0 siblings, 0 replies; 72+ messages in thread
From: Joonas Niilola @ 2019-08-02 8:37 UTC (permalink / raw
To: gentoo-commits
commit: 01327ee8db1a1e7d88849498264988031bc4d552
Author: Nick Erdmann <n <AT> nirf <DOT> de>
AuthorDate: Sun May 26 06:22:57 2019 +0000
Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Fri Aug 2 08:37:35 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=01327ee8
dev-lang/zig: new package
Zig is an open-source programming language designed for robustness,
optimality, and maintainability.
Feature Highlights
- Manual memory management. Memory allocation failure is handled correctly.
Edge cases matter!
- Zig competes with C instead of depending on it. The Zig Standard Library
does not depend on libc.
- Small, simple language. Focus on debugging your application rather than
debugging your knowledge of your programming language.
- A fresh take on error handling that resembles what well-written C error
handling looks like, minus the boilerplate and verbosity.
- Debug mode optimizes for fast compilation time and crashing with a stack
trace when undefined behavior would happen.
- ReleaseFast mode produces heavily optimized code. What other projects call
"Link Time Optimization" Zig does automatically.
- ReleaseSafe mode produces optimized code but keeps safety checks enabled.
Disable safety checks in the bottlenecks of your code.
- Generic data structures and functions.
- Compile-time reflection and compile-time code execution. No preprocessor.
- Concurrency via coroutines. Async/await is thread-safe, non-blocking, and
makes no syscalls, and therefore available in freestanding mode. You can
multiplex coroutines onto a thread pool in userland for M:N concurrency.
- Import .h files and directly use C types, variables, and functions.
- Export functions, variables, and types for C code to depend on.
Automatically generate .h files.
- Optional type instead of null pointers.
- Order independent top level declarations.
- Friendly toward package maintainers. Reproducible build, 3-step
bootstrapping process.
- Cross-compiling is a first-class use case.
Package-Manager: portage-2.3.66
Closes: https://bugs.gentoo.org/683386
Signed-off-by: Nick Erdmann <n <AT> nirf.de>
Closes: https://github.com/gentoo/gentoo/pull/12110
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>
dev-lang/zig/Manifest | 1 +
dev-lang/zig/metadata.xml | 18 ++++++++++++++
dev-lang/zig/zig-0.4.0.ebuild | 56 +++++++++++++++++++++++++++++++++++++++++++
3 files changed, 75 insertions(+)
diff --git a/dev-lang/zig/Manifest b/dev-lang/zig/Manifest
new file mode 100644
index 00000000000..d5a4c7c3d61
--- /dev/null
+++ b/dev-lang/zig/Manifest
@@ -0,0 +1 @@
+DIST zig-0.4.0.tar.gz 8924757 BLAKE2B 5ca3377f205694ff02360900b49eee7347cdf1cdaef90f1be071eff2610425ed453dfb35928fbe65b25f151b7153ab838c887d362ed3cd746f07833ae42510fd SHA512 423915730bc4ae9a67db3731a96471467826d16e59b87b3541f3e8ed2436f941939f22ccbebdb9a958a195b05360eb65f5be1658b32a01cc8db55c6e581eb039
diff --git a/dev-lang/zig/metadata.xml b/dev-lang/zig/metadata.xml
new file mode 100644
index 00000000000..514f150afb0
--- /dev/null
+++ b/dev-lang/zig/metadata.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="person">
+ <email>n@nirf.de</email>
+ <name>Nick Erdmann</name>
+ </maintainer>
+ <maintainer type="project">
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+ </maintainer>
+ <use>
+ <flag name="experimental">Enable builds that do not support all of LLVM's target architectures</flag>
+ </use>
+ <upstream>
+ <remote-id type="github">ziglang/zig</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/dev-lang/zig/zig-0.4.0.ebuild b/dev-lang/zig/zig-0.4.0.ebuild
new file mode 100644
index 00000000000..5edf8df8887
--- /dev/null
+++ b/dev-lang/zig/zig-0.4.0.ebuild
@@ -0,0 +1,56 @@
+# Copyright 2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake-utils
+
+DESCRIPTION="A robust, optimal, and maintainable programming language"
+HOMEPAGE="https://ziglang.org/"
+LICENSE="MIT"
+SLOT="0"
+IUSE="+experimental"
+
+if [[ ${PV} == 9999 ]]; then
+ EGIT_REPO_URI="https://github.com/ziglang/zig.git"
+ inherit git-r3
+else
+ SRC_URI="https://github.com/ziglang/zig/archive/${PV}.tar.gz -> ${P}.tar.gz"
+ KEYWORDS="~amd64"
+fi
+
+ALL_LLVM_TARGETS=( AArch64 AMDGPU ARM BPF Hexagon Lanai Mips MSP430 NVPTX
+ PowerPC Sparc SystemZ WebAssembly X86 XCore )
+ALL_LLVM_TARGETS=( "${ALL_LLVM_TARGETS[@]/#/llvm_targets_}" )
+# According to zig's author, zig builds that do not support all targets are not
+# supported by the upstream project.
+LLVM_TARGET_USEDEPS=${ALL_LLVM_TARGETS[@]}
+
+RDEPEND="
+ =sys-devel/llvm-8*
+ !experimental? ( =sys-devel/llvm-8*[${LLVM_TARGET_USEDEPS// /,}] )
+"
+
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+ if use experimental; then
+ sed -i '/^NEED_TARGET(/d' cmake/Findllvm.cmake || die "unable to modify cmake/Findllvm.cmake"
+ fi
+
+ sed -i '/^install(TARGETS zig_cpp/d' CMakeLists.txt || die "unable to modify CMakeLists.txt"
+ sed -i '/install(TARGETS embedded/d' CMakeLists.txt || die "unable to modify CMakeLists.txt"
+
+ # Suppress error messages
+ sed -i '/if(NOT(CMAKE_BUILD_TYPE/,/endif()/d' cmake/Findllvm.cmake || die "unable to modify cmake/Findllvm.cmake"
+
+ cmake-utils_src_prepare
+}
+
+src_configure() {
+ local mycmakeargs=(
+ -DBUILD_SHARED_LIBS=OFF
+ )
+
+ cmake-utils_src_configure
+}
^ permalink raw reply related [flat|nested] 72+ messages in thread
end of thread, other threads:[~2025-02-17 1:52 UTC | newest]
Thread overview: 72+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-07-27 11:45 [gentoo-commits] repo/gentoo:master commit in: dev-lang/zig/ Sam James
-- strict thread matches above, loose matches on Subject: below --
2025-02-17 1:52 Sam James
2025-02-16 16:29 Sam James
2025-02-16 16:25 Sam James
2025-02-16 16:25 Sam James
2025-02-16 16:25 Sam James
2025-02-16 16:25 Sam James
2025-02-16 16:25 Sam James
2024-12-15 9:47 Sam James
2024-11-06 13:35 Sam James
2024-09-21 7:41 Michał Górny
2024-08-05 7:38 Joonas Niilola
2024-05-20 7:49 Sam James
2024-05-20 7:49 Sam James
2024-05-19 15:21 Sam James
2024-02-28 9:12 Florian Schmaus
2024-02-11 16:02 Michał Górny
2023-12-13 7:47 Florian Schmaus
2023-11-22 11:38 Sam James
2023-09-26 15:54 Sam James
2023-08-25 3:58 Jakov Smolić
2023-07-26 3:33 Sam James
2023-05-13 3:28 Sam James
2023-05-13 3:28 Sam James
2023-04-07 4:19 Michał Górny
2023-03-10 7:00 Florian Schmaus
2023-03-09 17:56 Florian Schmaus
2023-03-09 10:54 Florian Schmaus
2023-03-09 10:54 Florian Schmaus
2023-03-09 10:54 Florian Schmaus
2023-01-20 3:54 Sam James
2023-01-20 1:17 Sam James
2023-01-14 19:17 Sam James
2022-12-14 9:20 Sam James
2022-11-08 4:09 Sam James
2022-11-07 6:52 Sam James
2022-11-07 6:52 Sam James
2022-10-30 9:40 Sam James
2022-10-20 23:34 Sam James
2022-10-15 15:18 Sam James
2022-09-19 3:40 Sam James
2022-08-22 8:18 Jakov Smolić
2022-08-22 8:18 Jakov Smolić
2022-05-27 7:45 Joonas Niilola
2022-05-27 7:45 Joonas Niilola
2022-04-30 8:13 Joonas Niilola
2022-04-17 20:05 Sam James
2022-03-29 10:50 Ionen Wolkens
2022-03-29 7:20 Joonas Niilola
2022-03-28 7:51 Florian Schmaus
2022-03-28 7:50 Florian Schmaus
2022-03-08 13:17 Florian Schmaus
2021-12-25 17:27 Arthur Zamarin
2021-12-25 10:21 Sam James
2021-12-25 10:20 Sam James
2021-11-21 9:52 Michał Górny
2021-11-05 13:39 罗百科
2021-10-30 23:32 Sam James
2021-10-30 23:32 Sam James
2021-07-03 15:46 Joonas Niilola
2021-07-03 15:46 Joonas Niilola
2021-07-03 15:46 Joonas Niilola
2021-03-06 12:25 Michał Górny
2021-03-04 17:42 Joonas Niilola
2021-01-04 2:10 Matt Turner
2020-01-06 12:23 Andreas Sturmlechner
2019-10-01 6:14 Joonas Niilola
2019-09-20 16:18 Joonas Niilola
2019-09-08 15:59 Joonas Niilola
2019-08-07 18:28 Joonas Niilola
2019-08-02 9:07 Joonas Niilola
2019-08-02 8:37 Joonas Niilola
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox