Add zig-build build style, river 0.1.0, rundird 0.2.0 #29288

ifreund · 2021-03-07T10:59:51Z

General

This is a new package and it conforms to the quality requirements

Have the results of the proposed changes been tested?

I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
I generally don't use the affected packages but briefly tested this PR

Closes #33060

ericonr · 2021-03-08T06:34:07Z

It would be nice if it could do cross :)

travankor · 2021-03-11T09:15:52Z

It would be nice if it could do cross :)

blocked on #25004 ?

hopefully, cross is not a blocker for initial packaging

ericonr · 2021-03-11T13:10:04Z

I don't think so. That PR is about cross compiling the compiler, not projects using zig...

And the template here isn't trying to pass any targets or anything, so the fix might even be a simple one.

travankor · 2021-03-11T13:39:38Z

oh woops, sorry

This is what happens when you only look at the PR title.

edit: maybe zig build -target ${XBPS_CROSS_TRIPLET} -Drelease-safe ?

common/build-style/zig-build.sh

srcpkgs/zig/template

srcpkgs/rundird/template

ifreund · 2021-06-21T21:09:22Z

2 of the patches have not yet been upstreamed, I'll be doing that shortly. As such, I'd like to hold off on merging this until they are upstreamed.

srcpkgs/rundird/files/rundird/run

common/build-style/zig-build.sh

ericonr · 2021-07-25T20:59:10Z

diff --git a/common/build-style/zig-build.sh b/common/build-style/zig-build.sh
index 69dea4ca55..8c11822b70 100644
--- a/common/build-style/zig-build.sh
+++ b/common/build-style/zig-build.sh
@@ -1,7 +1,5 @@
 do_build() {
-	local zig_abi
-	local zig_target
-	local zig_cpu
+	local zig_abi zig_target zig_cpu zig_arch
 
 	case $XBPS_TARGET_LIBC in
 		glibc) zig_abi="gnu";;
@@ -11,16 +9,18 @@ do_build() {
 
 	case $XBPS_TARGET_MACHINE in
 		aarch64*|i686*|x86_64*)
-			zig_target="${XBPS_TARGET_MACHINE%-musl}-linux-${zig_abi}" zig_cpu="baseline";;
+			zig_arch="${XBPS_TARGET_MACHINE%-musl}" zig_cpu="baseline";;
 		armv6l*) zig_target="arm-linux-${zig_abi}" zig_cpu="generic+v6";;
 		armv7l*) zig_target="arm-linux-${zig_abi}" zig_cpu="generic+v7a";;
 		ppc64le*) zig_target="powerpc64le-linux-${zig_abi}" zig_cpu="baseline";;
 		ppc64*) zig_target="powerpc64-linux-${zig_abi}" zig_cpu="baseline";;
 		ppcle*) zig_target="powerpcle-linux-${zig_abi}" zig_cpu="baseline";;
 		ppc*) zig_target="powerpc-linux-${zig_abi}" zig_cpu="baseline";;
-		*) broken="TODO: support more target machines for the zig build style";;
+		*) msg_error "TODO: support more target machines for the zig build style\n";;
 	esac
 
+	zig_target="${zig_arch}-linux-${zig_abi}"
+
 	# Inform zig of the required libc include paths.
 	cat > xbps_zig_libc.txt <<-EOF
 		include_dir=${XBPS_CROSS_BASE}/usr/include

Do for all archs what I did for x86; and broken is checked during template parsing time, not during do_build. This is "better" but still breaks builds; you need something in an environment file to set broken so XBPS doesn't error out. To avoid duplicating the logic, could create XBPS_ZIG_ABI ... and use those instead of local variables.

ifreund · 2021-07-27T01:11:56Z

Thanks for the review @ericonr! I've gone ahead and done this "properly" by defining zig target and cpu variables in the build-profiles and cross-profiles. I think this is a lot better as it makes it much easier to keep the zig target cpu features in sync with the ones used for C as the definitions are in the same file. In fact, I caught a couple of minor mistakes I had made in the previous approach this way.

This should be ready to merge from my point of view, assuming CI passes.

ericonr · 2021-08-18T22:18:26Z

common/build-style/zig-build.sh

+	if [ "$CROSS_BUILD" ]; then
+		zig_target="${XBPS_CROSS_ZIG_TARGET}"
+		zig_cpu="${XBPS_CROSS_ZIG_CPU}"
+	else
+		zig_target="${XBPS_ZIG_TARGET}"
+		zig_cpu="${XBPS_ZIG_CPU}"
+	fi


