CVS commit: pkgsrc/devel

["Taylor R Campbell" <riastradh%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   riastradh
Date:           Tue Jan  7 19:35:16 UTC 2025

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

Log Message:
devel/git*: Move some cross configure env to Makefile.common.

Fixes cross-build of devel/git-contrib, which relies on the same
configure run-checks as devel/git-base.

No change to native builds.

While here, omit needless :U from USE_CROSS_COMPILE reference.


To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 pkgsrc/devel/git/Makefile.common
cvs rdiff -u -r1.121 -r1.122 pkgsrc/devel/git-base/Makefile

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

Modified files:

Index: pkgsrc/devel/git/Makefile.common
diff -u pkgsrc/devel/git/Makefile.common:1.9 pkgsrc/devel/git/Makefile.common:1.10
--- pkgsrc/devel/git/Makefile.common:1.9        Sun Feb 25 22:24:13 2024
+++ pkgsrc/devel/git/Makefile.common    Tue Jan  7 19:35:16 2025
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.9 2024/02/25 22:24:13 adam Exp $
+# $NetBSD: Makefile.common,v 1.10 2025/01/07 19:35:16 riastradh Exp $
 #
 # used by devel/git-base/Makefile
 # used by devel/git-contrib/Makefile
@@ -34,4 +34,10 @@ CONFIGURE_ARGS+=     TAR=${TAR:Q}
 CONFIGURE_ARGS+=       --mandir=${${PREFIX}/${PKGMANDIR}:L:Q}
 CONFIGURE_ARGS+=       --sysconfdir=${PKG_SYSCONFDIR}
 
+.if ${USE_CROSS_COMPILE: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
+.endif
+
 CHECK_PORTABILITY_SKIP+=       ci/run-test-slice.sh

Index: pkgsrc/devel/git-base/Makefile
diff -u pkgsrc/devel/git-base/Makefile:1.121 pkgsrc/devel/git-base/Makefile:1.122
--- pkgsrc/devel/git-base/Makefile:1.121        Mon Nov 25 10:29:57 2024
+++ pkgsrc/devel/git-base/Makefile      Tue Jan  7 19:35:16 2025
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.121 2024/11/25 10:29:57 adam Exp $
+# $NetBSD: Makefile,v 1.122 2025/01/07 19:35:16 riastradh Exp $
 
 .include "../../devel/git/Makefile.common"
 
@@ -73,10 +73,7 @@ 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
+.if ${USE_CROSS_COMPILE:tl} == "yes"
 # 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.