Date: Fri, 26 Jan 2024 08:27:41 GMT From: Jan Beich <jbeich@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: e59bd1056667 - main - x11-wm/wlmaker: unbreak non-x86 build Message-ID: <202401260827.40Q8RfDk005328@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by jbeich: URL: https://cgit.FreeBSD.org/ports/commit/?id=e59bd10566674e6030d7dc4484a0bc3976bee4b6 commit e59bd10566674e6030d7dc4484a0bc3976bee4b6 Author: Jan Beich <jbeich@FreeBSD.org> AuthorDate: 2024-01-26 01:56:31 +0000 Commit: Jan Beich <jbeich@FreeBSD.org> CommitDate: 2024-01-26 08:27:13 +0000 x11-wm/wlmaker: unbreak non-x86 build In file included from apps/primitives/segment_display.c:21: In file included from apps/primitives/segment_display.h:23: In file included from submodules/libbase/../libbase/libbase.h:25: submodules/libbase/../libbase/atomic.h:109:5: error: address argument to atomic operation must be a pointer to _Atomic type ('int32_t *' (aka 'int *') invalid) 109 | atomic_store(&a_ptr->v, v); | ^ ~~~~~~~~~ /usr/include/stdatomic.h:366:2: note: expanded from macro 'atomic_store' 366 | atomic_store_explicit(object, desired, memory_order_seq_cst) | ^ ~~~~~~ /usr/include/stdatomic.h:259:2: note: expanded from macro 'atomic_store_explicit' 259 | __c11_atomic_store(object, desired, order) | ^ ~~~~~~ Reported by: pkg-fallout --- x11-wm/wlmaker/Makefile | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/x11-wm/wlmaker/Makefile b/x11-wm/wlmaker/Makefile index bf53a1bea970..f51f053cabc6 100644 --- a/x11-wm/wlmaker/Makefile +++ b/x11-wm/wlmaker/Makefile @@ -32,6 +32,11 @@ PLIST_FILES= bin/${PORTNAME} \ share/icons/${PORTNAME}/terminal-48x48.png \ ${NULL} +.if !empty(MACHINE_ARCH:Namd64:Ni386) +# https://github.com/phkaeser/libbase/issues/7 +USE_GCC= yes +.endif + post-patch: # Drop dependency on unreleased version of libwayland @${REINPLACE_CMD} -e 's/1\.22\.90/1.22.0/' \
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202401260827.40Q8RfDk005328>