kpriv/freebsd-ports
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

- Fix defining Lua include/library directories under PREFIX (last commit) [1].

Browse source 
- Now LUA_PREFIX has 2 functions: for Lua ports indicate where to install, and
  for dependencies indicate where Lua is installed (check new comments inside
  bsd.lua.mk for more information).

PR:		ports/120277
Submitted by:	Hirohisa Yamaguchi <umq@ueo.co.jp>
Reported by:	Dmitry Marakasov <amdmi3@amdmi3.ru> [1]
This commit is contained in:
Alejandro Pulver 2008-02-18 18:41:26 +00:00
parent d92f794d78
commit b3ec8aa81a
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=207535
1 changed files with 26 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
Mk/bsd.lua.mk
View file

@ -74,7 +74,9 @@
# LUA_VER_SH - The Lua shared library major version (e.g. "1").
# LUA_VER_STR - The Lua version without the dots (e.g. "51").
# LUA_PREFIX - The prefix where Lua (and components) is installed.
# NOTE: please see comments below about its double function.
# LUA_SUBDIR - The directory under bin/share/lib where Lua is installed.
# Also used by Lua ports (lang/lua*) to set LATEST_LINK.
# LUA_INCDIR - The directory where Lua and tolua header files are installed.
# LUA_LIBDIR - The directory where Lua and tolua libraries are installed.
# LUA_MODLIBDIR - The directory where Lua module libraries (.so) are installed.
@ -412,18 +414,37 @@ LUA_VER?= ${_LUA_VER}
LUA_VER_SH?= ${LUA_VER:C/[[:digit:]]\.([[:digit:]])/\1/}
LUA_VER_STR?= ${LUA_VER:S/.//g}
# Paths.
LUA_PREFIX?= ${PREFIX}
# Package name.
LUA_PKGNAMEPREFIX?= lua${LUA_VER_STR}-
LUA_SUBDIR?= lua${LUA_VER_STR}
# Currently Lua ports (those which install Lua and modules) must either:
# 1. Have PORTNAME=lua and LATEST_LINK=${LUA_SUBDIR} (currently Lua ports).
# 2. Have PKGNAMEPREFIX=${LUA_PKGNAMEPREFIX} (currently Lua modules).
# 3. Have LUA_PREFIX?=${PREFIX} (currently none).
#
# FIXME: the correct solution to this problem could be either:
# 1. Create a lua*-config script, and make dependent ports use it.
# 2. Set in each port if it's a "Lua module", or just requires Lua.
#
.if (defined(PKGNAMEPREFIX) && ${PKGNAMEPREFIX} == ${LUA_PKGNAMEPREFIX}) || \
(${PORTNAME} == "lua" && defined(LATEST_LINK) && \
${LATEST_LINK} == ${LUA_SUBDIR})
# For Lua and modules, which need to install in LUA_*DIR, respect PREFIX.
LUA_PREFIX?= ${PREFIX}
.else
# For dependencies using LUA_{INC,LIB}DIR, use LOCALBASE as expected.
LUA_PREFIX?= ${LOCALBASE}
.endif
# Paths.
LUA_BINDIR?= ${LUA_PREFIX}/bin/${LUA_SUBDIR}
LUA_INCDIR?= ${LUA_PREFIX}/include/${LUA_SUBDIR}
LUA_LIBDIR?= ${LUA_PREFIX}/lib/${LUA_SUBDIR}
LUA_MODLIBDIR?= ${LUA_PREFIX}/lib/lua/${LUA_VER}
LUA_MODSHAREDIR?= ${LUA_PREFIX}/share/lua/${LUA_VER}
# Package name.
LUA_PKGNAMEPREFIX?= lua${LUA_VER_STR}-
# Programs.
LUA_CMD?= ${LUA_PREFIX}/bin/lua-${LUA_VER}
LUAC_CMD?= ${LUA_PREFIX}/bin/luac-${LUA_VER}