Received: by mail.netbsd.org (Postfix, from userid 605) id 0885C84F5A; Sat, 13 Jan 2024 20:21:25 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 35F9B84F46 for ; Sat, 13 Jan 2024 20:21:24 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([IPv6:::1]) by localhost (mail.netbsd.org [IPv6:::1]) (amavisd-new, port 10025) with ESMTP id tbXwxMoeWypp for ; Sat, 13 Jan 2024 20:21:23 +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 8152684F09 for ; Sat, 13 Jan 2024 20:21:23 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 7684BFA42; Sat, 13 Jan 2024 20:21:23 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1705177283246400" MIME-Version: 1.0 Date: Sat, 13 Jan 2024 20:21:23 +0000 From: "Taylor R Campbell" Subject: CVS commit: pkgsrc/mk To: pkgsrc-changes@NetBSD.org Reply-To: riastradh@netbsd.org X-Mailer: log_accum Message-Id: <20240113202123.7684BFA42@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_1705177283246400 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: riastradh Date: Sat Jan 13 20:21:23 UTC 2024 Modified Files: pkgsrc/mk: bsd.prefs.mk Log Message: bsd.prefs.mk: Unconditionally define TOOLS_CROSS_DESTDIR. - If we're cross-compiling or building cross-libtool-base, alias for CROSS_DESTDIR. - Otherwise, empty. This will be convenient for sprinkling TOOLS_CROSS_DESTDIR in various places throughout mk/ without worrying about disrupting native builds. No change to native builds here because all current references are conditional on USE_CROSS_COMPILE = yes. To generate a diff of this commit: cvs rdiff -u -r1.436 -r1.437 pkgsrc/mk/bsd.prefs.mk Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1705177283246400 Content-Disposition: inline Content-Length: 904 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/mk/bsd.prefs.mk diff -u pkgsrc/mk/bsd.prefs.mk:1.436 pkgsrc/mk/bsd.prefs.mk:1.437 --- pkgsrc/mk/bsd.prefs.mk:1.436 Sun Jul 30 19:04:02 2023 +++ pkgsrc/mk/bsd.prefs.mk Sat Jan 13 20:21:23 2024 @@ -1,4 +1,4 @@ -# $NetBSD: bsd.prefs.mk,v 1.436 2023/07/30 19:04:02 nia Exp $ +# $NetBSD: bsd.prefs.mk,v 1.437 2024/01/13 20:21:23 riastradh Exp $ # # This file includes the mk.conf file, which contains the user settings. # @@ -554,7 +554,11 @@ _MAKE_PACKAGE_AS_ROOT?= yes # TOOLS_CROSS_DESTDIR is used for the libtool build to make a wrapper # that points at the cross-destdir as sysroot, without setting # _CROSS_DESTDIR because we're actually building a native package. +.if ${TOOLS_USE_CROSS_COMPILE:tl} == "yes" TOOLS_CROSS_DESTDIR= ${CROSS_DESTDIR} +.else +TOOLS_CROSS_DESTDIR= # empty +.endif # Depends on MACHINE_ARCH override above .if ${OPSYS} == "NetBSD" --_----------=_1705177283246400--