summaryrefslogtreecommitdiff
path: root/x11
diff options
context:
space:
mode:
authorryoon <ryoon@pkgsrc.org>2021-02-25 12:30:58 +0000
committerryoon <ryoon@pkgsrc.org>2021-02-25 12:30:58 +0000
commitc4ef167691729a0973f653a6136ca7827ef37ef3 (patch)
tree09e0be84a98bd8b3db0615d620e44c3bb1d7b7aa /x11
parentea0ee048a88f8994a49c2afe459a1a663024334d (diff)
downloadpkgsrc-c4ef167691729a0973f653a6136ca7827ef37ef3.tar.gz
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.
Diffstat (limited to 'x11')
-rw-r--r--x11/modular-xorg-xquartz/Makefile7
1 files changed, 2 insertions, 5 deletions
diff --git a/x11/modular-xorg-xquartz/Makefile b/x11/modular-xorg-xquartz/Makefile
index 1401efef465..15d1bbef09a 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}