pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/mk/configure mk: Enforce arm64 host CPU for Darwin/aar...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/256c10d31ea9
branches:  trunk
changeset: 456017:256c10d31ea9
user:      jperkin <jperkin%pkgsrc.org@localhost>
date:      Sat Jul 17 06:34:20 2021 +0000

description:
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.

diffstat:

 mk/configure/cmake.mk |  5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)

diffs (19 lines):

diff -r a6e8f938f374 -r 256c10d31ea9 mk/configure/cmake.mk
--- a/mk/configure/cmake.mk     Fri Jul 16 16:00:47 2021 +0000
+++ b/mk/configure/cmake.mk     Sat Jul 17 06:34:20 2021 +0000
@@ -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_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}



Home | Main Index | Thread Index | Old Index