CVS commit: pkgsrc/mk/configure

["Jonathan Perkin" <jperkin%netbsd.org@localhost>]

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.

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}