git: d26011888610 - main - x11-wm/hyprland: unbreak build on 15.0-PRERELEASE
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Tue, 02 Sep 2025 08:26:53 UTC
The branch main has been updated by tagattie:
URL: https://cgit.FreeBSD.org/ports/commit/?id=d26011888610b6777762df2f2f8802d196210a95
commit d26011888610b6777762df2f2f8802d196210a95
Author: Jan Beich <jbeich@FreeBSD.org>
AuthorDate: 2025-09-02 08:17:53 +0000
Commit: Hiroki Tagato <tagattie@FreeBSD.org>
CommitDate: 2025-09-02 08:26:31 +0000
x11-wm/hyprland: unbreak build on 15.0-PRERELEASE
clang with debug assertions enabled (on -CURRENT) crashes when it
tries to compile a consumer code of devel/glaze. As a workaround clang
from ports has been used on -CURRENT to avoid the error. Recent switch
of the branch name from CURRENT to PRERELEASE broke the build again.
As a new workaround we use port's llvm when base clang is built with
debug assertions enabled regardless of the branch name.
PR: 289205
Reported by: Ralph Zitz <ralph@zitz.dk>
Tested by: Ralph Zitz <ralph@zitz.dk>
---
x11-wm/hyprland/Makefile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/x11-wm/hyprland/Makefile b/x11-wm/hyprland/Makefile
index 18218c2e08be..196623dd407d 100644
--- a/x11-wm/hyprland/Makefile
+++ b/x11-wm/hyprland/Makefile
@@ -92,7 +92,7 @@ post-install:
.include <bsd.port.mk>
# XXX COMPILER_TYPE is defined after USES was already parsed
-.if "${CHOSEN_COMPILER_TYPE}-${_OSRELEASE:C/.*-//}" == "clang-CURRENT"
+.if ${CHOSEN_COMPILER_TYPE} == clang && ${_CCVERSION:M+assertions}
llvm_ARGS= build
.include "${USESDIR}/llvm.mk"
.endif