From: Volker Schlecht <openbsd-ports@schlecht.dev>
Subject: Re: Fix for wayland/river
To: yaydn@protonmail.com, "rob@lillack.net" <rob@lillack.net>, "ports@openbsd.org" <ports@openbsd.org>
Date: Sun, 5 Jul 2026 12:47:01 +0200

On 7/5/26 12:41 PM, yaydn@protonmail.com wrote:
>[...]
> ===>  Regression tests for river-0.4.5p0
> make: cannot open Makefile.
[...]
> river-0.4.5p0(wayland/river):
> Missing: pthread.28 (/usr/local/bin/river) (system lib)
> WANTLIB += pthread
> *** Error 1 in target 'port-lib-depends-check' (ignored)
Thanks for testing! Fix for both problems is attached.
Index: Makefile
===================================================================
RCS file: /cvs/ports/wayland/river/Makefile,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 Makefile
--- Makefile	14 Jun 2026 06:17:39 -0000	1.1.1.1
+++ Makefile	5 Jul 2026 10:45:29 -0000
@@ -11,6 +11,7 @@ DIST_TUPLE +=	codeberg ziglang translate
 		57c559cf581b1fcad90494eda219f98abeb155ce .
 DIST_TUPLE +=	github Vexu arocc \
 		5f5a050569a95ecc40a426f0c3666ae7ef987ede .
+REVISION =	0
 
 CATEGORIES =	wayland
 
@@ -21,6 +22,8 @@ MAINTAINER =	Rob Lillack <rob@lillack.ne
 # GPLv3
 PERMIT_PACKAGE =	Yes
 
+WANTLIB += c evdev input pixman-1 pthread wayland-server xkbcommon
+
 WRKDIST =	${WRKDIR}/river
 
 MODULES =		wayland/wlroots
@@ -38,8 +41,6 @@ LIB_DEPENDS =	wayland/libevdev-openbsd \
 		wayland/wayland \
 		x11/xkbcommon
 
-WANTLIB +=	c evdev input pixman-1 wayland-server xkbcommon
-
 # Hashes of the Zig package dependencies in build.zig.zon (and the transitive
 # aro dep pulled in by translate_c); these become the directory names under
 # ZIG_PKGDIR. Update whenever the deps in build.zig.zon are bumped.
@@ -55,17 +56,24 @@ ZIG_PKGDIR =	${WRKBUILD}/zig-packages
 MAKE_ENV +=	ZIG_GLOBAL_CACHE_DIR=${WRKBUILD}/zig-global-cache \
 		ZIG_LOCAL_CACHE_DIR=${WRKBUILD}/zig-local-cache
 
+ZIG_CPU =	${ARCH:S/amd64/x86_64/:S/arm64/generic/}
 # --system disables all network access; zig will error if a package is
 # missing from ZIG_PKGDIR instead of silently fetching it.
 ZIG_FLAGS =	--system ${ZIG_PKGDIR} \
 		--global-cache-dir ${WRKBUILD}/zig-global-cache \
 		--cache-dir ${WRKBUILD}/zig-local-cache \
+		--color off \
+		--verbose \
+		-j${MAKE_JOBS} \
+		-Dcpu=${ZIG_CPU} \
 		-Doptimize=ReleaseSafe \
 		-Dllvm=true \
 		-Dpie=true \
 		-Dxwayland=true \
 		-Dman-pages=true \
 		-Dversion-string=${V}
+
+NO_TEST =	Yes
 
 # Stage each Zig dependency under ZIG_PKGDIR keyed by its content hash, where
 # `zig build --system` expects to find them.