From 32d3112a187eb12fdc9d7eea62634617aae35e07 Mon Sep 17 00:00:00 2001 From: ryoon Date: Thu, 25 Feb 2021 12:30:58 +0000 Subject: [PATCH] modular-xorg-xquartz, libAppleWM: Use predefined OSX_SDK_PATH The latest macOS Big Sur 11.2.1 and Xcode 12.4 as of 2021-02-24 do not provide 11.2 SDK. They provide 11.1 SDK instead. mk/platform/Darwin.mk has workaround for this situation. So use the workaround directly. OSX_SDK_PATH may be internal, however it is accessible over 5 years. It may not be a big problem hopefully. --- wm/libAppleWM/Makefile | 7 ++----- x11/modular-xorg-xquartz/Makefile | 7 ++----- 2 files changed, 4 insertions(+), 10 deletions(-) diff --git a/wm/libAppleWM/Makefile b/wm/libAppleWM/Makefile index 263d3ba36172..cdb867581a49 100644 --- a/wm/libAppleWM/Makefile +++ b/wm/libAppleWM/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2020/01/18 23:35:40 rillig Exp $ +# $NetBSD: Makefile,v 1.9 2021/02/25 12:30:58 ryoon Exp $ DISTNAME= libAppleWM-1.4.1 PKGREVISION= 1 @@ -21,10 +21,7 @@ USE_TOOLS+= pkg-config CONFIGURE_ENV+= LIB_MAN_SUFFIX=3 PKGCONFIG_OVERRIDE+= applewm.pc.in -.if exists(/usr/bin/xcrun) -MY_XCODE_SDK_PATH!= /usr/bin/xcrun --sdk macosx${OSX_VERSION} --show-sdk-path -.endif -MAKE_ENV+= OSX_SDK_PATH=${MY_XCODE_SDK_PATH} +MAKE_ENV+= OSX_SDK_PATH=${XCODE_SDK_PATH} .include "../../x11/xorgproto/buildlink3.mk" .include "../../x11/libX11/buildlink3.mk" diff --git a/x11/modular-xorg-xquartz/Makefile b/x11/modular-xorg-xquartz/Makefile index 1401efef4654..15d1bbef09ad 100644 --- a/x11/modular-xorg-xquartz/Makefile +++ b/x11/modular-xorg-xquartz/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.13 2020/05/22 10:56:48 adam Exp $ +# $NetBSD: Makefile,v 1.14 2021/02/25 12:30:58 ryoon Exp $ DISTNAME= xorg-server-1.17.2 PKGNAME= ${DISTNAME:S/xorg-server/modular-xorg-xquartz/} @@ -81,10 +81,7 @@ CONFIGURE_ENV+= ac_cv_path_RAWCPP="${PREFIX}/bin/tradcpp -Uunix" .include "../../security/nettle/buildlink3.mk" CONFIGURE_ARGS+= --with-sha1=libnettle -.if exists(/usr/bin/xcrun) -MY_XCODE_SDK_PATH!= /usr/bin/xcrun --sdk macosx${OSX_VERSION} --show-sdk-path -MAKE_ENV+= OSX_SDK_PATH=${MY_XCODE_SDK_PATH} -.endif +MAKE_ENV+= OSX_SDK_PATH=${XCODE_SDK_PATH} MESSAGE_SUBST+= PREFIX=${PREFIX}