[pkgsrc/trunk]: pkgsrc/devel/cmake cmake: Don't add additional -arch flags on...

[jperkin <jperkin%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/dd5ea02a63df
branches:  trunk
changeset: 455981:dd5ea02a63df
user:      jperkin <jperkin%pkgsrc.org@localhost>
date:      Thu Jul 15 21:10:53 2021 +0000

description:
cmake: Don't add additional -arch flags on Darwin.

Fixes building on arm64 in an x86_64 chroot where it would append
"-arch x86_64" and then fail to link.  schmonz verified that this
change doesn't seem to affect non-chroot native builds.

diffstat:

 devel/cmake/distinfo                                  |   3 ++-
 devel/cmake/patches/patch-Source_cmLocalGenerator.cxx |  15 +++++++++++++++
 2 files changed, 17 insertions(+), 1 deletions(-)

diffs (35 lines):

diff -r 973973d7b456 -r dd5ea02a63df devel/cmake/distinfo
--- a/devel/cmake/distinfo      Thu Jul 15 16:55:00 2021 +0000
+++ b/devel/cmake/distinfo      Thu Jul 15 21:10:53 2021 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.180 2021/06/24 09:30:55 adam Exp $
+$NetBSD: distinfo,v 1.181 2021/07/15 21:10:53 jperkin Exp $
 
 SHA1 (cmake-3.20.5.tar.gz) = 42b43d0a5d82285384db8d17b5bd5dd9cc3fc6a2
 RMD160 (cmake-3.20.5.tar.gz) = 8737df0ceeb6d3d8ec94a907d7fcf475a69feffc
@@ -19,5 +19,6 @@
 SHA1 (patch-Source_Checks_Curses_CheckCurses.c) = c86cae48f7b39fb735eba4788d4e9d595b2ccf3b
 SHA1 (patch-Source_Checks_cm__cxx17__check.cpp) = d5e2708df6fcda078b1b5ea59264c663d2633ced
 SHA1 (patch-Source_QtDialog_CMakeLists.txt) = 0858da256bba174694a165d5f910eedb3faa06d5
+SHA1 (patch-Source_cmLocalGenerator.cxx) = 7b41e5837c2dcff54114541920c45258632275b0
 SHA1 (patch-Utilities_KWIML_CMakeLists.txt) = e4bdf9fc58757e87bf7e3e3e195839eededbc796
 SHA1 (patch-bootstrap) = e34f5b888790e766338086b8c3680be79b71ef18
diff -r 973973d7b456 -r dd5ea02a63df devel/cmake/patches/patch-Source_cmLocalGenerator.cxx
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/devel/cmake/patches/patch-Source_cmLocalGenerator.cxx     Thu Jul 15 21:10:53 2021 +0000
@@ -0,0 +1,15 @@
+$NetBSD: patch-Source_cmLocalGenerator.cxx,v 1.1 2021/07/15 21:10:53 jperkin Exp $
+
+Disable additional -arch flags on macOS.
+
+--- Source/cmLocalGenerator.cxx.orig   2021-06-21 15:23:19.000000000 +0000
++++ Source/cmLocalGenerator.cxx
+@@ -97,7 +97,7 @@ cmLocalGenerator::cmLocalGenerator(cmGlo
+ 
+   this->AliasTargets = makefile->GetAliasTargets();
+ 
+-  this->EmitUniversalBinaryFlags = true;
++  this->EmitUniversalBinaryFlags = false;
+   this->BackwardsCompatibility = 0;
+   this->BackwardsCompatibilityFinal = false;
+