Received: by mail.netbsd.org (Postfix, from userid 605) id 569BF84EBD; Sat, 17 Jul 2021 06:34:22 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 9183584EBA for ; Sat, 17 Jul 2021 06:34:21 +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 sqK4WEGlSyP6 for ; Sat, 17 Jul 2021 06:34:21 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.netbsd.org [199.233.217.197]) by mail.netbsd.org (Postfix) with ESMTP id DA7DC84CED for ; Sat, 17 Jul 2021 06:34:20 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id D12A9FA95; Sat, 17 Jul 2021 06:34:20 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1626503660121420" MIME-Version: 1.0 Date: Sat, 17 Jul 2021 06:34:20 +0000 From: "Jonathan Perkin" Subject: CVS commit: pkgsrc/mk/configure To: pkgsrc-changes@NetBSD.org Reply-To: jperkin@netbsd.org X-Mailer: log_accum Message-Id: <20210717063420.D12A9FA95@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_1626503660121420 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: jperkin Date: Sat Jul 17 06:34:20 UTC 2021 Modified Files: pkgsrc/mk/configure: cmake.mk Log Message: mk: Enforce arm64 host CPU for Darwin/aarch64. Fixes builds inside an x86_64 chroot where packages add x86-specific flags based on the output of uname even though we're building for aarch64. CMake provides the CMAKE_APPLE_SILICON_PROCESSOR variable for this situation. To generate a diff of this commit: cvs rdiff -u -r1.20 -r1.21 pkgsrc/mk/configure/cmake.mk Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1626503660121420 Content-Disposition: inline Content-Length: 886 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/mk/configure/cmake.mk diff -u pkgsrc/mk/configure/cmake.mk:1.20 pkgsrc/mk/configure/cmake.mk:1.21 --- pkgsrc/mk/configure/cmake.mk:1.20 Wed Aug 12 14:10:11 2020 +++ pkgsrc/mk/configure/cmake.mk Sat Jul 17 06:34:20 2021 @@ -1,4 +1,4 @@ -# $NetBSD: cmake.mk,v 1.20 2020/08/12 14:10:11 schmonz Exp $ +# $NetBSD: cmake.mk,v 1.21 2021/07/17 06:34:20 jperkin Exp $ # # This file handles packages that use CMake as their primary build # system. For more information about CMake, see http://www.cmake.org/. @@ -71,6 +71,9 @@ CMAKE_ARGS+= -DCMAKE_INSTALL_INFODIR:PAT CMAKE_ARGS+= -DCMAKE_INSTALL_LOCALEDIR:PATH=${PKGLOCALEDIR}/locale . endif .endif +.if !empty(MACHINE_PLATFORM:MDarwin-*-aarch64) +CMAKE_ARGS+= -DCMAKE_APPLE_SILICON_PROCESSOR=arm64 +.endif .if defined(CMAKE_PREFIX_PATH) CMAKE_ARGS+=-DCMAKE_PREFIX_PATH:PATH=${CMAKE_PREFIX_PATH:ts;:Q} --_----------=_1626503660121420--