Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 1481084E78 for ; Tue, 27 Jun 2023 10:28:46 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([127.0.0.1]) by localhost (mail.netbsd.org [127.0.0.1]) (amavisd-new, port 10025) with ESMTP id Ntk0X1yJ3oDj for ; Tue, 27 Jun 2023 10:28:45 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.NetBSD.org [IPv6:2001:470:a085:999:28c:faff:fe03:5984]) by mail.netbsd.org (Postfix) with ESMTP id 6047784CCC for ; Tue, 27 Jun 2023 10:28:45 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 5DED6FA89; Tue, 27 Jun 2023 10:28:45 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1687861725292340" MIME-Version: 1.0 Date: Tue, 27 Jun 2023 10:28:45 +0000 From: "Taylor R Campbell" Subject: CVS commit: pkgsrc/x11/libxcb To: pkgsrc-changes@NetBSD.org Approved: commit_and_comment Reply-To: riastradh@netbsd.org X-Mailer: log_accum Message-Id: <20230627102845.5DED6FA89@cvs.NetBSD.org> This is a multi-part message in MIME format. --_----------=_1687861725292340 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: riastradh Date: Tue Jun 27 10:28:45 UTC 2023 Modified Files: pkgsrc/x11/libxcb: Makefile Log Message: x11/libxcb: Handle TOOLBASE/LOCALBASE split. To generate a diff of this commit: cvs rdiff -u -r1.39 -r1.40 pkgsrc/x11/libxcb/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1687861725292340 Content-Disposition: inline Content-Length: 1260 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/x11/libxcb/Makefile diff -u pkgsrc/x11/libxcb/Makefile:1.39 pkgsrc/x11/libxcb/Makefile:1.40 --- pkgsrc/x11/libxcb/Makefile:1.39 Fri Jun 17 16:43:34 2022 +++ pkgsrc/x11/libxcb/Makefile Tue Jun 27 10:28:45 2023 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.39 2022/06/17 16:43:34 wiz Exp $ +# $NetBSD: Makefile,v 1.40 2023/06/27 10:28:45 riastradh Exp $ DISTNAME= libxcb-1.15 PKGREVISION= 1 @@ -24,13 +24,21 @@ CONFIGURE_ARGS+= --without-doxygen .include "../../mk/bsd.prefs.mk" -.if !empty(USE_CROSS_COMPILE:M[yY][eE][sS]) +.if ${USE_CROSS_COMPILE:U:tl} == "yes" # No native C compiler needed -- the tool that gobbles up the xcb # prototypes is in Python. # # XXX This needs to match the version of xcb-proto we get for the # target by buildlink3. TOOL_DEPENDS+= xcb-proto-[0-9]*:../../x11/xcb-proto +SUBST_CLASSES+= xcbproto +SUBST_FILES.xcbproto= src/Makefile +SUBST_MESSAGE.xcbproto= Fixing xcb-proto paths dir for cross-compile. +SUBST_STAGE.xcbproto= post-configure +SUBST_SED.xcbproto+= \ + -e 's,^\(XCBPROTO_XCBINCLUDEDIR = \).*$$,\1${TOOLBASE}/share/xcb,' +SUBST_SED.xcbproto+= \ + -e 's,^\(XCBPROTO_XCBPYTHONDIR = \).*$$,\1${TOOLBASE}/${PYSITELIB},' .endif # Adds -Wl,-R to pkgconfig files automatically --_----------=_1687861725292340--