Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 28 Apr 2023 22:35:33 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: a38806f68b44 - main - x11-wm/hyprland: pass --skip-subprojects from within ninja
Message-ID:  <202304282235.33SMZXYK071720@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=a38806f68b442ca24add4d5b554f936632e17287

commit a38806f68b442ca24add4d5b554f936632e17287
Author:     Jan Beich <jbeich@FreeBSD.org>
AuthorDate: 2023-04-28 22:18:03 +0000
Commit:     Jan Beich <jbeich@FreeBSD.org>
CommitDate: 2023-04-28 22:34:37 +0000

    x11-wm/hyprland: pass --skip-subprojects from within ninja
---
 x11-wm/hyprland/Makefile | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/x11-wm/hyprland/Makefile b/x11-wm/hyprland/Makefile
index 5969e5044697..ae1f42316f7a 100644
--- a/x11-wm/hyprland/Makefile
+++ b/x11-wm/hyprland/Makefile
@@ -60,10 +60,9 @@ post-patch:
 		${WRKSRC}/src/Compositor.cpp
 
 .ifdef GH_TUPLE
-post-install:
-# XXX USES=meson invokes ninja directly, so doesn't support --skip-subprojects
-	@${RM} -r ${STAGEDIR}${PREFIX}/share/pkgconfig
-	@${RM} -r ${STAGEDIR}${PREFIX}/share/protocols
+post-configure:
+	@${REINPLACE_CMD} 's/meson install/& \
+		--skip-subprojects/' ${BUILD_WRKSRC}/build.ninja
 .endif
 
 # XXX Drop after FreeBSD 13.2 EOL around 2024-05-01 (don't forget distinfo)



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