Received: from localhost (localhost [127.0.0.1])
	by mail.netbsd.org (Postfix) with ESMTP id 4F0DF84D14
	for <pkgsrc-changes@NetBSD.org>; Fri,  9 Jun 2023 23:51:54 +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 Jj4Wv9qk7C0E for <pkgsrc-changes@netbsd.org>;
	Fri,  9 Jun 2023 23:51:53 +0000 (UTC)
Received: from cvs.NetBSD.org (ivanova.netbsd.org [199.233.217.197])
	by mail.netbsd.org (Postfix) with ESMTP id 99C9D84CCF
	for <pkgsrc-changes@NetBSD.org>; Fri,  9 Jun 2023 23:51:53 +0000 (UTC)
Received: by cvs.NetBSD.org (Postfix, from userid 500)
	id C54C3FA89; Fri,  9 Jun 2023 23:51:52 +0000 (UTC)
Content-Transfer-Encoding: 7bit
Content-Type: multipart/mixed; boundary="_----------=_1686354712254540"
MIME-Version: 1.0
Date: Fri, 9 Jun 2023 23:51:52 +0000
From: "Taylor R Campbell" <riastradh@netbsd.org>
Subject: CVS commit: pkgsrc/devel/git-base
To: pkgsrc-changes@NetBSD.org
Approved: commit_and_comment
Reply-To: riastradh@netbsd.org
X-Mailer: log_accum
Message-Id: <20230609235152.C54C3FA89@cvs.NetBSD.org>

This is a multi-part message in MIME format.

--_----------=_1686354712254540
Content-Disposition: inline
Content-Transfer-Encoding: 8bit
Content-Type: text/plain; charset="US-ASCII"

Module Name:	pkgsrc
Committed By:	riastradh
Date:		Fri Jun  9 23:51:52 UTC 2023

Modified Files:
	pkgsrc/devel/git-base: Makefile

Log Message:
devel/git-base: Make this cross-compile on NetBSD.


To generate a diff of this commit:
cvs rdiff -u -r1.105 -r1.106 pkgsrc/devel/git-base/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.


--_----------=_1686354712254540
Content-Disposition: inline
Content-Length: 1197
Content-Transfer-Encoding: binary
Content-Type: text/x-diff; charset=us-ascii

Modified files:

Index: pkgsrc/devel/git-base/Makefile
diff -u pkgsrc/devel/git-base/Makefile:1.105 pkgsrc/devel/git-base/Makefile:1.106
--- pkgsrc/devel/git-base/Makefile:1.105	Fri Jun  9 12:05:14 2023
+++ pkgsrc/devel/git-base/Makefile	Fri Jun  9 23:51:52 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.105 2023/06/09 12:05:14 riastradh Exp $
+# $NetBSD: Makefile,v 1.106 2023/06/09 23:51:52 riastradh Exp $
 
 PKGREVISION=	1
 .include "../../devel/git/Makefile.common"
@@ -72,6 +72,16 @@ SUBST_VARS.paths=	PREFIX
 
 .include "../../mk/bsd.prefs.mk"
 
+.if ${USE_CROSS_COMPILE:U:tl} == "yes"
+CONFIGURE_ENV.NetBSD+=	ac_cv_iconv_omits_bom=no
+CONFIGURE_ENV.NetBSD+=	ac_cv_fread_reads_directories=yes
+CONFIGURE_ENV.NetBSD+=	ac_cv_snprintf_returns_bogus=no
+# Needed to skip calling out to curl-config, which we can't do when
+# cross-compiling.  XXX Consider teaching curl's buildlink3.mk to set
+# BUILDLINK_LIBS.curl=-lcurl so we can use it here.
+MAKE_ENV+=		CURL_LDFLAGS=-lcurl
+.endif
+
 .if ${OPSYS} == "NetBSD" || ${OPSYS} == "SunOS" || ${OPSYS} == "OSF1" || ${OPSYS} == "HPUX" || ${OPSYS} == "QNX" || ${OPSYS} == "UnixWare"
 SUBST_CLASSES+=		fix-cd-P
 SUBST_FILES.fix-cd-P=	t/test-lib.sh


--_----------=_1686354712254540--