From 745bf44812c93cd66685412a90ef565561ee6c01 Mon Sep 17 00:00:00 2001 From: Steve Sakoman Date: Tue, 21 Nov 2023 03:55:42 -1000 Subject: vim: use upstream generated .po files A previous commit attempted to fix reproducibility errors by forcing regeneration of .po files. Unfortunately this triggered a different type of reproducibility issue. Work around this by adjusting the timestamps of the troublesome .po files so they are not regenerated and we use the shipped upstream versions of the files. The shipped version of ru.cp1251.po doesn't seem to have been created with the vim tooling and specifies CP1251 instead of cp1251, fix that. (From OE-Core rev: 13d9551ba626f001c71bf908df16caf1d739cf13) Signed-off-by: Steve Sakoman Signed-off-by: Richard Purdie --- meta/recipes-support/vim/vim.inc | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'meta/recipes-support/vim') diff --git a/meta/recipes-support/vim/vim.inc b/meta/recipes-support/vim/vim.inc index 38212a1fa6..888f8f0e5a 100644 --- a/meta/recipes-support/vim/vim.inc +++ b/meta/recipes-support/vim/vim.inc @@ -40,8 +40,10 @@ do_configure () { cd src rm -f auto/* touch auto/config.mk - # git timestamps aren't reliable and we want to consistently regenerate these generated files - rm -f po/cs.cp1250.po po/ja.euc-jp.po po/ja.sjis.po po/ko.po po/pl.UTF-8.po po/pl.cp1250.po po/ru.cp1251.po po/sk.cp1250.po po/uk.cp1251.po po/zh_CN.po po/zh_CN.cp936.po po/zh_TW.po + # git timestamps aren't reliable, so touch the shipped .po files so they aren't regenerated + touch -c po/cs.cp1250.po po/ja.euc-jp.po po/ja.sjis.po po/ko.po po/pl.UTF-8.po po/pl.cp1250.po po/ru.cp1251.po po/sk.cp1250.po po/uk.cp1251.po po/zh_CN.po po/zh_CN.cp936.po po/zh_TW.po + # ru.cp1251.po uses CP1251 rather than cp1251, fix that + sed -i -e s/CP1251/cp1251/ po/ru.cp1251.po aclocal autoconf cd .. -- cgit v1.2.3-54-g00ecf