Content-Transfer-Encoding: 7bit
Content-Type: multipart/mixed; boundary="_----------=_1705176607294210"
MIME-Version: 1.0
Date: Sat, 13 Jan 2024 20:10:07 +0000
From: "Taylor R Campbell" <riastradh@netbsd.org>
Subject: CVS commit: pkgsrc/security
To: pkgsrc-changes@NetBSD.org
Reply-To: riastradh@netbsd.org
Message-Id: <20240113201007.CD78DFA42@cvs.NetBSD.org>
Sender: pkgsrc-changes-owner@NetBSD.org
Precedence: bulk

This is a multi-part message in MIME format.

--_----------=_1705176607294210
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:10:07 UTC 2024

Modified Files:
	pkgsrc/security/heimdal: builtin.mk
	pkgsrc/security/mit-krb5: builtin.mk

Log Message:
security/heimdal, security/mit-krb5: Do krb5-config in cross-destdir.

Although this is an executable program, it's a very simple shell
script which can be run in the build environment to describe the
target environment.  So qualify paths to it by ${_CROSS_DESTDIR:U},
where it lives during cross-builds.

No change to native builds because ${_CROSS_DESTDIR:U} is empty in
them.


To generate a diff of this commit:
cvs rdiff -u -r1.19 -r1.20 pkgsrc/security/heimdal/builtin.mk
cvs rdiff -u -r1.19 -r1.20 pkgsrc/security/mit-krb5/builtin.mk

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


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

Modified files:

Index: pkgsrc/security/heimdal/builtin.mk
diff -u pkgsrc/security/heimdal/builtin.mk:1.19 pkgsrc/security/heimdal/builtin.mk:1.20
--- pkgsrc/security/heimdal/builtin.mk:1.19	Tue Nov 22 12:51:00 2022
+++ pkgsrc/security/heimdal/builtin.mk	Sat Jan 13 20:10:07 2024
@@ -1,4 +1,4 @@
-# $NetBSD: builtin.mk,v 1.19 2022/11/22 12:51:00 adam Exp $
+# $NetBSD: builtin.mk,v 1.20 2024/01/13 20:10:07 riastradh Exp $
 
 BUILTIN_PKG:=	heimdal
 
@@ -30,8 +30,9 @@ MAKEVARS+=		IS_BUILTIN.heimdal
 .if !defined(BUILTIN_PKG.heimdal) && \
     ${IS_BUILTIN.heimdal:tl} == yes
 .  if empty(SH_KRB5_CONFIG:M__nonexistent__)
-BUILTIN_VERSION.heimdal!=	${SH_KRB5_CONFIG} --version |		\
-				${AWK} '{ print $$2; exit }'
+BUILTIN_VERSION.heimdal!=						\
+	${_CROSS_DESTDIR:U:Q}${SH_KRB5_CONFIG:Q} --version |		\
+	${AWK} '{ print $$2; exit }'
 .  else
 #
 # heimdal<=0.6.x doesn't have a method of checking files to discover
@@ -108,7 +109,7 @@ CHECK_BUILTIN.heimdal?=	no
 .  if ${USE_BUILTIN.heimdal:tl} == no
 BUILDLINK_API_DEPENDS.heimdal+=	heimdal>=0.6
 
-KRB5_CONFIG?=	${BUILDLINK_PREFIX.heimdal}/bin/krb5-config
+KRB5_CONFIG?=	${_CROSS_DESTDIR:U}${BUILDLINK_PREFIX.heimdal}/bin/krb5-config
 CONFIGURE_ENV+=	KRB5_CONFIG=${KRB5_CONFIG:Q}
 MAKE_ENV+=	KRB5_CONFIG=${KRB5_CONFIG:Q}
 .  endif
@@ -128,7 +129,7 @@ fake-krb5-config:
 
 KRB5_CONFIG?=	${BUILDLINK_DIR}/bin/krb5-config
 .    else
-KRB5_CONFIG?=	${SH_KRB5_CONFIG}
+KRB5_CONFIG?=	${_CROSS_DESTDIR:U}${SH_KRB5_CONFIG}
 .    endif
 CONFIGURE_ENV+=	KRB5_CONFIG=${KRB5_CONFIG:Q}
 MAKE_ENV+=	KRB5_CONFIG=${KRB5_CONFIG:Q}

