git: bf239e4ed895 - main - x11-wm/hyprland-devel: pass --skip-subprojects from within ninja

Go to: [ bottom of page ] [ top of archives ] [ this month ]

From: Jan Beich <jbeich_at_FreeBSD.org>
Date: Fri, 28 Apr 2023 22:35:34 UTC

The branch main has been updated by jbeich:

URL: https://cgit.FreeBSD.org/ports/commit/?id=bf239e4ed895b62474ee663822304308fa80f4be

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

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

diff --git a/x11-wm/hyprland-devel/Makefile b/x11-wm/hyprland-devel/Makefile
index 9506ea7eef91..59142f4c05d2 100644
--- a/x11-wm/hyprland-devel/Makefile
+++ b/x11-wm/hyprland-devel/Makefile
@@ -56,10 +56,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/hyprland-protocols
-	@${RM} -r ${STAGEDIR}${PREFIX}/share/pkgconfig
+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)