From nobody Fri Apr 28 22:36:24 2023 X-Original-To: dev-commits-ports-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Q7SBd0Tsbz484Fk; Fri, 28 Apr 2023 22:36:25 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Q7SBc74tWz3mg0; Fri, 28 Apr 2023 22:36:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1682721385; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=wLxsT1m+FMZGf02XSfi1L1r/kbCtfZZMbwAz9nlEiG4=; b=a9lD88uJFJ5qFc1kkWKV/RcdO1wGPtdqZUsLKlsXiaV2QdBj0RJjkeS36j36nQRQmep3Yy x7jUGjfvyvQc6UKd/iyl5iAzTu628sPEPaXGfCpSAHlk6V4EHIjYtqBLaPiTV+ZilDzQ6h CTyOCMEojx6ujSKKW9Jh4J7ymATqZjZjhZ8fTBOmfzHWl2ooj5s0pj3nEViBsVK+lE4+jK fLRx5tzB83IDBcXHJrwIwuVhyX3kulk1aiX8xNTnsqBoltv0HZjNEdVKTFbDXhxGHZUC8H ZVVMpWvPogbgiFPso4BPUWA21P3xDJiGapmpANyQ2hL88WPa68F5hum+3XUMRg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1682721385; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=wLxsT1m+FMZGf02XSfi1L1r/kbCtfZZMbwAz9nlEiG4=; b=uFKGi9dUgLdyaoxJVisqa+hHEaBmfJAMy+Ur6Oaj3CfExSx94Aqf6zok++YkpwW1NvcqjO mACbmQQVe3r7oh6AwVHHbYfawzjNDUGX7oXTwJk8HKcLRQ8Tn3KstjqDe8fh/gqa5Ky61X NqXhQVTWliM3dvdlR0/+RsLTsPc454v3yNYRLpDsrmFbvbyXzdH6dpVUkjMMSq1xbAdTK1 s4MLJoDzueE22PHH6SU4jFPYZt3YH5sPRqusGzLwhRY+wEj+/17by5yhp9vM9HcHUbgW9I ijE1xLBwTIVzNon0e6G4eikJh/09/JwggH6OzornPOh8okbwegkuZduBYqAlNw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1682721385; a=rsa-sha256; cv=none; b=dpmMff5cMBwM2nAIUsyGhf6q8bXVhlvG3u31SLXAzPjnm65iJtqloJ9ymNPCmWz2HnltrQ z2BMXdrRhY1TzavHDKMh7evLOkDczeXqqXr9o8Wj1Yz1uDPPO1qSESlgUjbobYmAtmoxl0 CNOMODVavqN/L6jdzr/iCI6YTYWNUuK4T4Y0XNjBuN/0BKyVyhD3aIw4kK+VKCm6kUBPK/ IZVVO5Os2uIiJOhVTodO7m2EGn3vjF/y1iRcIl9MpAAgXNnc+H1HpagMMIuOGTn7rr/FZB uSCTD24FpljlF6+nPPt6dMw+9vTKYuRJXzXN1wNWqsdqtIzg3BalZlnPc1+9oQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Q7SBc67vPzHGx; Fri, 28 Apr 2023 22:36:24 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 33SMaOW3071983; Fri, 28 Apr 2023 22:36:24 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33SMaOiQ071982; Fri, 28 Apr 2023 22:36:24 GMT (envelope-from git) Date: Fri, 28 Apr 2023 22:36:24 GMT Message-Id: <202304282236.33SMaOiQ071982@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Jan Beich Subject: git: 3da20fb3f35d - 2023Q2 - x11-servers/xwayland-devel: pass --skip-subprojects from within ninja List-Id: Commits to the quarterly branches of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-branches@freebsd.org X-BeenThere: dev-commits-ports-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jbeich X-Git-Repository: ports X-Git-Refname: refs/heads/2023Q2 X-Git-Reftype: branch X-Git-Commit: 3da20fb3f35d470553a1ba6fdedd642ae4ac952a Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch 2023Q2 has been updated by jbeich: URL: https://cgit.FreeBSD.org/ports/commit/?id=3da20fb3f35d470553a1ba6fdedd642ae4ac952a commit 3da20fb3f35d470553a1ba6fdedd642ae4ac952a Author: Jan Beich AuthorDate: 2023-04-28 22:14:24 +0000 Commit: Jan Beich 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