What do you think about an environment/build-style/ file that sets archs for the supported archs? This way you don't have to detect if these are set before do_build in order to trigger broken (or maybe it's the best way, since it avoids duplicating the information?).

Overall looks really good, just want to be sure of the best way of signaling when zig is unsupported.

Hmm, that seems like it might be a good idea in general but I don't think we need that for zig. Zig is theoretically able to target all of xbps's targets and I've included exhaustive support for xbps's targets in this PR.

However, support for some of the less common architectures is of course not as good and attempting to actually compile code for them may fail due to issues in the compiler and/or std. This of course depends on the exact code being compiled as well though, especially when the issues are due to stdlib deficiencies which are often easy to add temporary downstream workarounds for as the language matures.

ifreund · 2021-08-18T22:41:39Z

Just rebased onto master and fixed a typo in a comment that I just noticed.

ifreund · 2021-09-07T17:25:28Z

Zig 0.8.1 has been released with the the patches I landed to support sysroot-based cross compilation dynamically linking system libraries. Therefore we no longer need to patch zig to enable the zig-build build style and I've rebased this PR onto #32867.

subsetpark · 2021-11-10T23:48:26Z

@ifreund @ericonr are there still outstanding issues for this PR? I'd love to get River into my xbps managed packages...

ericonr · 2021-11-11T00:26:08Z

common/build-style/zig-build.sh

+		crt_dir=${XBPS_CROSS_BASE}/usr/lib
+		msvc_lib_dir=
+		kernel32_lib_dir=
+		gcc_dir=


Would it make sense to query gcc_dir from GCC itself? Would it be worth it?

according to the output of zig libc, gcc_dir is only needed when targeting haiku:

# The directory that contains `crtbeginS.o` and `crtendS.o` # Only needed when targeting Haiku. gcc_dir=

common/cross-profiles/i686.sh

srcpkgs/zig/template

ifreund · 2021-11-11T11:26:25Z

@ericonr Thanks for the review! I've enabled sse2 on i686 and split the zig package fix into a separate commit, this should now be good to go afaik.

srcpkgs/river/template

ericonr · 2021-11-13T03:49:40Z

Ok, tested both packages, seem to be working just fine. All that's missing is installing the example file and possibly a vdoc README.md in rundird, what do you think?

This commit backports one bug fix from the zig master branch which is critical for our use-case of building software for binary distribution.

We call this "zig-build" instead of just "zig" as this build-style relies on usage of the zig build system. In the future, other build systems such as meson may support zig code. Furthermore, the zig build system may be used to build C/C++ code as well, not just zig.

ifreund · 2021-11-13T11:47:40Z

Ok, tested both packages, seem to be working just fine. All that's missing is installing the example file and possibly a vdoc README.md in rundird, what do you think?

Excellent! Good call on including the example river init and rundird README.md, especially for rundird as I forgot that I never wrote a man page for that. Not that there's much that would go in a man page, the only important bit of end-user documentation is the PAM configuration.

ifreund force-pushed the rundird branch from 60fac88 to 2637207 Compare March 7, 2021 11:01

ericonr added the new-package This PR adds a new package label Mar 8, 2021

ifreund force-pushed the rundird branch from 2637207 to 2e5ca32 Compare May 24, 2021 19:07

ifreund force-pushed the rundird branch 5 times, most recently from c4dca57 to 191fd5f Compare June 10, 2021 04:31

ifreund force-pushed the rundird branch 2 times, most recently from 8544b34 to 09cc749 Compare June 17, 2021 01:49

ericonr reviewed Jun 17, 2021

View reviewed changes

ifreund force-pushed the rundird branch 3 times, most recently from 83dda10 to fb852ac Compare June 21, 2021 21:08

ifreund marked this pull request as draft June 21, 2021 21:09

ifreund force-pushed the rundird branch 2 times, most recently from 706f9dc to 9302c24 Compare June 21, 2021 21:12

ifreund mentioned this pull request Jun 22, 2021

stage2: add --sysroot link option ziglang/zig#9202

Merged

ifreund force-pushed the rundird branch from 9302c24 to c0897fe Compare June 26, 2021 11:06

ifreund marked this pull request as ready for review June 26, 2021 11:07

ifreund changed the title ~~New package: rundird-0.1.0~~ New package: rundird-0.1.1 Jun 26, 2021

ifreund changed the title ~~New package: rundird-0.1.1~~ New package: rundird-0.1.1, Add zig-build build style Jun 26, 2021

ericonr reviewed Jul 25, 2021

