Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 2C9FE84D17 for ; Thu, 15 Jun 2023 23:41:42 +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 4ArafVHNoB0C for ; Thu, 15 Jun 2023 23:41:41 +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 7068D84D01 for ; Thu, 15 Jun 2023 23:41:41 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 680C3FA89; Thu, 15 Jun 2023 23:41:41 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1686872501109400" MIME-Version: 1.0 Date: Thu, 15 Jun 2023 23:41:41 +0000 From: "Taylor R Campbell" Subject: CVS commit: pkgsrc/security/libgcrypt To: pkgsrc-changes@NetBSD.org Approved: commit_and_comment Reply-To: riastradh@netbsd.org X-Mailer: log_accum Message-Id: <20230615234141.680C3FA89@cvs.NetBSD.org> This is a multi-part message in MIME format. --_----------=_1686872501109400 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: riastradh Date: Thu Jun 15 23:41:41 UTC 2023 Modified Files: pkgsrc/security/libgcrypt: Makefile Log Message: security/libgcrypt: Make this cross-compile. To generate a diff of this commit: cvs rdiff -u -r1.108 -r1.109 pkgsrc/security/libgcrypt/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1686872501109400 Content-Disposition: inline Content-Length: 1274 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/security/libgcrypt/Makefile diff -u pkgsrc/security/libgcrypt/Makefile:1.108 pkgsrc/security/libgcrypt/Makefile:1.109 --- pkgsrc/security/libgcrypt/Makefile:1.108 Fri Apr 7 09:15:55 2023 +++ pkgsrc/security/libgcrypt/Makefile Thu Jun 15 23:41:41 2023 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.108 2023/04/07 09:15:55 adam Exp $ +# $NetBSD: Makefile,v 1.109 2023/06/15 23:41:41 riastradh Exp $ DISTNAME= libgcrypt-1.10.2 CATEGORIES= security @@ -32,6 +32,18 @@ PKGCONFIG_OVERRIDE+= src/libgcrypt.pc.in .include "options.mk" +.if ${USE_CROSS_COMPILE:tl} == "yes" +CONFIGURE_ARGS+= CC_FOR_BUILD=${NATIVE_CC:Q} + +# libgpg-error installs scripts in the _target_ system, that are +# expected to be run on the _build_ system when compiling downstream +# dependencies like libgcrypt. I don't see a way to use pkg-config or +# anything reasonable to override this, so, we do the nonsense thing +# instead. +CONFIGURE_ARGS+= GPGRT_CONFIG=${CROSS_DESTDIR:Q}${LOCALBASE:Q}/bin/gpgrt-config +CONFIGURE_ARGS+= GPG_ERROR_CONFIG=${CROSS_DESTDIR:Q}${LOCALBASE:Q}/bin/gpg-error-config +.endif + BUILDLINK_API_DEPENDS.libgpg-error+= libgpg-error>=1.13 .include "../../security/libgpg-error/buildlink3.mk" .include "../../mk/pthread.buildlink3.mk" --_----------=_1686872501109400--