Thu Mar 18 22:46:01 2010 UTC ()
imake should only ever use gmake if ${X11_TYPE}==native.  Pointed out by joerg@
Fixes PR 42274

OK wiz@


(sbd)
diff -r1.36 -r1.37 pkgsrc/mk/platform/Linux.mk
cvs diff -r1.36 -r1.37 pkgsrc/mk/platform/Linux.mk (expand / switch to unified diff)

--- pkgsrc/mk/platform/Linux.mk 2010/02/13 08:29:12 1.36
+++ pkgsrc/mk/platform/Linux.mk 2010/03/18 22:46:01 1.37
@@ -1,20 +1,21 @@ @@ -1,20 +1,21 @@
1# $NetBSD: Linux.mk,v 1.36 2010/02/13 08:29:12 obache Exp $ 1# $NetBSD: Linux.mk,v 1.37 2010/03/18 22:46:01 sbd Exp $
2# 2#
3# Variable definitions for the Linux operating system. 3# Variable definitions for the Linux operating system.
4 4
5ECHO_N?= ${ECHO} -n 5ECHO_N?= ${ECHO} -n
6.if !defined(X11_TYPE) || ${X11_TYPE} == "native" 6.if !defined(X11_TYPE) || ${X11_TYPE} == "native"
7IMAKE_MAKE?= ${GMAKE} # program which gets invoked by imake 7IMAKE_MAKE?= ${GMAKE} # program which gets invoked by imake
 8IMAKE_TOOLS= gmake # extra tools required when we use imake
8.endif 9.endif
9IMAKEOPTS+= -DBuildHtmlManPages=NO 10IMAKEOPTS+= -DBuildHtmlManPages=NO
10PKGLOCALEDIR?= share 11PKGLOCALEDIR?= share
11PS?= /bin/ps 12PS?= /bin/ps
12# XXX: default from defaults/mk.conf. Verify/correct for this platform 13# XXX: default from defaults/mk.conf. Verify/correct for this platform
13# and remove this comment. 14# and remove this comment.
14SU?= /bin/su 15SU?= /bin/su
15TYPE?= type # Shell builtin 16TYPE?= type # Shell builtin
16 17
17CPP_PRECOMP_FLAGS?= # unset 18CPP_PRECOMP_FLAGS?= # unset
18DEF_UMASK?= 022 19DEF_UMASK?= 022
19DEFAULT_SERIAL_DEVICE?= /dev/null 20DEFAULT_SERIAL_DEVICE?= /dev/null
20EXPORT_SYMBOLS_LDFLAGS?= # Don't add symbols to the dynamic symbol table 21EXPORT_SYMBOLS_LDFLAGS?= # Don't add symbols to the dynamic symbol table
@@ -46,27 +47,26 @@ IMAKE_MAN_SUFFIX= 1x @@ -46,27 +47,26 @@ IMAKE_MAN_SUFFIX= 1x
46IMAKE_LIBMAN_SUFFIX= 3x 47IMAKE_LIBMAN_SUFFIX= 3x
47IMAKE_KERNMAN_SUFFIX= 4 48IMAKE_KERNMAN_SUFFIX= 4
48IMAKE_FILEMAN_SUFFIX= 5x 49IMAKE_FILEMAN_SUFFIX= 5x
49IMAKE_GAMEMAN_SUFFIX= 6 50IMAKE_GAMEMAN_SUFFIX= 6
50IMAKE_MISCMAN_SUFFIX= 7 51IMAKE_MISCMAN_SUFFIX= 7
51IMAKE_MAN_DIR= ${IMAKE_MAN_SOURCE_PATH}1 52IMAKE_MAN_DIR= ${IMAKE_MAN_SOURCE_PATH}1
52IMAKE_LIBMAN_DIR= ${IMAKE_MAN_SOURCE_PATH}3 53IMAKE_LIBMAN_DIR= ${IMAKE_MAN_SOURCE_PATH}3
53IMAKE_KERNMAN_DIR= ${IMAKE_MAN_SOURCE_PATH}4 54IMAKE_KERNMAN_DIR= ${IMAKE_MAN_SOURCE_PATH}4
54IMAKE_FILEMAN_DIR= ${IMAKE_MAN_SOURCE_PATH}5 55IMAKE_FILEMAN_DIR= ${IMAKE_MAN_SOURCE_PATH}5
55IMAKE_GAMEMAN_DIR= ${IMAKE_MAN_SOURCE_PATH}6 56IMAKE_GAMEMAN_DIR= ${IMAKE_MAN_SOURCE_PATH}6
56IMAKE_MISCMAN_DIR= ${IMAKE_MAN_SOURCE_PATH}7 57IMAKE_MISCMAN_DIR= ${IMAKE_MAN_SOURCE_PATH}7
57IMAKE_MANNEWSUFFIX= ${IMAKE_MAN_SUFFIX} 58IMAKE_MANNEWSUFFIX= ${IMAKE_MAN_SUFFIX}
58IMAKE_MANINSTALL?= maninstall catinstall 59IMAKE_MANINSTALL?= maninstall catinstall
59IMAKE_TOOLS= gmake # extra tools required when we use imake 
60 60
61_OPSYS_EMULDIR.linux= # empty 61_OPSYS_EMULDIR.linux= # empty
62_OPSYS_EMULDIR.linux32= # empty 62_OPSYS_EMULDIR.linux32= # empty
63 63
64.if exists(/usr/include/netinet6) || exists(/usr/include/linux/in6.h) 64.if exists(/usr/include/netinet6) || exists(/usr/include/linux/in6.h)
65_OPSYS_HAS_INET6= yes # IPv6 is standard 65_OPSYS_HAS_INET6= yes # IPv6 is standard
66.else 66.else
67_OPSYS_HAS_INET6= no # IPv6 is not standard 67_OPSYS_HAS_INET6= no # IPv6 is not standard
68.endif 68.endif
69_OPSYS_HAS_JAVA= no # Java is not standard 69_OPSYS_HAS_JAVA= no # Java is not standard
70_OPSYS_HAS_MANZ= no # no MANZ for gzipping of man pages 70_OPSYS_HAS_MANZ= no # no MANZ for gzipping of man pages
71_OPSYS_HAS_OSSAUDIO= no # libossaudio is available 71_OPSYS_HAS_OSSAUDIO= no # libossaudio is available
72_OPSYS_PERL_REQD= # no base version of perl required 72_OPSYS_PERL_REQD= # no base version of perl required