Skip to content

Commit 3d7bad7

Browse files
authored
install_vim.sh: apply build fix from v7.1.148 (Vimjas#35)
Fixes Vimjas#30.
1 parent f90a0ba commit 3d7bad7

File tree

2 files changed

+11
-1
lines changed

2 files changed

+11
-1
lines changed

example/Dockerfile

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
FROM testbed/vim
22

3-
RUN install_vim -tag v7.3.429 -name vim73 -py -build \
3+
RUN install_vim -tag v7.1 -name vim71 -build \
4+
-tag v7.3.429 -name vim73 -py -build \
45
-tag v7.4.052 -name vim74-trusty -build \
56
-tag master -py2 -py3 -ruby -lua -build \
67
-tag neovim:v0.2.0 -py2 -py3 -ruby -build \

scripts/install_vim.sh

+9
Original file line numberDiff line numberDiff line change
@@ -187,6 +187,15 @@ EOF
187187

188188
build() {
189189
if [ "$FLAVOR" = vim ]; then
190+
# Apply build fix from v7.1.148.
191+
MAJOR="$(sed -n '/^MAJOR = / s~MAJOR = ~~p' Makefile)"
192+
if [ "$MAJOR" -lt 8 ]; then
193+
MINOR="$(sed -n '/^MINOR = / s~MINOR = ~~p' Makefile)"
194+
if [ "$MINOR" = "1" ] || [ "${MINOR#0}" != $MINOR ]; then
195+
sed -i 's~sys/time.h termio.h~sys/time.h sys/types.h termio.h~' src/configure.in src/auto/configure
196+
fi
197+
fi
198+
190199
echo "Configuring with: $CONFIG_ARGS"
191200
# shellcheck disable=SC2086
192201
./configure $CONFIG_ARGS || bail "Could not configure"

0 commit comments

Comments
 (0)