Sat Jul 4 07:15:22 2015 UTC ()
Fix QNX bootstrap.
>From Jan Danielsson.


(ryoon)
diff -r1.4 -r1.5 pkgsrc/mk/platform/QNX.mk
diff -r0 -r1.1 pkgsrc/mk/tools/tools.QNX.mk
cvs diff -r1.4 -r1.5 pkgsrc/mk/platform/QNX.mk (switch to unified diff)

--- pkgsrc/mk/platform/QNX.mk 2014/06/10 13:52:57 1.4
+++ pkgsrc/mk/platform/QNX.mk 2015/07/04 07:15:22 1.5
@@ -1,104 +1,103 @@ @@ -1,104 +1,103 @@
1# Variable definitions for the QNX operating system. 1# Variable definitions for the QNX operating system.
2 2
3CC= gcc 
4ECHO_N?= ${ECHO} -n 3ECHO_N?= ${ECHO} -n
5IMAKE_MAKE?= ${MAKE} # program which gets invoked by imake 4IMAKE_MAKE?= ${MAKE} # program which gets invoked by imake
6PKGLOCALEDIR?= share 5PKGLOCALEDIR?= share
7PS?= /bin/ps 6PS?= /bin/ps
8SU?= /bin/su 7SU?= /bin/su
9TYPE?= type # Shell builtin 8TYPE?= type # Shell builtin
10TOUCH_FLAGS?= 9TOUCH_FLAGS?=
11 10
12USERADD?= /usr/sbin/passwd 11USERADD?= /usr/sbin/passwd
13 12
14CPP_PRECOMP_FLAGS?= # unset 13CPP_PRECOMP_FLAGS?= # unset
15DEF_UMASK?= 0002 14DEF_UMASK?= 0002
16EXPORT_SYMBOLS_LDFLAGS?=-Wl,-E # add symbols to the dynamic symbol table 15EXPORT_SYMBOLS_LDFLAGS?=-Wl,-E # add symbols to the dynamic symbol table
17MOTIF_TYPE_DEFAULT?= openmotif # default 2.0 compatible libs type 16MOTIF_TYPE_DEFAULT?= openmotif # default 2.0 compatible libs type
18NOLOGIN?= /bin/false 17NOLOGIN?= /bin/false
19.if exists(${LOCALBASE}/sbin/pkg_info) 18.if exists(${LOCALBASE}/sbin/pkg_info)
20PKG_TOOLS_BIN?= ${LOCALBASE}/sbin 19PKG_TOOLS_BIN?= ${LOCALBASE}/sbin
21.else 20.else
22PKG_TOOLS_BIN?= /usr/sbin 21PKG_TOOLS_BIN?= /usr/sbin
23.endif 22.endif
24ROOT_CMD?= ${SU} - root -c 23ROOT_CMD?= ${SU} - root -c
25ROOT_USER?= root 24ROOT_USER?= root
26ROOT_GROUP?= root 25ROOT_GROUP?= root
27ULIMIT_CMD_datasize?= ulimit -d `ulimit -H -d` 26ULIMIT_CMD_datasize?= ulimit -d `ulimit -H -d`
28ULIMIT_CMD_stacksize?= ulimit -s `ulimit -H -s` 27ULIMIT_CMD_stacksize?= ulimit -s `ulimit -H -s`
29ULIMIT_CMD_memorysize?= ulimit -m `ulimit -H -m` 28ULIMIT_CMD_memorysize?= ulimit -m `ulimit -H -m`
30 29
31# QNX does not provide an X11, so default to modular X.org 30# QNX does not provide an X11, so default to modular X.org
32X11_TYPE?= modular 31X11_TYPE?= modular
33 32
34# imake installs manpages in weird places 33# imake installs manpages in weird places
35# these values from /usr/X11R6/lib/X11/config/NetBSD.cf 34# these values from /usr/X11R6/lib/X11/config/NetBSD.cf
36IMAKE_MAN_SOURCE_PATH= man/cat 35IMAKE_MAN_SOURCE_PATH= man/cat
37IMAKE_MANNEWSUFFIX= 0 36IMAKE_MANNEWSUFFIX= 0
38IMAKE_MAN_SUFFIX= ${IMAKE_MANNEWSUFFIX} 37IMAKE_MAN_SUFFIX= ${IMAKE_MANNEWSUFFIX}
39IMAKE_LIBMAN_SUFFIX= ${IMAKE_MANNEWSUFFIX} 38IMAKE_LIBMAN_SUFFIX= ${IMAKE_MANNEWSUFFIX}
40IMAKE_KERNMAN_SUFFIX= ${IMAKE_MANNEWSUFFIX} 39IMAKE_KERNMAN_SUFFIX= ${IMAKE_MANNEWSUFFIX}
41IMAKE_FILEMAN_SUFFIX= ${IMAKE_MANNEWSUFFIX} 40IMAKE_FILEMAN_SUFFIX= ${IMAKE_MANNEWSUFFIX}
42IMAKE_GAMEMAN_SUFFIX= ${IMAKE_MANNEWSUFFIX} 41IMAKE_GAMEMAN_SUFFIX= ${IMAKE_MANNEWSUFFIX}
43IMAKE_MISCMAN_SUFFIX= ${IMAKE_MANNEWSUFFIX} 42IMAKE_MISCMAN_SUFFIX= ${IMAKE_MANNEWSUFFIX}
44IMAKE_MAN_DIR= ${IMAKE_MAN_SOURCE_PATH}1 43IMAKE_MAN_DIR= ${IMAKE_MAN_SOURCE_PATH}1
45IMAKE_LIBMAN_DIR= ${IMAKE_MAN_SOURCE_PATH}3 44IMAKE_LIBMAN_DIR= ${IMAKE_MAN_SOURCE_PATH}3
46IMAKE_KERNMAN_DIR= ${IMAKE_MAN_SOURCE_PATH}4 45IMAKE_KERNMAN_DIR= ${IMAKE_MAN_SOURCE_PATH}4
47IMAKE_FILEMAN_DIR= ${IMAKE_MAN_SOURCE_PATH}5 46IMAKE_FILEMAN_DIR= ${IMAKE_MAN_SOURCE_PATH}5
48IMAKE_GAMEMAN_DIR= ${IMAKE_MAN_SOURCE_PATH}6 47IMAKE_GAMEMAN_DIR= ${IMAKE_MAN_SOURCE_PATH}6
49IMAKE_MISCMAN_DIR= ${IMAKE_MAN_SOURCE_PATH}7 48IMAKE_MISCMAN_DIR= ${IMAKE_MAN_SOURCE_PATH}7
50IMAKE_MANINSTALL?= maninstall catinstall 49IMAKE_MANINSTALL?= maninstall catinstall
51 50
52_OPSYS_SYSTEM_RPATH?= /lib:/usr/lib # STANDARD_LIBRARY_PATH 51_OPSYS_SYSTEM_RPATH?= /lib:/usr/lib # STANDARD_LIBRARY_PATH
53_OPSYS_LIB_DIRS?= /lib /usr/lib 52_OPSYS_LIB_DIRS?= /lib /usr/lib
54_OPSYS_INCLUDE_DIRS?= /usr/include 53_OPSYS_INCLUDE_DIRS?= /usr/include
55 54
56.if exists(/usr/include/netinet6) 55.if exists(/usr/include/netinet6)
57_OPSYS_HAS_INET6= yes # IPv6 is standard 56_OPSYS_HAS_INET6= yes # IPv6 is standard
58.else 57.else
59_OPSYS_HAS_INET6= no # IPv6 is not standard 58_OPSYS_HAS_INET6= no # IPv6 is not standard
60.endif 59.endif
61_OPSYS_HAS_JAVA= no # Java is not standard 60_OPSYS_HAS_JAVA= no # Java is not standard
62_OPSYS_HAS_MANZ= no # MANZ controls gzipping of man pages 61_OPSYS_HAS_MANZ= no # MANZ controls gzipping of man pages
63_OPSYS_HAS_OSSAUDIO= no # libossaudio is not available 62_OPSYS_HAS_OSSAUDIO= no # libossaudio is not available
64_OPSYS_PERL_REQD= # no base version of perl required 63_OPSYS_PERL_REQD= # no base version of perl required
65_OPSYS_PTHREAD_AUTO= yes # -lpthread not needed for pthreads 64_OPSYS_PTHREAD_AUTO= yes # -lpthread not needed for pthreads
66_OPSYS_SHLIB_TYPE= ELF # shared lib type 65_OPSYS_SHLIB_TYPE= ELF # shared lib type
67_PATCH_CAN_BACKUP= yes # native patch(1) can make backups 66_PATCH_CAN_BACKUP= yes # native patch(1) can make backups
68_PATCH_BACKUP_ARG?= -V simple -b -z # switch to patch(1) for backup suffix 67_PATCH_BACKUP_ARG?= -V simple -b -z # switch to patch(1) for backup suffix
69_USE_RPATH= yes # add rpath to LDFLAGS 68_USE_RPATH= yes # add rpath to LDFLAGS
70 69
71# flags passed to the linker to extract all symbols from static archives. 70# flags passed to the linker to extract all symbols from static archives.
72# this is GNU ld. 71# this is GNU ld.
73_OPSYS_WHOLE_ARCHIVE_FLAG= -Wl,--whole-archive 72_OPSYS_WHOLE_ARCHIVE_FLAG= -Wl,--whole-archive
74_OPSYS_NO_WHOLE_ARCHIVE_FLAG= -Wl,--no-whole-archive 73_OPSYS_NO_WHOLE_ARCHIVE_FLAG= -Wl,--no-whole-archive
75 74
76_STRIPFLAG_CC?= ${_INSTALL_UNSTRIPPED:D:U-s} # cc(1) option to strip 75_STRIPFLAG_CC?= ${_INSTALL_UNSTRIPPED:D:U-s} # cc(1) option to strip
77_STRIPFLAG_INSTALL?= ${_INSTALL_UNSTRIPPED:D:U-s} # install(1) option to strip 76_STRIPFLAG_INSTALL?= ${_INSTALL_UNSTRIPPED:D:U-s} # install(1) option to strip
78 77
79DEFAULT_SERIAL_DEVICE?= /dev/ser1 78DEFAULT_SERIAL_DEVICE?= /dev/ser1
80SERIAL_DEVICES?= /dev/ser1 \ 79SERIAL_DEVICES?= /dev/ser1 \
81 /dev/ser2 80 /dev/ser2
82_OPSYS_CAN_CHECK_SHLIBS= yes # use readelf in check/bsd.check-vars.mk 81_OPSYS_CAN_CHECK_SHLIBS= yes # use readelf in check/bsd.check-vars.mk
83 82
84# check for maximum command line length and set it in configure's environment, 83# check for maximum command line length and set it in configure's environment,
85# to avoid a test required by the libtool script that takes forever. 84# to avoid a test required by the libtool script that takes forever.
86_OPSYS_MAX_CMDLEN_CMD= /usr/bin/getconf ARG_MAX 85_OPSYS_MAX_CMDLEN_CMD= /usr/bin/getconf ARG_MAX
87 86
88# If games are to be installed setgid, then SETGIDGAME is set to 'yes' 87# If games are to be installed setgid, then SETGIDGAME is set to 'yes'
89# (it defaults to 'no' as per defaults/mk.conf). 88# (it defaults to 'no' as per defaults/mk.conf).
90# Set the group and mode to meaningful values in that case (defaults to 89# Set the group and mode to meaningful values in that case (defaults to
91# BINOWN, BINGRP and BINMODE as per defaults/mk.conf). 90# BINOWN, BINGRP and BINMODE as per defaults/mk.conf).
92.if !(empty(SETGIDGAME:M[yY][eE][sS])) 91.if !(empty(SETGIDGAME:M[yY][eE][sS]))
93GAMES_USER= games 92GAMES_USER= games
94GAMES_GROUP= games 93GAMES_GROUP= games
95GAMEOWN= ${GAMES_USER} 94GAMEOWN= ${GAMES_USER}
96GAMEGRP= ${GAMES_GROUP} 95GAMEGRP= ${GAMES_GROUP}
97GAMEMODE= 2555 96GAMEMODE= 2555
98GAMEDIRMODE= 0775 97GAMEDIRMODE= 0775
99.endif 98.endif
100 99
101_OPSYS_PREFER.zlib?= pkgsrc 100_OPSYS_PREFER.zlib?= pkgsrc
102_OPSYS_PREFER.bzip2?= pkgsrc 101_OPSYS_PREFER.bzip2?= pkgsrc
103_OPSYS_PREFER.curses?= pkgsrc 102_OPSYS_PREFER.curses?= pkgsrc
104_OPSYS_PREFER.termcap?= pkgsrc 103_OPSYS_PREFER.termcap?= pkgsrc
File Added: pkgsrc/mk/tools/tools.QNX.mk
# $NetBSD: tools.QNX.mk,v 1.1 2015/07/04 07:15:22 ryoon Exp $
#
# System-supplied tools for the QNX operating system.