Index: pkgsrc/security/mit-krb5/builtin.mk
diff -u pkgsrc/security/mit-krb5/builtin.mk:1.19 pkgsrc/security/mit-krb5/builtin.mk:1.20
--- pkgsrc/security/mit-krb5/builtin.mk:1.19	Fri Jan  5 23:46:29 2024
+++ pkgsrc/security/mit-krb5/builtin.mk	Sat Jan 13 20:10:07 2024
@@ -1,4 +1,4 @@
-# $NetBSD: builtin.mk,v 1.19 2024/01/05 23:46:29 adam Exp $
+# $NetBSD: builtin.mk,v 1.20 2024/01/13 20:10:07 riastradh Exp $
 
 BUILTIN_PKG:=	mit-krb5
 
@@ -43,8 +43,9 @@ MAKEVARS+=		IS_BUILTIN.mit-krb5
 .if !defined(BUILTIN_PKG.mit-krb5) && \
     ${IS_BUILTIN.mit-krb5:tl} == yes
 .  if empty(SH_KRB5_CONFIG:M__nonexistent__)
-BUILTIN_VERSION.mit-krb5!=	${SH_KRB5_CONFIG} --version | \
-				${SED} -e 's/.*release //' -e 's/-.*//' -e 's/).*//'
+BUILTIN_VERSION.mit-krb5!=					\
+	${_CROSS_DESTDIR:U:Q}${SH_KRB5_CONFIG:Q} --version |	\
+	${SED} -e 's/.*release //' -e 's/-.*//' -e 's/).*//'
 .  endif
 BUILTIN_VERSION.mit-krb5?=	1.4.0
 BUILTIN_PKG.mit-krb5=		mit-krb5-${BUILTIN_VERSION.mit-krb5}
@@ -85,11 +86,11 @@ MAKEVARS+=		USE_BUILTIN.mit-krb5
 CHECK_BUILTIN.mit-krb5?=	no
 .if ${CHECK_BUILTIN.mit-krb5:tl} == no
 .  if ${USE_BUILTIN.mit-krb5:tl} == yes
-KRB5_CONFIG?=	${SH_KRB5_CONFIG}
+KRB5_CONFIG?=	${_CROSS_DESTDIR:U}${SH_KRB5_CONFIG}
 ALL_ENV+=	KRB5_CONFIG=${KRB5_CONFIG:Q}
 
-BUILDLINK_CPPFLAGS.mit-krb5!=	${SH_KRB5_CONFIG} --cflags
-BUILDLINK_LDFLAGS.mit-krb5!=	${SH_KRB5_CONFIG} --libs
+BUILDLINK_CPPFLAGS.mit-krb5!=	${_CROSS_DESTDIR:U:Q}${SH_KRB5_CONFIG:Q} --cflags
+BUILDLINK_LDFLAGS.mit-krb5!=	${_CROSS_DESTDIR:U:Q}${SH_KRB5_CONFIG:Q} --libs
 
 #
 # The SunOS builtin krb5-config does not support all of the arguments that the
@@ -109,14 +110,14 @@ fake-krb5-config:
 	if [ ! -f $${dst} ]; then					\
 		${ECHO_BUILDLINK_MSG} "Creating $${dst}";		\
 		${ECHO} "#!${SH}" > $${dst};				\
-		${SED} -e "s,@KRB5_CONFIG@,${SH_KRB5_CONFIG:Q},g"	\
+		${SED} -e s,@KRB5_CONFIG@,${_CROSS_DESTDIR:U:Q}${SH_KRB5_CONFIG:Q},g	\
 		    $${src} >> $${dst};					\
 		${CHMOD} +x $${dst};					\
 	fi
 
 .    endif
 .  else
-KRB5_CONFIG?=	${BUILDLINK_PREFIX.mit-krb5}/bin/krb5-config
+KRB5_CONFIG?=	${_CROSS_DESTDIR:U}${BUILDLINK_PREFIX.mit-krb5}/bin/krb5-config
 CONFIGURE_ENV+=	KRB5_CONFIG=${KRB5_CONFIG:Q}
 MAKE_ENV+=	KRB5_CONFIG=${KRB5_CONFIG:Q}
 .  endif


--_----------=_1705176607294210--