Wed May 10 09:23:54 2023 UTC ()
mk: Limit Darwin ECHO_N hack to /bin/sh.


(jperkin)
diff -r1.124 -r1.125 pkgsrc/mk/platform/Darwin.mk
cvs diff -r1.124 -r1.125 pkgsrc/mk/platform/Darwin.mk (expand / switch to unified diff)

--- pkgsrc/mk/platform/Darwin.mk 2023/02/02 21:24:43 1.124
+++ pkgsrc/mk/platform/Darwin.mk 2023/05/10 09:23:54 1.125
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Darwin.mk,v 1.124 2023/02/02 21:24:43 jklos Exp $ 1# $NetBSD: Darwin.mk,v 1.125 2023/05/10 09:23:54 jperkin Exp $
2# 2#
3# Variable definitions for the Darwin operating system. 3# Variable definitions for the Darwin operating system.
4 4
5# OS, Kernel, Xcode Version 5# OS, Kernel, Xcode Version
6# Note that Xcode gets updates on older systems sometimes. 6# Note that Xcode gets updates on older systems sometimes.
7# pkgsrc generally expects that the most up-to-date xcode available for 7# pkgsrc generally expects that the most up-to-date xcode available for
8# an OS version is installed 8# an OS version is installed
9# 9#
10# Codename OS Kernel Xcode 10# Codename OS Kernel Xcode
11# ------------ ------- ------ --------------------------- 11# ------------ ------- ------ ---------------------------
12# Cheetah 10.0.x 1.3.1 12# Cheetah 10.0.x 1.3.1
13# Puma 10.1.x 5.x.y 13# Puma 10.1.x 5.x.y
14# Jaguar 10.2.x 6.x.y 14# Jaguar 10.2.x 6.x.y
@@ -29,27 +29,27 @@ @@ -29,27 +29,27 @@
29# Monterey 12.x 21.x.y 13.x (llvm clang 13) 29# Monterey 12.x 21.x.y 13.x (llvm clang 13)
30# Ventura 13.x 22.x.y 14.1+ (llvm clang 14) 30# Ventura 13.x 22.x.y 14.1+ (llvm clang 14)
31# 31#
32 32
33# Tiger (and earlier) use Xfree 4.4.0 (and earlier) 33# Tiger (and earlier) use Xfree 4.4.0 (and earlier)
34.if ${OPSYS_VERSION} < 100500 34.if ${OPSYS_VERSION} < 100500
35X11_TYPE?= native 35X11_TYPE?= native
36.endif 36.endif
37 37
38.if !defined(CPP) || ${CPP} == "cpp" 38.if !defined(CPP) || ${CPP} == "cpp"
39CPP= ${CC} -E ${CPP_PRECOMP_FLAGS} 39CPP= ${CC} -E ${CPP_PRECOMP_FLAGS}
40.endif 40.endif
41# bash invoked as /bin/sh on Leopard and newer does not support echo -n. 41# bash invoked as /bin/sh on Leopard and newer does not support echo -n.
42.if ${OPSYS_VERSION} >= 100500 42.if ${OPSYS_VERSION} >= 100500 && ${TOOLS_PLATFORM.sh} == "/bin/sh"
43ECHO_N?= /bin/echo -n 43ECHO_N?= /bin/echo -n
44.else 44.else
45ECHO_N?= ${ECHO} -n 45ECHO_N?= ${ECHO} -n
46.endif 46.endif
47LDD?= /usr/bin/otool -L 47LDD?= /usr/bin/otool -L
48IMAKE_MAKE?= ${MAKE} # program which gets invoked by imake 48IMAKE_MAKE?= ${MAKE} # program which gets invoked by imake
49PKGLOCALEDIR?= share 49PKGLOCALEDIR?= share
50PS?= /bin/ps 50PS?= /bin/ps
51# XXX: default from defaults/mk.conf. Verify/correct for this platform 51# XXX: default from defaults/mk.conf. Verify/correct for this platform
52# and remove this comment. 52# and remove this comment.
53SU?= /usr/bin/su 53SU?= /usr/bin/su
54TYPE?= type # Shell builtin 54TYPE?= type # Shell builtin
55IMAKEOPTS+= -DBuildHtmlManPages=NO 55IMAKEOPTS+= -DBuildHtmlManPages=NO