Sat Jun 16 14:21:25 2012 UTC ()
switch to SUSE_PREFER=12.1 for NetBSD>=6.


(obache)
diff -r1.17 -r1.18 pkgsrc/mk/emulator/linux.mk
cvs diff -r1.17 -r1.18 pkgsrc/mk/emulator/linux.mk (expand / switch to unified diff)

--- pkgsrc/mk/emulator/linux.mk 2012/04/18 06:17:24 1.17
+++ pkgsrc/mk/emulator/linux.mk 2012/06/16 14:21:25 1.18
@@ -1,35 +1,36 @@ @@ -1,35 +1,36 @@
1# $NetBSD: linux.mk,v 1.17 2012/04/18 06:17:24 obache Exp $ 1# $NetBSD: linux.mk,v 1.18 2012/06/16 14:21:25 obache Exp $
2# 2#
3# Linux binary emulation framework 3# Linux binary emulation framework
4# 4#
5 5
6.if ${OPSYS} == "Linux" 6.if ${OPSYS} == "Linux"
7. if ${EMUL_ARCH} == ${MACHINE_ARCH} 7. if ${EMUL_ARCH} == ${MACHINE_ARCH}
8EMUL_TYPE.linux?= native 8EMUL_TYPE.linux?= native
9. else 9. else
10EMUL_TYPE.linux?= none 10EMUL_TYPE.linux?= none
11. endif 11. endif
12.else 12.else
13 13
14# NetBSD 5.99.50 or later default to 11.3, otherwise 10.0 14# NetBSD 5.99.50 or later default to 11.3, otherwise 10.0
15.if ${OPSYS} == "NetBSD" && ${EMUL_ARCH} != "powerpc" && \ 15.if ${OPSYS} == "NetBSD" && ${EMUL_ARCH} != "powerpc"
16 (empty(OS_VERSION:M[0-5].*) || \ 16. if empty(OS_VERSION:M[0-5].*)
17 !empty(OS_VERSION:M5.99.[5-9][0-9]) || \ 17SUSE_PREFER?= 12.1
18 !empty(OS_VERSION:M5.99.[0-9][0-9][0-9]*)) 18. elif !empty(OS_VERSION:M5.99.[5-9][0-9]) || \
 19 !empty(OS_VERSION:M5.99.[0-9][0-9][0-9]*)
19SUSE_PREFER?= 11.3 20SUSE_PREFER?= 11.3
20.else 21. endif
21SUSE_PREFER?= 10.0 
22.endif 22.endif
 23SUSE_PREFER?= 10.0
23 24
24.for _version_ in ${EMUL_REQD:Msuse>=*:S/suse>=//} 25.for _version_ in ${EMUL_REQD:Msuse>=*:S/suse>=//}
25SUSE_VERSION_REQD?= ${_version_} 26SUSE_VERSION_REQD?= ${_version_}
26.endfor 27.endfor
27.if !defined(SUSE_VERSION_REQD) || ${SUSE_PREFER} > ${SUSE_VERSION_REQD} 28.if !defined(SUSE_VERSION_REQD) || ${SUSE_PREFER} > ${SUSE_VERSION_REQD}
28SUSE_VERSION_REQD= ${SUSE_PREFER} 29SUSE_VERSION_REQD= ${SUSE_PREFER}
29.endif 30.endif
30 31
31EMUL_TYPE.linux?= suse-${SUSE_VERSION_REQD} 32EMUL_TYPE.linux?= suse-${SUSE_VERSION_REQD}
32.endif 33.endif
33EMUL_MODULES.linux?= # empty 34EMUL_MODULES.linux?= # empty
34 35
35.if ((${EMUL_ARCH} == "i386") && (${MACHINE_ARCH} == "x86_64")) || \ 36.if ((${EMUL_ARCH} == "i386") && (${MACHINE_ARCH} == "x86_64")) || \