Skip to content

Commit d03702f

Browse files
committed
Vim: fix installation of Lua
Installs symlinks for Vim to pick it up (vim/vim#4475). tests: clean lua stamp file Closes #65.
1 parent 886e7f6 commit d03702f

File tree

3 files changed

+5
-1
lines changed

3 files changed

+5
-1
lines changed

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
TAG:=13
1+
TAG:=14
22

33
build:
44
docker build -t testbed/vim:$(TAG) .

example/Makefile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,7 @@ test:
7070
if [ "$$(<$(WRITABLE_HOME)/lua)" != "lua was here" ]; then \
7171
echo "Failed to get output from Lua for $${vim}." >&2; exit 1; \
7272
fi; \
73+
$(RM) $(WRITABLE_HOME)/lua; \
7374
done; \
7475
neovim_tag_version=$$(docker run --rm "$(IMAGE)" neovim-v0.2.0 -u NONE --version | grep '^NVIM'); \
7576
if [ "$$neovim_tag_version" != 'NVIM v0.2.0' ]; then \

scripts/install_vim.sh

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -121,6 +121,9 @@ EOF
121121
CONFIG_ARGS="$CONFIG_ARGS --enable-luainterp"
122122
apk_add_build_dep lua5.3-dev
123123
apk add lua5.3-libs
124+
# Install symlinks to make Vim's configure pick it up.
125+
(cd /usr/bin && ln -s lua5.3 lua)
126+
(cd /usr/lib && ln -s lua5.3/liblua.so liblua5.3.so)
124127
else
125128
echo 'NOTE: -lua is automatically used with Neovim 0.2.1+, and not supported before.'
126129
fi

0 commit comments

Comments
 (0)