Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id A66A184CD8 for ; Tue, 27 Jun 2023 10:46:51 +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 MGeMzcTUnyUa for ; Tue, 27 Jun 2023 10:46:51 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.netbsd.org [199.233.217.197]) by mail.netbsd.org (Postfix) with ESMTP id 27EF484CCC for ; Tue, 27 Jun 2023 10:46:51 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 2556AFA89; Tue, 27 Jun 2023 10:46:51 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1687862811254470" MIME-Version: 1.0 Date: Tue, 27 Jun 2023 10:46:51 +0000 From: "Taylor R Campbell" Subject: CVS commit: pkgsrc/security/openssl To: pkgsrc-changes@NetBSD.org Approved: commit_and_comment Reply-To: riastradh@netbsd.org X-Mailer: log_accum Message-Id: <20230627104651.2556AFA89@cvs.NetBSD.org> This is a multi-part message in MIME format. --_----------=_1687862811254470 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: riastradh Date: Tue Jun 27 10:46:51 UTC 2023 Modified Files: pkgsrc/security/openssl: Makefile Log Message: security/openssl: Make this cross-compile. To generate a diff of this commit: cvs rdiff -u -r1.289 -r1.290 pkgsrc/security/openssl/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1687862811254470 Content-Disposition: inline Content-Length: 1540 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/security/openssl/Makefile diff -u pkgsrc/security/openssl/Makefile:1.289 pkgsrc/security/openssl/Makefile:1.290 --- pkgsrc/security/openssl/Makefile:1.289 Tue May 30 14:52:00 2023 +++ pkgsrc/security/openssl/Makefile Tue Jun 27 10:46:50 2023 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.289 2023/05/30 14:52:00 wiz Exp $ +# $NetBSD: Makefile,v 1.290 2023/06/27 10:46:50 riastradh Exp $ # Remember to upload-distfiles when updating OpenSSL -- otherwise it # is not possible for users who have bootstrapped without OpenSSL @@ -38,6 +38,28 @@ CONFIGURE_ARGS+= no-async CONFIGURE_ENV+= KERNEL_BITS=${ABI} .endif +.if ${USE_CROSS_COMPILE:tl} == "yes" + +OPENSSL_ARCH.aarch64= arm64 +OPENSSL_ARCH.x86_64= amd64 +CONFIGURE_ENV+= MACHINE=${OPENSSL_ARCH.${MACHINE_ARCH}:U${MACHINE_GNU_ARCH}:Q} +CONFIGURE_ENV+= RELEASE=${OS_VERSION:Q} +CONFIGURE_ENV+= SYSTEM=${OPSYS:Q} +CONFIGURE_ENV+= BUILD=${OPSYS:Q}\ ${OS_VERSION:Q} + +# We don't carry a runtime dependency on Perl, but OpenSSL does provide +# a Perl script that you can use if you do install Perl. +SUBST_CLASSES+= perlcross +SUBST_MESSAGE.perlcross= Fixing Perl interpreter path for cross-build +SUBST_STAGE.perlcross= pre-install +SUBST_FILES.perlcross+= tools/c_rehash +SUBST_FILES.perlcross+= apps/CA.pl +SUBST_FILES.perlcross+= apps/tsget.pl +SUBST_SED.perlcross= -e s,${PERL5:Q},${LOCALBASE:Q}/bin/perl5,g +CHECK_INTERPRETER_SKIP+= bin/c_rehash + +.endif # USE_CROSS_COMPILE + .include "options.mk" CONFIGURE_ENV+= PERL=${PERL5:Q} --_----------=_1687862811254470--