kpriv/pkgsrc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fix the logic so if a package sets EMUL_REQD to suse>=11.3, then use that in preference to SUSE_PREFER

Browse source
This commit is contained in:
abs 2011-09-06 17:48:24 +00:00
parent 70412efedb
commit 5584fc2d1b
2 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
mk/emulator/linux-suse.mk
View file

@ -1,14 +1,8 @@
# $NetBSD: linux-suse.mk,v 1.4 2010/09/24 01:30:36 chs Exp $
# $NetBSD: linux-suse.mk,v 1.5 2011/09/06 17:48:24 abs Exp $
#
# SuSE Linux
#
# Most Linux software only need suse>=6.4.
.for _version_ in ${EMUL_REQD:Msuse>=*:S/suse>=//}
SUSE_VERSION_REQD?= ${_version_}
.endfor
SUSE_VERSION_REQD?= 6.4
# When building the SuSE packages, force the Linux type to be the specific
# version of SuSE that is being built.
#

10
mk/emulator/linux.mk
View file

@ -1,4 +1,4 @@
# $NetBSD: linux.mk,v 1.8 2011/02/27 15:54:03 chs Exp $
# $NetBSD: linux.mk,v 1.9 2011/09/06 17:48:24 abs Exp $
#
# Linux binary emulation framework
#
@ -6,7 +6,13 @@
.if ${OPSYS} == "Linux"
EMUL_TYPE.linux?= native
.else
EMUL_TYPE.linux?= suse-${SUSE_PREFER}
.for _version_ in ${EMUL_REQD:Msuse>=*:S/suse>=//}
SUSE_VERSION_REQD?= ${_version_}
.endfor
SUSE_VERSION_REQD?= ${SUSE_PREFER}
EMUL_TYPE.linux?= suse-${SUSE_VERSION_REQD}
.endif
EMUL_MODULES.linux?= # empty