TOOLS_PLATFORM.[?=		[			# shell builtin
TOOLS_PLATFORM.awk?=		/usr/bin/awk
TOOLS_PLATFORM.basename?=	/usr/bin/basename
TOOLS_PLATFORM.bison?=		${QNX_HOST}/usr/bin/bison
TOOLS_PLATFORM.bison-yacc?=	${QNX_HOST}/usr/bin/bison -y
TOOLS_PLATFORM.bzcat?=		/usr/bin/bzcat
TOOLS_PLATFORM.bzip2?=		/usr/bin/bzip2
TOOLS_PLATFORM.cat?=		/bin/cat
TOOLS_PLATFORM.chgrp?=		/bin/chgrp
TOOLS_PLATFORM.chmod?=		/bin/chmod
TOOLS_PLATFORM.chown?=		/bin/chown
TOOLS_PLATFORM.cmp?=		/usr/bin/cmp
TOOLS_PLATFORM.cp?=		/bin/cp
TOOLS_PLATFORM.cpp?=		${QNX_HOST}/usr/bin/cpp
TOOLS_PLATFORM.cut?=		/usr/bin/cut
TOOLS_PLATFORM.date?=		/usr/bin/date
TOOLS_PLATFORM.diff?=		/usr/bin/diff
TOOLS_PLATFORM.diff3?=		/usr/bin/diff3
TOOLS_PLATFORM.dirname?=	/usr/bin/dirname
TOOLS_PLATFORM.echo?=		echo			# shell builtin
TOOLS_PLATFORM.egrep?=		/usr/bin/egrep
TOOLS_PLATFORM.env?=		/usr/bin/env
TOOLS_PLATFORM.expr?=		/usr/bin/expr
TOOLS_PLATFORM.false?=		false			# shell builtin
TOOLS_PLATFORM.fgrep?=		/usr/bin/fgrep
TOOLS_PLATFORM.file?=		/usr/bin/file
TOOLS_PLATFORM.find?=		/usr/bin/find
TOOLS_PLATFORM.flex?=		${QNX_HOST}/usr/bin/flex
TOOLS_PLATFORM.ftp?=		/usr/bin/ftp
TOOLS_PLATFORM.gawk?=		/usr/bin/gawk
TOOLS_PLATFORM.grep?=		/usr/bin/grep
TOOLS_PLATFORM.groff?=		${QNX_HOST}/usr/bin/groff
TOOLS_PLATFORM.gunzip?=		/bin/gunzip -f
TOOLS_PLATFORM.gzcat?=		/bin/gzip -dc
TOOLS_PLATFORM.gzip?=		/bin/gzip -nf ${GZIP}
TOOLS_PLATFORM.head?=		/usr/bin/head
TOOLS_PLATFORM.hostname?=	/bin/hostname
TOOLS_PLATFORM.id?=		/usr/bin/id
TOOLS_PLATFORM.ksh?=		/bin/ksh
TOOLS_PLATFORM.lex?=		${QNX_HOST}/usr/bin/lex
TOOLS_PLATFORM.ln?=		/bin/ln
TOOLS_PLATFORM.ls?=		/bin/ls
TOOLS_PLATFORM.m4?=		${QNX_HOST}/usr/bin/m4
TOOLS_PLATFORM.gmake?=		${QNX_HOST}/usr/bin/make
TOOLS_PLATFORM.mkdir?=		/bin/mkdir -p
TOOLS_PLATFORM.mv?=		/bin/mv
TOOLS_PLATFORM.nice?=		/usr/bin/nice
TOOLS_PLATFORM.nroff?=		${QNX_HOST}/usr/bin/nroff
TOOLS_PLATFORM.openssl?=	/usr/bin/openssl
TOOLS_PLATFORM.patch?=		/usr/bin/patch
TOOLS_PLATFORM.pax?=		/bin/pax
TOOLS_PLATFORM.printf?=		/usr/bin/printf
TOOLS_PLATFORM.pwd?=		/bin/pwd
.if empty(USE_CROSS_COMPILE:M[yY][eE][sS])
TOOLS_PLATFORM.readelf?=	${QNX_HOST}/usr/bin/readelf
.endif
TOOLS_PLATFORM.rm?=		/bin/rm
TOOLS_PLATFORM.rmdir?=		/usr/bin/rmdir
TOOLS_PLATFORM.sed?=		/usr/bin/sed
TOOLS_PLATFORM.sh?=		/bin/sh
TOOLS_PLATFORM.sleep?=		/usr/bin/sleep
TOOLS_PLATFORM.soelim?=		${QNX_HOST}/usr/bin/soelim
TOOLS_PLATFORM.sort?=		/usr/bin/sort
.if empty(USE_CROSS_COMPILE:M[yY][eE][sS])
TOOLS_PLATFORM.strip?=		${QNX_HOST}/usr/bin/strip
.endif
TOOLS_PLATFORM.tail?=		/usr/bin/tail
TOOLS_PLATFORM.tar?=		/usr/bin/tar
TOOLS_PLATFORM.tbl?=		${QNX_HOST}/usr/bin/tbl
TOOLS_PLATFORM.tee?=		/usr/bin/tee
TOOLS_PLATFORM.test?=		test			# shell builtin
TOOLS_PLATFORM.touch?=		/usr/bin/touch
TOOLS_PLATFORM.tr?=		/usr/bin/tr
TOOLS_PLATFORM.true?=		true			# shell builtin
TOOLS_PLATFORM.tsort?=		/usr/bin/tsort
TOOLS_PLATFORM.uniq?=		/usr/bin/uniq
TOOLS_PLATFORM.unzip?=		/usr/bin/unzip
TOOLS_PLATFORM.wc?=		/usr/bin/wc
TOOLS_PLATFORM.xargs?=		/usr/bin/xargs
TOOLS_PLATFORM.yacc?=		${QNX_HOST}/usr/bin/bison -y



.if !empty(USE_CROSS_COMPILE:M[yY][eE][sS])
.  for _t_ in ar as ld nm objcopy objdump ranlib readelf strip
TOOLS_PATH.${MACHINE_GNU_PLATFORM}-${_t_}?=	\
	${QNX_HOST}/usr/bin/nto${MACHINE_GNU_PLATFORM}-${_t_}
TOOLS_CREATE+=	${MACHINE_GNU_PLATFORM}-${_t_}
.  endfor
TOOLS_PATH.ar?=			${QNX_HOST}/usr/bin/${MACHINE_GNU_PLATFORM}-ar
TOOLS_CREATE+=			ar
TOOLS_PATH.ranlib?=		${QNX_HOST}/usr/bin/${MACHINE_GNU_PLATFORM}-ranlib
TOOLS_CREATE+=			ranlib

NATIVE_CC:=	${QNX_HOST}/usr/bin/qcc
CC=		${QNX_HOST}/usr/bin/qcc -V gcc_nto${MACHINE_GNU_PLATFORM}

NATIVE_CXX:=	${QNX_HOST}/usr/bin/QCC
CXX=		${QNX_HOST}/usr/bin/QCC -V gcc_nto${MACHINE_GNU_PLATFORM}

NATIVE_LD:=	${QNX_HOST}/usr/bin/ld
LD=		${QNX_HOST}/usr/bin/nto${MACHINE_GNU_PLATFORM}-ld

.endif