Thu Nov 21 21:11:22 2019 UTC ()
remove bsdtar as tool because it was reverted in src for some reason ...


(tnn)
diff -r1.64 -r1.65 pkgsrc/mk/tools/tools.NetBSD.mk
cvs diff -r1.64 -r1.65 pkgsrc/mk/tools/tools.NetBSD.mk (switch to unified diff)

--- pkgsrc/mk/tools/tools.NetBSD.mk 2019/09/06 03:52:55 1.64
+++ pkgsrc/mk/tools/tools.NetBSD.mk 2019/11/21 21:11:22 1.65
@@ -1,176 +1,173 @@ @@ -1,176 +1,173 @@
1# $NetBSD: tools.NetBSD.mk,v 1.64 2019/09/06 03:52:55 ryoon Exp $ 1# $NetBSD: tools.NetBSD.mk,v 1.65 2019/11/21 21:11:22 tnn Exp $
2# 2#
3# System-supplied tools for the NetBSD operating system. 3# System-supplied tools for the NetBSD operating system.
4 4
5TOOLS_PLATFORM.[?= [ # shell builtin 5TOOLS_PLATFORM.[?= [ # shell builtin
6TOOLS_PLATFORM.awk?= /usr/bin/awk 6TOOLS_PLATFORM.awk?= /usr/bin/awk
7TOOLS_PLATFORM.basename?= /usr/bin/basename 7TOOLS_PLATFORM.basename?= /usr/bin/basename
8.if empty(MACHINE_PLATFORM:MNetBSD-[0-8].*-*) 
9TOOLS_PLATFORM.bsdtar?= /bin/tar 
10.endif 
11TOOLS_PLATFORM.byacc?= /usr/bin/yacc 8TOOLS_PLATFORM.byacc?= /usr/bin/yacc
12.if exists(/usr/bin/bzcat) 9.if exists(/usr/bin/bzcat)
13TOOLS_PLATFORM.bzcat?= /usr/bin/bzcat 10TOOLS_PLATFORM.bzcat?= /usr/bin/bzcat
14.endif 11.endif
15TOOLS_PLATFORM.bzip2?= /usr/bin/bzip2 12TOOLS_PLATFORM.bzip2?= /usr/bin/bzip2
16TOOLS_PLATFORM.cat?= /bin/cat 13TOOLS_PLATFORM.cat?= /bin/cat
17TOOLS_PLATFORM.chgrp?= /usr/bin/chgrp 14TOOLS_PLATFORM.chgrp?= /usr/bin/chgrp
18TOOLS_PLATFORM.chmod?= /bin/chmod 15TOOLS_PLATFORM.chmod?= /bin/chmod
19TOOLS_PLATFORM.chown?= /usr/sbin/chown 16TOOLS_PLATFORM.chown?= /usr/sbin/chown
20TOOLS_PLATFORM.cmp?= /usr/bin/cmp 17TOOLS_PLATFORM.cmp?= /usr/bin/cmp
21TOOLS_PLATFORM.cp?= /bin/cp 18TOOLS_PLATFORM.cp?= /bin/cp
22TOOLS_PLATFORM.csh?= /bin/csh 19TOOLS_PLATFORM.csh?= /bin/csh
23.if exists(/usr/bin/ctfconvert) 20.if exists(/usr/bin/ctfconvert)
24TOOLS_PLATFORM.ctfconvert?= /usr/bin/ctfconvert 21TOOLS_PLATFORM.ctfconvert?= /usr/bin/ctfconvert
25.endif 22.endif
26.if exists(/usr/bin/ctfmerge) 23.if exists(/usr/bin/ctfmerge)
27TOOLS_PLATFORM.ctfmerge?= /usr/bin/ctfmerge 24TOOLS_PLATFORM.ctfmerge?= /usr/bin/ctfmerge
28.endif 25.endif
29TOOLS_PLATFORM.cut?= /usr/bin/cut 26TOOLS_PLATFORM.cut?= /usr/bin/cut
30TOOLS_PLATFORM.date?= /bin/date 27TOOLS_PLATFORM.date?= /bin/date
31TOOLS_PLATFORM.diff?= /usr/bin/diff 28TOOLS_PLATFORM.diff?= /usr/bin/diff
32TOOLS_PLATFORM.diff3?= /usr/bin/diff3 29TOOLS_PLATFORM.diff3?= /usr/bin/diff3
33TOOLS_PLATFORM.dirname?= /usr/bin/dirname 30TOOLS_PLATFORM.dirname?= /usr/bin/dirname
34TOOLS_PLATFORM.echo?= echo # shell builtin 31TOOLS_PLATFORM.echo?= echo # shell builtin
35TOOLS_PLATFORM.egrep?= /usr/bin/egrep 32TOOLS_PLATFORM.egrep?= /usr/bin/egrep
36TOOLS_PLATFORM.env?= /usr/bin/env 33TOOLS_PLATFORM.env?= /usr/bin/env
37TOOLS_PLATFORM.expr?= /bin/expr 34TOOLS_PLATFORM.expr?= /bin/expr
38TOOLS_PLATFORM.false?= false # shell builtin 35TOOLS_PLATFORM.false?= false # shell builtin
39TOOLS_PLATFORM.fgrep?= /usr/bin/fgrep 36TOOLS_PLATFORM.fgrep?= /usr/bin/fgrep
40TOOLS_PLATFORM.file?= /usr/bin/file 37TOOLS_PLATFORM.file?= /usr/bin/file
41TOOLS_PLATFORM.find?= /usr/bin/find 38TOOLS_PLATFORM.find?= /usr/bin/find
42TOOLS_PLATFORM.flex?= /usr/bin/lex 39TOOLS_PLATFORM.flex?= /usr/bin/lex
43TOOLS_PLATFORM.ftp?= /usr/bin/ftp 40TOOLS_PLATFORM.ftp?= /usr/bin/ftp
44.if exists(/usr/bin/gettext) 41.if exists(/usr/bin/gettext)
45TOOLS_PLATFORM.gettext?= /usr/bin/gettext 42TOOLS_PLATFORM.gettext?= /usr/bin/gettext
46.endif 43.endif
47TOOLS_PLATFORM.gegrep?= /usr/bin/egrep 44TOOLS_PLATFORM.gegrep?= /usr/bin/egrep
48TOOLS_PLATFORM.gfgrep?= /usr/bin/fgrep 45TOOLS_PLATFORM.gfgrep?= /usr/bin/fgrep
49TOOLS_PLATFORM.ggrep?= /usr/bin/grep 46TOOLS_PLATFORM.ggrep?= /usr/bin/grep
50TOOLS_PLATFORM.grep?= /usr/bin/grep 47TOOLS_PLATFORM.grep?= /usr/bin/grep
51TOOLS_PLATFORM.groff?= /usr/bin/groff 48TOOLS_PLATFORM.groff?= /usr/bin/groff
52TOOLS_PLATFORM.gsoelim?= ${TOOLS_PLATFORM.soelim} # GNUish 49TOOLS_PLATFORM.gsoelim?= ${TOOLS_PLATFORM.soelim} # GNUish
53TOOLS_PLATFORM.gstrip?= /usr/bin/strip 50TOOLS_PLATFORM.gstrip?= /usr/bin/strip
54TOOLS_PLATFORM.gunzip?= /usr/bin/gunzip -f 51TOOLS_PLATFORM.gunzip?= /usr/bin/gunzip -f
55TOOLS_PLATFORM.gzcat?= /usr/bin/gzcat 52TOOLS_PLATFORM.gzcat?= /usr/bin/gzcat
56TOOLS_PLATFORM.gzip?= /usr/bin/gzip -nf ${GZIP} 53TOOLS_PLATFORM.gzip?= /usr/bin/gzip -nf ${GZIP}
57TOOLS_PLATFORM.head?= /usr/bin/head 54TOOLS_PLATFORM.head?= /usr/bin/head
58TOOLS_PLATFORM.hostname?= /bin/hostname 55TOOLS_PLATFORM.hostname?= /bin/hostname
59TOOLS_PLATFORM.id?= /usr/bin/id 56TOOLS_PLATFORM.id?= /usr/bin/id
60TOOLS_PLATFORM.ident?= /usr/bin/ident 57TOOLS_PLATFORM.ident?= /usr/bin/ident
61.if empty(USE_CROSS_COMPILE:M[yY][eE][sS]) 58.if empty(USE_CROSS_COMPILE:M[yY][eE][sS])
62TOOLS_PLATFORM.install?= /usr/bin/install 59TOOLS_PLATFORM.install?= /usr/bin/install
63.else 60.else
64TOOLS_PLATFORM.install?= ${TOOLDIR}/bin/${MACHINE_GNU_PLATFORM}-install 61TOOLS_PLATFORM.install?= ${TOOLDIR}/bin/${MACHINE_GNU_PLATFORM}-install
65.endif 62.endif
66.if exists(/usr/bin/install-info) 63.if exists(/usr/bin/install-info)
67TOOLS_PLATFORM.install-info?= /usr/bin/install-info 64TOOLS_PLATFORM.install-info?= /usr/bin/install-info
68.endif 65.endif
69.if exists(/sbin/ldconfig) && ${OBJECT_FMT} == "a.out" 66.if exists(/sbin/ldconfig) && ${OBJECT_FMT} == "a.out"
70TOOLS_PLATFORM.ldconfig?= /sbin/ldconfig 67TOOLS_PLATFORM.ldconfig?= /sbin/ldconfig
71.endif 68.endif
72TOOLS_PLATFORM.ksh?= /bin/ksh 69TOOLS_PLATFORM.ksh?= /bin/ksh
73TOOLS_PLATFORM.lex?= /usr/bin/lex 70TOOLS_PLATFORM.lex?= /usr/bin/lex
74TOOLS_PLATFORM.ln?= /bin/ln 71TOOLS_PLATFORM.ln?= /bin/ln
75TOOLS_PLATFORM.ls?= /bin/ls 72TOOLS_PLATFORM.ls?= /bin/ls
76TOOLS_PLATFORM.m4?= /usr/bin/m4 73TOOLS_PLATFORM.m4?= /usr/bin/m4
77TOOLS_PLATFORM.mail?= /usr/bin/mail 74TOOLS_PLATFORM.mail?= /usr/bin/mail
78.if exists(/usr/bin/makeinfo) 75.if exists(/usr/bin/makeinfo)
79TOOLS_PLATFORM.makeinfo?= /usr/bin/makeinfo 76TOOLS_PLATFORM.makeinfo?= /usr/bin/makeinfo
80.endif 77.endif
81TOOLS_PLATFORM.mkdir?= /bin/mkdir -p 78TOOLS_PLATFORM.mkdir?= /bin/mkdir -p
82TOOLS_PLATFORM.mktemp?= /usr/bin/mktemp 79TOOLS_PLATFORM.mktemp?= /usr/bin/mktemp
83.if exists(/usr/bin/msgconv) 80.if exists(/usr/bin/msgconv)
84TOOLS_PLATFORM.msgconv?= /usr/bin/msgconv 81TOOLS_PLATFORM.msgconv?= /usr/bin/msgconv
85.endif 82.endif
86.if exists(/usr/bin/msgfmt) 83.if exists(/usr/bin/msgfmt)
87TOOLS_PLATFORM.msgfmt?= /usr/bin/msgfmt 84TOOLS_PLATFORM.msgfmt?= /usr/bin/msgfmt
88.endif 85.endif
89.if exists(/usr/bin/msgmerge) 86.if exists(/usr/bin/msgmerge)
90TOOLS_PLATFORM.msgmerge?= /usr/bin/msgmerge 87TOOLS_PLATFORM.msgmerge?= /usr/bin/msgmerge
91.endif 88.endif
92TOOLS_PLATFORM.mtree?= /usr/sbin/mtree 89TOOLS_PLATFORM.mtree?= /usr/sbin/mtree
93TOOLS_PLATFORM.mv?= /bin/mv 90TOOLS_PLATFORM.mv?= /bin/mv
94TOOLS_PLATFORM.nice?= /usr/bin/nice 91TOOLS_PLATFORM.nice?= /usr/bin/nice
95TOOLS_PLATFORM.nroff?= /usr/bin/nroff 92TOOLS_PLATFORM.nroff?= /usr/bin/nroff
96TOOLS_PLATFORM.openssl?= /usr/bin/openssl 93TOOLS_PLATFORM.openssl?= /usr/bin/openssl
97TOOLS_PLATFORM.patch?= /usr/bin/patch 94TOOLS_PLATFORM.patch?= /usr/bin/patch
98TOOLS_PLATFORM.pax?= /bin/pax 95TOOLS_PLATFORM.pax?= /bin/pax
99.if exists(/usr/sbin/paxctl) 96.if exists(/usr/sbin/paxctl)
100TOOLS_PLATFORM.paxctl?= /usr/sbin/paxctl 97TOOLS_PLATFORM.paxctl?= /usr/sbin/paxctl
101.endif 98.endif
102TOOLS_PLATFORM.printf?= /usr/bin/printf 99TOOLS_PLATFORM.printf?= /usr/bin/printf
103TOOLS_PLATFORM.pwd?= /bin/pwd 100TOOLS_PLATFORM.pwd?= /bin/pwd
104.if empty(USE_CROSS_COMPILE:M[yY][eE][sS]) 101.if empty(USE_CROSS_COMPILE:M[yY][eE][sS])
105TOOLS_PLATFORM.readelf?= /usr/bin/readelf 102TOOLS_PLATFORM.readelf?= /usr/bin/readelf
106.else 103.else
107TOOLS_PLATFORM.readelf?= ${TOOLDIR}/bin/${MACHINE_GNU_PLATFORM}-readelf 104TOOLS_PLATFORM.readelf?= ${TOOLDIR}/bin/${MACHINE_GNU_PLATFORM}-readelf
108.endif 105.endif
109TOOLS_PLATFORM.readlink?= /usr/bin/readlink 106TOOLS_PLATFORM.readlink?= /usr/bin/readlink
110TOOLS_PLATFORM.rm?= /bin/rm 107TOOLS_PLATFORM.rm?= /bin/rm
111TOOLS_PLATFORM.rmdir?= /bin/rmdir 108TOOLS_PLATFORM.rmdir?= /bin/rmdir
112TOOLS_PLATFORM.sdiff?= /usr/bin/sdiff 109TOOLS_PLATFORM.sdiff?= /usr/bin/sdiff
113TOOLS_PLATFORM.sed?= /usr/bin/sed 110TOOLS_PLATFORM.sed?= /usr/bin/sed
114TOOLS_PLATFORM.sh?= /bin/sh 111TOOLS_PLATFORM.sh?= /bin/sh
115TOOLS_PLATFORM.shlock?= /usr/bin/shlock 112TOOLS_PLATFORM.shlock?= /usr/bin/shlock
116TOOLS_PLATFORM.sleep?= /bin/sleep 113TOOLS_PLATFORM.sleep?= /bin/sleep
117TOOLS_PLATFORM.soelim?= /usr/bin/soelim 114TOOLS_PLATFORM.soelim?= /usr/bin/soelim
118TOOLS_PLATFORM.sort?= /usr/bin/sort 115TOOLS_PLATFORM.sort?= /usr/bin/sort
119.if empty(USE_CROSS_COMPILE:M[yY][eE][sS]) 116.if empty(USE_CROSS_COMPILE:M[yY][eE][sS])
120TOOLS_PLATFORM.strip?= /usr/bin/strip 117TOOLS_PLATFORM.strip?= /usr/bin/strip
121.else 118.else
122TOOLS_PLATFORM.strip?= ${TOOLDIR}/bin/${MACHINE_GNU_PLATFORM}-strip 119TOOLS_PLATFORM.strip?= ${TOOLDIR}/bin/${MACHINE_GNU_PLATFORM}-strip
123.endif 120.endif
124 121
125TOOLS_PLATFORM.tail?= /usr/bin/tail 122TOOLS_PLATFORM.tail?= /usr/bin/tail
126.if exists(/bin/tar) 123.if exists(/bin/tar)
127TOOLS_PLATFORM.tar?= /bin/tar 124TOOLS_PLATFORM.tar?= /bin/tar
128.elif exists(/usr/bin/tar) 125.elif exists(/usr/bin/tar)
129TOOLS_PLATFORM.tar?= /usr/bin/tar 126TOOLS_PLATFORM.tar?= /usr/bin/tar
130.endif 127.endif
131TOOLS_PLATFORM.tbl?= /usr/bin/tbl 128TOOLS_PLATFORM.tbl?= /usr/bin/tbl
132TOOLS_PLATFORM.tee?= /usr/bin/tee 129TOOLS_PLATFORM.tee?= /usr/bin/tee
133TOOLS_PLATFORM.test?= test # shell builtin 130TOOLS_PLATFORM.test?= test # shell builtin
134TOOLS_PLATFORM.touch?= /usr/bin/touch 131TOOLS_PLATFORM.touch?= /usr/bin/touch
135TOOLS_PLATFORM.tr?= /usr/bin/tr 132TOOLS_PLATFORM.tr?= /usr/bin/tr
136TOOLS_PLATFORM.true?= true # shell builtin 133TOOLS_PLATFORM.true?= true # shell builtin
137TOOLS_PLATFORM.tsort?= /usr/bin/tsort 134TOOLS_PLATFORM.tsort?= /usr/bin/tsort
138TOOLS_PLATFORM.uniq?= /usr/bin/uniq 135TOOLS_PLATFORM.uniq?= /usr/bin/uniq
139.if exists(/usr/bin/unzip) 136.if exists(/usr/bin/unzip)
140TOOLS_PLATFORM.unzip?= /usr/bin/unzip 137TOOLS_PLATFORM.unzip?= /usr/bin/unzip
141.endif 138.endif
142TOOLS_PLATFORM.wc?= /usr/bin/wc 139TOOLS_PLATFORM.wc?= /usr/bin/wc
143TOOLS_PLATFORM.xargs?= /usr/bin/xargs 140TOOLS_PLATFORM.xargs?= /usr/bin/xargs
144.if exists(/usr/bin/xgettext) 141.if exists(/usr/bin/xgettext)
145TOOLS_PLATFORM.xgettext?= /usr/bin/xgettext 142TOOLS_PLATFORM.xgettext?= /usr/bin/xgettext
146.endif 143.endif
147.if exists(/usr/bin/xz) 144.if exists(/usr/bin/xz)
148TOOLS_PLATFORM.xz?= /usr/bin/xz 145TOOLS_PLATFORM.xz?= /usr/bin/xz
149.endif 146.endif
150.if exists(/usr/bin/xzcat) 147.if exists(/usr/bin/xzcat)
151TOOLS_PLATFORM.xzcat?= /usr/bin/xzcat 148TOOLS_PLATFORM.xzcat?= /usr/bin/xzcat
152.endif 149.endif
153TOOLS_PLATFORM.yacc?= /usr/bin/yacc 150TOOLS_PLATFORM.yacc?= /usr/bin/yacc
154 151
155.if !empty(USE_CROSS_COMPILE:M[yY][eE][sS]) 152.if !empty(USE_CROSS_COMPILE:M[yY][eE][sS])
156. for _t_ in ar as ld nm objcopy objdump ranlib readelf strip 153. for _t_ in ar as ld nm objcopy objdump ranlib readelf strip
157TOOLS_PATH.${MACHINE_GNU_PLATFORM}-${_t_}?= \ 154TOOLS_PATH.${MACHINE_GNU_PLATFORM}-${_t_}?= \
158 ${TOOLDIR}/bin/${MACHINE_GNU_PLATFORM}-${_t_} 155 ${TOOLDIR}/bin/${MACHINE_GNU_PLATFORM}-${_t_}
159TOOLS_CREATE+= ${MACHINE_GNU_PLATFORM}-${_t_} 156TOOLS_CREATE+= ${MACHINE_GNU_PLATFORM}-${_t_}
160. endfor 157. endfor
161 158
162TOOLS_PATH.ar?= ${TOOLDIR}/bin/${MACHINE_GNU_PLATFORM}-ar 159TOOLS_PATH.ar?= ${TOOLDIR}/bin/${MACHINE_GNU_PLATFORM}-ar
163TOOLS_CREATE+= ar 160TOOLS_CREATE+= ar
164TOOLS_PATH.ranlib?= ${TOOLDIR}/bin/${MACHINE_GNU_PLATFORM}-ranlib 161TOOLS_PATH.ranlib?= ${TOOLDIR}/bin/${MACHINE_GNU_PLATFORM}-ranlib
165TOOLS_CREATE+= ranlib 162TOOLS_CREATE+= ranlib
166 163
167NATIVE_CC:= /usr/bin/cc -B /usr/libexec -B /usr/bin 164NATIVE_CC:= /usr/bin/cc -B /usr/libexec -B /usr/bin
168CC= ${TOOLDIR}/bin/${MACHINE_GNU_PLATFORM}-gcc 165CC= ${TOOLDIR}/bin/${MACHINE_GNU_PLATFORM}-gcc
169 166
170NATIVE_CXX:= /usr/bin/c++ -B /usr/libexec -B /usr/bin 167NATIVE_CXX:= /usr/bin/c++ -B /usr/libexec -B /usr/bin
171CXX= ${TOOLDIR}/bin/${MACHINE_GNU_PLATFORM}-g++ 168CXX= ${TOOLDIR}/bin/${MACHINE_GNU_PLATFORM}-g++
172 169
173NATIVE_LD:= /usr/bin/ld 170NATIVE_LD:= /usr/bin/ld
174LD= ${TOOLDIR}/bin/${MACHINE_GNU_PLATFORM}-ld 171LD= ${TOOLDIR}/bin/${MACHINE_GNU_PLATFORM}-ld
175 172
176.endif 173.endif