summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTom Rini <trini@konsulko.com>2019-05-01 08:51:09 -0400
committerRichard Purdie <richard.purdie@linuxfoundation.org>2019-05-02 09:56:19 +0100
commit2b4f6052db130b341da04f5e706098810323958e (patch)
tree44af0e15e784091958ac08c498f725427f7204ba
parent554c9904bbd6ef19569b5fca5fb51e7a16b77a3d (diff)
downloadpoky-2b4f6052db130b341da04f5e706098810323958e.tar.gz
vim: Update to 8.1.1240
This brings us to the current version of vim. As part of this we need to work-around a locale issue that upstream has exposed. We do not support fully / correctly the certain locales. Attempting to use these with msgfmt in order to update the ".desktop" files exposes this problem and leads to the compile failing. (From OE-Core rev: ffa4b0abcab2ed4e4f642b4b3140aa6095938422) Signed-off-by: Tom Rini <trini@konsulko.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-support/vim/vim-tiny_8.1.1240.bb (renamed from meta/recipes-support/vim/vim-tiny_8.1.1017.bb)0
-rw-r--r--meta/recipes-support/vim/vim_8.1.1240.bb (renamed from meta/recipes-support/vim/vim_8.1.1017.bb)12
2 files changed, 11 insertions, 1 deletions
diff --git a/meta/recipes-support/vim/vim-tiny_8.1.1017.bb b/meta/recipes-support/vim/vim-tiny_8.1.1240.bb
index 74464833ad..74464833ad 100644
--- a/meta/recipes-support/vim/vim-tiny_8.1.1017.bb
+++ b/meta/recipes-support/vim/vim-tiny_8.1.1240.bb
diff --git a/meta/recipes-support/vim/vim_8.1.1017.bb b/meta/recipes-support/vim/vim_8.1.1240.bb
index 4e3e663c54..f5c74684bf 100644
--- a/meta/recipes-support/vim/vim_8.1.1017.bb
+++ b/meta/recipes-support/vim/vim_8.1.1240.bb
@@ -13,7 +13,7 @@ SRC_URI = "git://github.com/vim/vim.git \
13 file://vim-add-knob-whether-elf.h-are-checked.patch \ 13 file://vim-add-knob-whether-elf.h-are-checked.patch \
14 file://0001-src-Makefile-improve-reproducibility.patch \ 14 file://0001-src-Makefile-improve-reproducibility.patch \
15" 15"
16SRCREV = "493fbe4abee660d30b4f2aef87b754b0a720213c" 16SRCREV = "d96dbd6f95ea22f609042cc9c6272f14a21ff1a5"
17 17
18S = "${WORKDIR}/git" 18S = "${WORKDIR}/git"
19 19
@@ -36,6 +36,16 @@ do_configure () {
36 touch src/auto/config.mk src/auto/config.h 36 touch src/auto/config.mk src/auto/config.h
37} 37}
38 38
39do_compile() {
40 # We do not support fully / correctly the following locales. Attempting
41 # to use these with msgfmt in order to update the ".desktop" files exposes
42 # this problem and leads to the compile failing.
43 for LOCALE in cs fr ko pl sk zh_CN zh_TW;do
44 echo -n > src/po/${LOCALE}.po
45 done
46 autotools_do_compile
47}
48
39#Available PACKAGECONFIG options are gtkgui, acl, x11, tiny 49#Available PACKAGECONFIG options are gtkgui, acl, x11, tiny
40PACKAGECONFIG ??= "" 50PACKAGECONFIG ??= ""
41PACKAGECONFIG += " \ 51PACKAGECONFIG += " \