diff options
| author | abs <abs@pkgsrc.org> | 2011-09-06 17:48:24 +0000 |
|---|---|---|
| committer | abs <abs@pkgsrc.org> | 2011-09-06 17:48:24 +0000 |
| commit | de24d61d937b6974a51fdc41013916ce08201c97 (patch) | |
| tree | 874bb29d9898bdc5f1645f2957dc15400ca912ed /mk | |
| parent | 7651ec34494b6412576379d715be7ae6b03e1f91 (diff) | |
| download | pkgsrc-de24d61d937b6974a51fdc41013916ce08201c97.tar.gz | |
Fix the logic so if a package sets EMUL_REQD to suse>=11.3, then use that in preference to SUSE_PREFER
Diffstat (limited to 'mk')
| -rw-r--r-- | mk/emulator/linux-suse.mk | 8 | ||||
| -rw-r--r-- | mk/emulator/linux.mk | 10 |
2 files changed, 9 insertions, 9 deletions
diff --git a/mk/emulator/linux-suse.mk b/mk/emulator/linux-suse.mk index f6d01d4d3f7..161ee6a1a8e 100644 --- a/mk/emulator/linux-suse.mk +++ b/mk/emulator/linux-suse.mk @@ -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. # diff --git a/mk/emulator/linux.mk b/mk/emulator/linux.mk index 54224bd0031..ecd812f8ed4 100644 --- a/mk/emulator/linux.mk +++ b/mk/emulator/linux.mk @@ -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 |