Skip to content

Commit

Permalink
cmake: Apply different fix for Darwin/aarch64.
Browse files Browse the repository at this point in the history
The previous patch was breaking cmake when running outside of the pkgsrc
environment.  Should fix #103.  Bump PKGREVISION.
  • Loading branch information
jperkin committed Mar 16, 2022
1 parent 07ee4ef commit 348f361
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 18 deletions.
10 changes: 9 additions & 1 deletion devel/cmake/Makefile
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
# $NetBSD: Makefile,v 1.190 2022/01/25 21:18:08 adam Exp $
# $NetBSD: Makefile,v 1.191 2022/03/16 18:36:47 jperkin Exp $

.include "Makefile.common"

PKGREVISION= 1
COMMENT= Cross platform make

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

.include "../../mk/bsd.prefs.mk"

# Enforce arm64 to support building inside x86_64 chroots.
.if !empty(MACHINE_PLATFORM:MDarwin-*-aarch64)
CONFIGURE_ENV+= CMAKE_OSX_ARCHITECTURES=arm64
.endif

PLIST_SUBST+= CMAKE_API=${CMAKE_API}

REPLACE_SH= Modules/Compiler/XL-Fortran/cpp
Expand Down
3 changes: 1 addition & 2 deletions devel/cmake/distinfo
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
$NetBSD: distinfo,v 1.192 2022/03/07 19:59:44 adam Exp $
$NetBSD: distinfo,v 1.193 2022/03/16 18:36:47 jperkin Exp $

BLAKE2s (cmake-3.22.3.tar.gz) = eafa5d81e2a1ab1cb7aee21fec3a4706330cb44ef0cbc9633be9fabad67ab536
SHA512 (cmake-3.22.3.tar.gz) = a35003468153b99770ac6bbdeaa611a231a1104560da36aca0f393b8b71dbb44d854378504d2ec6b4af615f78efe18d91453fe15a1b7ec58129aa0289a5a1507
Expand All @@ -18,7 +18,6 @@ SHA1 (patch-Source_Checks_Curses_CMakeLists.txt) = 37d95c6162cc1f4c0e47b537ac820
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-Source_cmMachO.h) = 9d9065625e5f4df08e5a4ecf62b8582e3858f0bc
SHA1 (patch-Utilities_KWIML_CMakeLists.txt) = e4bdf9fc58757e87bf7e3e3e195839eededbc796
SHA1 (patch-bootstrap) = e34f5b888790e766338086b8c3680be79b71ef18
15 changes: 0 additions & 15 deletions devel/cmake/patches/patch-Source_cmLocalGenerator.cxx

This file was deleted.

0 comments on commit 348f361

Please sign in to comment.