Tue Sep 6 17:48:25 2011 UTC ()
Fix the logic so if a package sets EMUL_REQD to suse>=11.3, then use that in preference to SUSE_PREFER


(abs)
diff -r1.4 -r1.5 pkgsrc/mk/emulator/linux-suse.mk
diff -r1.8 -r1.9 pkgsrc/mk/emulator/linux.mk
cvs diff -r1.4 -r1.5 pkgsrc/mk/emulator/linux-suse.mk (expand / switch to unified diff)

--- pkgsrc/mk/emulator/linux-suse.mk 2010/09/24 01:30:36 1.4
+++ pkgsrc/mk/emulator/linux-suse.mk 2011/09/06 17:48:24 1.5
@@ -1,24 +1,18 @@ @@ -1,24 +1,18 @@
1# $NetBSD: linux-suse.mk,v 1.4 2010/09/24 01:30:36 chs Exp $ 1# $NetBSD: linux-suse.mk,v 1.5 2011/09/06 17:48:24 abs Exp $
2# 2#
3# SuSE Linux 3# SuSE Linux
4# 4#
5 5
6# Most Linux software only need suse>=6.4. 
7.for _version_ in ${EMUL_REQD:Msuse>=*:S/suse>=//} 
8SUSE_VERSION_REQD?= ${_version_} 
9.endfor 
10SUSE_VERSION_REQD?= 6.4 
11 
12# When building the SuSE packages, force the Linux type to be the specific 6# When building the SuSE packages, force the Linux type to be the specific
13# version of SuSE that is being built. 7# version of SuSE that is being built.
14# 8#
15.if defined(SUSE_PKG) && defined(SUSE_VERSION) 9.if defined(SUSE_PKG) && defined(SUSE_VERSION)
16EMUL_TYPE.linux= suse-${SUSE_VERSION} 10EMUL_TYPE.linux= suse-${SUSE_VERSION}
17.endif 11.endif
18 12
19# EMUL_TYPE.linux can be "suse" or "suse-[0-9]*". If the former, then use 13# EMUL_TYPE.linux can be "suse" or "suse-[0-9]*". If the former, then use
20# the default SuSE version, otherwise use the specific version requested. 14# the default SuSE version, otherwise use the specific version requested.
21# 15#
22.if !empty(EMUL_TYPE.linux:Msuse-10.[0x]) 16.if !empty(EMUL_TYPE.linux:Msuse-10.[0x])
23. include "${PKGSRCDIR}/emulators/suse100_linux/emulator.mk" 17. include "${PKGSRCDIR}/emulators/suse100_linux/emulator.mk"
24 18
cvs diff -r1.8 -r1.9 pkgsrc/mk/emulator/linux.mk (expand / switch to unified diff)

--- pkgsrc/mk/emulator/linux.mk 2011/02/27 15:54:03 1.8
+++ pkgsrc/mk/emulator/linux.mk 2011/09/06 17:48:24 1.9
@@ -1,22 +1,28 @@ @@ -1,22 +1,28 @@
1# $NetBSD: linux.mk,v 1.8 2011/02/27 15:54:03 chs Exp $ 1# $NetBSD: linux.mk,v 1.9 2011/09/06 17:48:24 abs 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"
7EMUL_TYPE.linux?= native 7EMUL_TYPE.linux?= native
8.else 8.else
9EMUL_TYPE.linux?= suse-${SUSE_PREFER} 9
 10.for _version_ in ${EMUL_REQD:Msuse>=*:S/suse>=//}
 11SUSE_VERSION_REQD?= ${_version_}
 12.endfor
 13SUSE_VERSION_REQD?= ${SUSE_PREFER}
 14
 15EMUL_TYPE.linux?= suse-${SUSE_VERSION_REQD}
10.endif 16.endif
11EMUL_MODULES.linux?= # empty 17EMUL_MODULES.linux?= # empty
12 18
13.if ((${EMUL_ARCH} == "i386") && (${MACHINE_ARCH} == "x86_64")) || \ 19.if ((${EMUL_ARCH} == "i386") && (${MACHINE_ARCH} == "x86_64")) || \
14 ((${EMUL_ARCH} == "sparc") && (${MACHINE_ARCH} == "sparc64")) 20 ((${EMUL_ARCH} == "sparc") && (${MACHINE_ARCH} == "sparc64"))
15_LINUX_BASE= linux32 21_LINUX_BASE= linux32
16EMULSUBDIR= emul/linux32 22EMULSUBDIR= emul/linux32
17.else 23.else
18_LINUX_BASE= linux 24_LINUX_BASE= linux
19EMULSUBDIR= emul/linux 25EMULSUBDIR= emul/linux
20.endif 26.endif
21 27
22EMULDIR= ${PREFIX}/${EMULSUBDIR} 28EMULDIR= ${PREFIX}/${EMULSUBDIR}