Skip to content

Commit 348f361

Browse files
committed
cmake: Apply different fix for Darwin/aarch64.
The previous patch was breaking cmake when running outside of the pkgsrc environment. Should fix #103. Bump PKGREVISION.
1 parent 07ee4ef commit 348f361

File tree

3 files changed

+10
-18
lines changed

3 files changed

+10
-18
lines changed

devel/cmake/Makefile

+9-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
1-
# $NetBSD: Makefile,v 1.190 2022/01/25 21:18:08 adam Exp $
1+
# $NetBSD: Makefile,v 1.191 2022/03/16 18:36:47 jperkin Exp $
22

33
.include "Makefile.common"
44

5+
PKGREVISION= 1
56
COMMENT= Cross platform make
67

78
USE_TOOLS+= gmake
@@ -25,6 +26,13 @@ CONFIGURE_ARGS+= --no-system-jsoncpp
2526
LDFLAGS.Darwin+= -framework CoreServices # for LSOpenCFURLRef()
2627
LDFLAGS.SunOS+= -lsocket -lnsl
2728

29+
.include "../../mk/bsd.prefs.mk"
30+
31+
# Enforce arm64 to support building inside x86_64 chroots.
32+
.if !empty(MACHINE_PLATFORM:MDarwin-*-aarch64)
33+
CONFIGURE_ENV+= CMAKE_OSX_ARCHITECTURES=arm64
34+
.endif
35+
2836
PLIST_SUBST+= CMAKE_API=${CMAKE_API}
2937

3038
REPLACE_SH= Modules/Compiler/XL-Fortran/cpp

devel/cmake/distinfo

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
$NetBSD: distinfo,v 1.192 2022/03/07 19:59:44 adam Exp $
1+
$NetBSD: distinfo,v 1.193 2022/03/16 18:36:47 jperkin Exp $
22

33
BLAKE2s (cmake-3.22.3.tar.gz) = eafa5d81e2a1ab1cb7aee21fec3a4706330cb44ef0cbc9633be9fabad67ab536
44
SHA512 (cmake-3.22.3.tar.gz) = a35003468153b99770ac6bbdeaa611a231a1104560da36aca0f393b8b71dbb44d854378504d2ec6b4af615f78efe18d91453fe15a1b7ec58129aa0289a5a1507
@@ -18,7 +18,6 @@ SHA1 (patch-Source_Checks_Curses_CMakeLists.txt) = 37d95c6162cc1f4c0e47b537ac820
1818
SHA1 (patch-Source_Checks_Curses_CheckCurses.c) = c86cae48f7b39fb735eba4788d4e9d595b2ccf3b
1919
SHA1 (patch-Source_Checks_cm__cxx17__check.cpp) = d5e2708df6fcda078b1b5ea59264c663d2633ced
2020
SHA1 (patch-Source_QtDialog_CMakeLists.txt) = 0858da256bba174694a165d5f910eedb3faa06d5
21-
SHA1 (patch-Source_cmLocalGenerator.cxx) = 7b41e5837c2dcff54114541920c45258632275b0
2221
SHA1 (patch-Source_cmMachO.h) = 9d9065625e5f4df08e5a4ecf62b8582e3858f0bc
2322
SHA1 (patch-Utilities_KWIML_CMakeLists.txt) = e4bdf9fc58757e87bf7e3e3e195839eededbc796
2423
SHA1 (patch-bootstrap) = e34f5b888790e766338086b8c3680be79b71ef18

devel/cmake/patches/patch-Source_cmLocalGenerator.cxx

-15
This file was deleted.

0 commit comments

Comments
 (0)