Received: by mail.netbsd.org (Postfix, from userid 605) id AECE584F01; Sat, 13 Jan 2024 04:17:33 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id E111D84EF9 for ; Sat, 13 Jan 2024 04:17:32 +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 x2JZFd8vYUeH for ; Sat, 13 Jan 2024 04:17:32 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.netbsd.org [199.233.217.197]) by mail.netbsd.org (Postfix) with ESMTP id 3AF5684EAA for ; Sat, 13 Jan 2024 04:17:32 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 3687FFA42; Sat, 13 Jan 2024 04:17:32 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_170511945212980" MIME-Version: 1.0 Date: Sat, 13 Jan 2024 04:17:32 +0000 From: "Taylor R Campbell" Subject: CVS commit: pkgsrc/devel/meson To: pkgsrc-changes@NetBSD.org Reply-To: riastradh@netbsd.org X-Mailer: log_accum Message-Id: <20240113041732.3687FFA42@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_170511945212980 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: riastradh Date: Sat Jan 13 04:17:32 UTC 2024 Modified Files: pkgsrc/devel/meson: build.mk Log Message: meson: Create a [binaries] section in a meson cross file. Package makefiles can add to it by setting: MESON_CROSS_BINARIES+= foo MESON_CROSS_BINARY.foo= ${TOOLBASE}/bin/foo No change to native builds because this is all gated on USE_CROSS_COMPILE = yes. To generate a diff of this commit: cvs rdiff -u -r1.22 -r1.23 pkgsrc/devel/meson/build.mk Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_170511945212980 Content-Disposition: inline Content-Length: 940 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/devel/meson/build.mk diff -u pkgsrc/devel/meson/build.mk:1.22 pkgsrc/devel/meson/build.mk:1.23 --- pkgsrc/devel/meson/build.mk:1.22 Tue Nov 14 12:45:23 2023 +++ pkgsrc/devel/meson/build.mk Sat Jan 13 04:17:32 2024 @@ -1,4 +1,4 @@ -# $NetBSD: build.mk,v 1.22 2023/11/14 12:45:23 wiz Exp $ +# $NetBSD: build.mk,v 1.23 2024/01/13 04:17:32 riastradh Exp $ MESON_REQD?= 0 .for version in ${MESON_REQD} @@ -110,6 +110,12 @@ ${MESON_CROSS_FILE}: ${RUN}${ECHO} "cpu_family = '${MESON_CPU_FAMILY}'" >>$@.tmp ${RUN}${ECHO} "cpu = '${MESON_CPU}'" >>$@.tmp ${RUN}${ECHO} "endian = '${MESON_CPU_ENDIAN}'" >>$@.tmp + ${RUN}${ECHO} '[binaries]' >>$@.tmp +. for _v_ in ${MESON_CROSS_BINARIES} +. if defined(MESON_CROSS_BINARY.${_v_}) + ${RUN}${ECHO} ${_v_} = \'${MESON_CROSS_BINARY.${_v_}:Q}\' >>$@.tmp +. endif +. endfor ${RUN}${MV} -f $@.tmp $@ MESON_CROSS_ARGS+= --cross-file ${MESON_CROSS_FILE:Q} --_----------=_170511945212980--