Date: Fri, 28 Apr 2023 22:36:24 GMT From: Jan Beich <jbeich@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org Subject: git: 3da20fb3f35d - 2023Q2 - x11-servers/xwayland-devel: pass --skip-subprojects from within ninja Message-ID: <202304282236.33SMaOiQ071982@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch 2023Q2 has been updated by jbeich: URL: https://cgit.FreeBSD.org/ports/commit/?id=3da20fb3f35d470553a1ba6fdedd642ae4ac952a commit 3da20fb3f35d470553a1ba6fdedd642ae4ac952a Author: Jan Beich <jbeich@FreeBSD.org> AuthorDate: 2023-04-28 22:14:24 +0000 Commit: Jan Beich <jbeich@FreeBSD.org> CommitDate: 2023-04-28 22:36:16 +0000 x11-servers/xwayland-devel: pass --skip-subprojects from within ninja (cherry picked from commit 2e79e158e461e50c39d1ec5ce334c4de53b65a89) --- x11-servers/xwayland-devel/Makefile | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/x11-servers/xwayland-devel/Makefile b/x11-servers/xwayland-devel/Makefile index 00e2f6b25e24..aef30b0b9c6a 100644 --- a/x11-servers/xwayland-devel/Makefile +++ b/x11-servers/xwayland-devel/Makefile @@ -80,12 +80,9 @@ NVIDIA_BUILD_DEPENDS= egl-wayland>0:graphics/egl-wayland NVIDIA_MESON_TRUE= xwayland_eglstream .ifdef GL_TUPLE -post-install: -# XXX USES=meson invokes ninja directly, so doesn't support --skip-subprojects - @${RM} -r ${STAGEDIR}${PREFIX}/include/GL - @${RM} -r ${STAGEDIR}${PREFIX}/include/X11 - @${RM} -r ${STAGEDIR}${PREFIX}/share/doc/xorgproto - @${RM} -r ${STAGEDIR}${PREFIX}/share/pkgconfig +post-configure: + @${REINPLACE_CMD} 's/meson install/& \ + --skip-subprojects/' ${BUILD_WRKSRC}/build.ninja .endif .include <bsd.port.mk>
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202304282236.33SMaOiQ071982>