cpet/freebsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix logic in lua version selection

Browse Source 
Reviewed by:	bapt, mat
Differential Revision:	https://reviews.freebsd.org/D16275
This commit is contained in:
Antoine Brodin 2018-07-17 12:00:46 +00:00
parent 4dbb03aeaa
commit 8fdc1353e5
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=474794
1 changed files with 19 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
Mk/Uses/lua.mk
View File

@ -24,7 +24,15 @@ IGNORE= Invalid lua version ${LUA_DEFAULT}
#
.if ${lua_ARGS:M*+}
_LUA_MIN_VERSION:= ${lua_ARGS:M*+:S/+//}
_LUA_WANTED_VERSION:= ${_LUA_DEFAULT_VERSION}
#
# Resolve minimum versions (ver+). Append anything greater or equal than the
# specified minimum version to the list of wanted versions.
#
. for _v in ${_LUA_VALID_VERSIONS}
. if ${_LUA_MIN_VERSION} <= ${_v}
_LUA_WANTED_VERSIONS+=${_v}
. endif
. endfor
.endif
#
@ -42,18 +50,6 @@ _LUA_WANTED_VERSIONS:= ${lua_ARGS:M5[1-3]}
_LUA_WANTED_VERSIONS= ${_LUA_DEFAULT_VERSION}
.endif
#
# Resolve minimum versions (ver+). Append anything greater or equal than the
# specified minimum version to the list of wanted versions.
#
.if defined(_LUA_MIN_VERSION)
. for _v in ${_LUA_VALID_VERSIONS}
. if ${_LUA_MIN_VERSION} <= ${_v}
_LUA_WANTED_VERSIONS+=${_v}
. endif
. endfor
.endif
#
# Right now we have built a list of potential versions that we may depend on.
# Let's sort them and remove any duplicates. We then locate the highest one
@ -62,14 +58,20 @@ _LUA_WANTED_VERSIONS+=${_v}
.for _v in ${_LUA_WANTED_VERSIONS:O:u}
_LUA_HIGHEST_VERSION:=${_v}
. if exists(${LOCALBASE}/bin/lua${_v})
_LUA_WANTED_VERSION:= ${_v}
_LUA_HIGHEST_INSTALLED_VERSION:= ${_v}
. endif
.endfor
#
# If we couldn't find any wanted version installed, depend on the highest one.
.if !defined(_LUA_WANTED_VERSION)
_LUA_WANTED_VERSION:= ${_LUA_HIGHEST_VERSION}
# Depend on the default version if it fits, or the highest installed version,
# or the highest version.
#
.if ${_LUA_WANTED_VERSIONS:M${_LUA_DEFAULT_VERSION}}
_LUA_WANTED_VERSION:= ${_LUA_DEFAULT_VERSION}
.elif defined(_LUA_HIGHEST_INSTALLED_VERSION)
_LUA_WANTED_VERSION:= ${_LUA_HIGHEST_INSTALLED_VERSION}
.else
_LUA_WANTED_VERSION:= ${_LUA_HIGHEST_VERSION}
.endif
#