Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/share/mk Uncomment LUA_DPLIBS processing, but do not auto-in...



details:   https://anonhg.NetBSD.org/src/rev/39c10e746009
branches:  trunk
changeset: 770413:39c10e746009
user:      mbalmer <mbalmer%NetBSD.org@localhost>
date:      Sun Oct 16 00:45:09 2011 +0000

description:
Uncomment LUA_DPLIBS processing, but do not auto-include liblua.so,
under the assumption that programs that load Lua modules already have
loaded it.

diffstat:

 share/mk/bsd.lua.mk |  19 +++++++++----------
 1 files changed, 9 insertions(+), 10 deletions(-)

diffs (40 lines):

diff -r 5a5653837709 -r 39c10e746009 share/mk/bsd.lua.mk
--- a/share/mk/bsd.lua.mk       Sun Oct 16 00:32:25 2011 +0000
+++ b/share/mk/bsd.lua.mk       Sun Oct 16 00:45:09 2011 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: bsd.lua.mk,v 1.3 2011/10/08 08:35:56 mbalmer Exp $
+#      $NetBSD: bsd.lua.mk,v 1.4 2011/10/16 00:45:09 mbalmer Exp $
 #
 # Build rules and definitions for Lua modules
 
@@ -10,7 +10,6 @@
 #
 # LUA_MODULES  list of Lua modules to build/installi
 # LUA_DPLIBS   shared library dependencies as per LIBDPLIBS
-#              (liblua is automatically included)
 #
 # LUA_SRCS.mod sources for each module (by default: "${mod:S/./_/g}.lua")
 #
@@ -82,14 +81,14 @@
 
 ##
 ##### Libraries that modules may depend upon.
-#.for _lib _dir in lua ${NETBSDSRCDIR}/external/mit/lua/lib/liblua ${LUA_DPLIBS}
-#.if !defined(LIBDO.${_lib})
-#LIBDO.${_lib}!=       cd "${_dir}" && ${PRINTOBJDIR}
-#.MAKEOVERRIDES+=LIBDO.${_lib}
-#.endif
-#LDADD+=-L${LIBDO.${_lib}} -l${_lib}
-#DPADD+=${LIBDO.${_lib}}/lib${_lib}.so
-#.endfor
+.for _lib _dir in ${LUA_DPLIBS}
+.if !defined(LIBDO.${_lib})
+LIBDO.${_lib}!=        cd "${_dir}" && ${PRINTOBJDIR}
+.MAKEOVERRIDES+=LIBDO.${_lib}
+.endif
+LDADD+=-L${LIBDO.${_lib}} -l${_lib}
+DPADD+=${LIBDO.${_lib}}/lib${_lib}.so
+.endfor
 
 ##
 ##### Lua Modules



Home | Main Index | Thread Index | Old Index