Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 17 Jul 2018 12:00:46 +0000 (UTC)
From:      Antoine Brodin <antoine@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r474794 - head/Mk/Uses
Message-ID:  <201807171200.w6HC0kT1097830@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: antoine
Date: Tue Jul 17 12:00:46 2018
New Revision: 474794
URL: https://svnweb.freebsd.org/changeset/ports/474794

Log:
  Fix logic in lua version selection
  
  Reviewed by:	bapt, mat
  Differential Revision:	https://reviews.freebsd.org/D16275

Modified:
  head/Mk/Uses/lua.mk

Modified: head/Mk/Uses/lua.mk
==============================================================================
--- head/Mk/Uses/lua.mk	Tue Jul 17 10:30:24 2018	(r474793)
+++ head/Mk/Uses/lua.mk	Tue Jul 17 12:00:46 2018	(r474794)
@@ -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
 
 #
@@ -43,18 +51,6 @@ _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
 # already installed, if any.
@@ -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
 
 #



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201807171200.w6HC0kT1097830>