Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 31 Jan 2024 05:34:48 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: 69beefcd6c22 - main - x11-wm/wlmaker: unbreak build on non-x86 architectures
Message-ID:  <202401310534.40V5YmlM051761@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=69beefcd6c22c38ec003efafe329d59481d02d70

commit 69beefcd6c22c38ec003efafe329d59481d02d70
Author:     Jan Beich <jbeich@FreeBSD.org>
AuthorDate: 2024-01-31 05:24:05 +0000
Commit:     Jan Beich <jbeich@FreeBSD.org>
CommitDate: 2024-01-31 05:33:40 +0000

    x11-wm/wlmaker: unbreak build on non-x86 architectures
    
    Upstream defines _POSIX_C_SOURCE to 1, 199309L, 200112L, 200809L in
    multiple files, all of which hide SIGTRAP on FreeBSD. Drop POSIX as
    BSD (unlike GNU) enable extensions by default.
    
    submodules/libbase/subprocess.c:496:9: error: use of undeclared identifier 'SIGTRAP'
      496 |         BS_ASSERT(rv == subprocess_ptr->pid);
          |         ^
    submodules/libbase/assert.h:45:13: note: expanded from macro 'BS_ASSERT'
       45 |             BS_ABORT();                                                 \
          |             ^
    submodules/libbase/assert.h:34:28: note: expanded from macro 'BS_ABORT'
       34 | #define BS_ABORT() { raise(SIGTRAP); }
          |                            ^
    
    PR:             276743
    Reported by:    pkg-fallout (aarch64)
---
 x11-wm/wlmaker/Makefile | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/x11-wm/wlmaker/Makefile b/x11-wm/wlmaker/Makefile
index 97d4b47a1603..f7bcf8d18d99 100644
--- a/x11-wm/wlmaker/Makefile
+++ b/x11-wm/wlmaker/Makefile
@@ -43,5 +43,8 @@ post-patch:
 		 -e 's/google-chrome/chrome/' \
 		${WRKSRC}/src/dock.c \
 		${WRKSRC}/src/${PORTNAME}.c
+# https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=276743
+	@${GREP} -Flr _POSIX_C_SOURCE ${WRKSRC} | ${XARGS} ${REINPLACE_CMD} \
+		'/_POSIX_C_SOURCE/d'
 
 .include <bsd.port.mk>



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202401310534.40V5YmlM051761>