Source-Changes-HG archive

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

[pkgsrc/trunk]: pkgsrc/editors/vim-share vim-share: Fix lua option.



details:   https://anonhg.NetBSD.org/pkgsrc/rev/e92aab358e4f
branches:  trunk
changeset: 435110:e92aab358e4f
user:      nia <nia%pkgsrc.org@localhost>
date:      Tue Jun 30 18:49:56 2020 +0000

description:
vim-share: Fix lua option.

Instead of the first unversioned lua interpreter being detected
(on NetBSD usually /usr/bin/lua), make sure the correct version
as selected by pkgsrc infrastructure gets used.

diffstat:

 editors/vim-share/options.mk |  14 +++++++++++---
 1 files changed, 11 insertions(+), 3 deletions(-)

diffs (31 lines):

diff -r 7fb93be4442d -r e92aab358e4f editors/vim-share/options.mk
--- a/editors/vim-share/options.mk      Tue Jun 30 17:38:02 2020 +0000
+++ b/editors/vim-share/options.mk      Tue Jun 30 18:49:56 2020 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.8 2019/11/02 19:57:01 tnn Exp $
+# $NetBSD: options.mk,v 1.9 2020/06/30 18:49:56 nia Exp $
 
 PKG_SUPPORTED_OPTIONS+=        ruby python perl lua luajit
 PKG_OPTIONS_VAR=       PKG_OPTIONS.vim
@@ -29,11 +29,19 @@
 .endif
 
 .if !empty(PKG_OPTIONS:Mlua)
+LUA_VERSIONS_ACCEPTED= 53 52 51
 .include "../../lang/lua/buildlink3.mk"
-CONFIGURE_ARGS+=   --enable-luainterp
+CONFIGURE_ARGS+=       --enable-luainterp
+CONFIGURE_ARGS+=       --with-lua-prefix=${BUILDLINK_PREFIX.lua}
+CONFIGURE_ENV+=                vi_cv_path_plain_lua=${LUA_INTERPRETER}
+# pkgsrc has include/lua-5.x instead of include/lua5.x
+SUBST_CLASSES+=                lua
+SUBST_FILES.lua=       auto/configure
+SUBST_STAGE.lua=       pre-configure
+SUBST_SED.lua=         -e "s,include/lua,include/lua-,g"
 .endif
 
 .if !empty(PKG_OPTIONS:Mluajit)
 .include "../../lang/LuaJIT2/buildlink3.mk"
-CONFIGURE_ARGS+=   --enable-luainterp --with-luajit
+CONFIGURE_ARGS+=       --enable-luainterp --with-luajit
 .endif



Home | Main Index | Thread Index | Old Index