head 1.2; access; symbols pkgsrc-2021Q4:1.1.0.4 pkgsrc-2021Q4-base:1.1 pkgsrc-2021Q3:1.1.0.2 pkgsrc-2021Q3-base:1.1; locks; strict; comment @// @; 1.2 date 2022.03.16.18.36.47; author jperkin; state dead; branches; next 1.1; commitid QiNShffaqlEVhtwD; 1.1 date 2021.07.15.21.10.53; author jperkin; state Exp; branches; next ; commitid V0mYytuIXVyZY71D; desc @@ 1.2 log @cmake: Apply different fix for Darwin/aarch64. The previous patch was breaking cmake when running outside of the pkgsrc environment. Should fix NetBSD/pkgsrc#103. Bump PKGREVISION. @ text @$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; @ 1.1 log @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. @ text @d1 1 a1 1 $NetBSD$ @