CVS commit: pkgsrc/devel/cmake

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

Module Name:    pkgsrc
Committed By:   jperkin
Date:           Thu Jul 15 21:10:53 UTC 2021

Modified Files:
        pkgsrc/devel/cmake: distinfo
Added Files:
        pkgsrc/devel/cmake/patches: patch-Source_cmLocalGenerator.cxx

Log Message:
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.


To generate a diff of this commit:
cvs rdiff -u -r1.180 -r1.181 pkgsrc/devel/cmake/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/devel/cmake/patches/patch-Source_cmLocalGenerator.cxx

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/devel/cmake/distinfo
diff -u pkgsrc/devel/cmake/distinfo:1.180 pkgsrc/devel/cmake/distinfo:1.181
--- pkgsrc/devel/cmake/distinfo:1.180   Thu Jun 24 09:30:55 2021
+++ pkgsrc/devel/cmake/distinfo Thu Jul 15 21:10:53 2021
@@ -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_CMakeLi
 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

Added files:

Index: pkgsrc/devel/cmake/patches/patch-Source_cmLocalGenerator.cxx
diff -u /dev/null pkgsrc/devel/cmake/patches/patch-Source_cmLocalGenerator.cxx:1.1
--- /dev/null   Thu Jul 15 21:10:53 2021
+++ pkgsrc/devel/cmake/patches/patch-Source_cmLocalGenerator.cxx        Thu Jul 15 21:10:53 2021
@@ -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;
+