View reviewed changes

srcpkgs/rundird/files/rundird/run Outdated Show resolved Hide resolved

common/build-style/zig-build.sh Outdated Show resolved Hide resolved

ifreund force-pushed the rundird branch from c0897fe to 11f2c3a Compare July 27, 2021 01:02

ifreund changed the title ~~New package: rundird-0.1.1, Add zig-build build style~~ New package: rundird-0.2.0, Add zig-build build style Jul 27, 2021

ericonr reviewed Aug 18, 2021

View reviewed changes

ifreund force-pushed the rundird branch from bce949c to 217d259 Compare August 18, 2021 22:41

ifreund force-pushed the rundird branch from 217d259 to e53d744 Compare September 7, 2021 17:23

ifreund force-pushed the rundird branch from e53d744 to 2bc8f17 Compare September 15, 2021 14:50

ifreund force-pushed the rundird branch from 2bc8f17 to 5644250 Compare November 3, 2021 13:49

ifreund changed the title ~~New package: rundird-0.2.0, Add zig-build build style~~ Add zig-build build style, river 0.1.0, rundird 0.2.0 Nov 3, 2021

ifreund mentioned this pull request Nov 3, 2021

Package Request: river #33060

Closed

ifreund force-pushed the rundird branch 3 times, most recently from ab555a4 to fbe6360 Compare November 8, 2021 15:58

ericonr reviewed Nov 11, 2021

View reviewed changes

ifreund force-pushed the rundird branch 2 times, most recently from 920fa2d to 2602db1 Compare November 11, 2021 11:25

ericonr reviewed Nov 13, 2021

View reviewed changes

srcpkgs/river/template Show resolved Hide resolved

ifreund added 4 commits November 13, 2021 12:43

zig: backport an upstream bugfix

a09eca3

This commit backports one bug fix from the zig master branch which is critical for our use-case of building software for binary distribution.

New package: rundird-0.2.0

f3c37d7

New package: river-0.1.0

0cf7e95

ifreund force-pushed the rundird branch from 2602db1 to 0cf7e95 Compare November 13, 2021 11:43

ericonr merged commit fd08510 into void-linux:master Nov 13, 2021

ifreund deleted the rundird branch November 13, 2021 14:58

github-actions bot locked as resolved and limited conversation to collaborators Feb 11, 2022

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Add zig-build build style, river 0.1.0, rundird 0.2.0 #29288

Add zig-build build style, river 0.1.0, rundird 0.2.0 #29288

ifreund commented Mar 7, 2021 •

edited

Loading

ericonr commented Mar 8, 2021

travankor commented Mar 11, 2021 •

edited

Loading

ericonr commented Mar 11, 2021

travankor commented Mar 11, 2021 •

edited

Loading

ifreund commented Jun 21, 2021

ericonr commented Jul 25, 2021

ifreund commented Jul 27, 2021

ericonr Aug 18, 2021

ifreund Aug 18, 2021

ifreund commented Aug 18, 2021

ifreund commented Sep 7, 2021

subsetpark commented Nov 10, 2021

ericonr Nov 11, 2021

ifreund Nov 11, 2021

ifreund commented Nov 11, 2021

ericonr commented Nov 13, 2021

ifreund commented Nov 13, 2021

Add zig-build build style, river 0.1.0, rundird 0.2.0 #29288

Add zig-build build style, river 0.1.0, rundird 0.2.0 #29288

Conversation

ifreund commented Mar 7, 2021 • edited Loading

General

Have the results of the proposed changes been tested?

ericonr commented Mar 8, 2021

travankor commented Mar 11, 2021 • edited Loading

ericonr commented Mar 11, 2021

travankor commented Mar 11, 2021 • edited Loading

ifreund commented Jun 21, 2021

ericonr commented Jul 25, 2021

ifreund commented Jul 27, 2021

ericonr Aug 18, 2021

Choose a reason for hiding this comment

ifreund Aug 18, 2021

Choose a reason for hiding this comment

ifreund commented Aug 18, 2021

ifreund commented Sep 7, 2021

subsetpark commented Nov 10, 2021

ericonr Nov 11, 2021

Choose a reason for hiding this comment

ifreund Nov 11, 2021

Choose a reason for hiding this comment

ifreund commented Nov 11, 2021

ericonr commented Nov 13, 2021

ifreund commented Nov 13, 2021

ifreund commented Mar 7, 2021 •

edited

Loading

travankor commented Mar 11, 2021 •

edited

Loading

travankor commented Mar 11, 2021 •

edited

Loading