Re: [OE-core] [PATCH 2/2] vim: Improve locale handling
Thank you for the confirmation. Regards, Archana From: Richard Purdie Sent: Wednesday, November 15, 2023 18:07 To: Polampalli, Archana ; openembedded-core@lists.openembedded.org Subject: Re: [OE-core] [PATCH 2/2] vim: Improve locale handling CAUTION: This email comes from a non Wind River email account! Do not click links or open attachments unless you recognize the sender and know the content is safe. On Wed, 2023-11-15 at 12:11 +, Polampalli, Archana wrote: > > Hi Richard, > > > I am planning to send Vim upgrade patch for all branches. > > > Could you please confirm Is it applicable to other branches as well, > if yes please confirm are you planning to send other branches also It > will avoid patch conflicts to further vim patches. It is applicable to all branches and I believe our LTS maintainer has it queued for them already. Cheers, Richard -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#190594): https://lists.openembedded.org/g/openembedded-core/message/190594 Mute This Topic: https://lists.openembedded.org/mt/102595254/21656 Group Owner: openembedded-core+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
Re: [OE-core] [PATCH 2/2] vim: Improve locale handling
On Wed, 2023-11-15 at 12:11 +, Polampalli, Archana wrote: > > Hi Richard, > > > I am planning to send Vim upgrade patch for all branches. > > > Could you please confirm Is it applicable to other branches as well, > if yes please confirm are you planning to send other branches also It > will avoid patch conflicts to further vim patches. It is applicable to all branches and I believe our LTS maintainer has it queued for them already. Cheers, Richard -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#190592): https://lists.openembedded.org/g/openembedded-core/message/190592 Mute This Topic: https://lists.openembedded.org/mt/102595254/21656 Group Owner: openembedded-core+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
Re: [OE-core] [PATCH 2/2] vim: Improve locale handling
Hi Richard,
I am planning to send Vim upgrade patch for all branches.
Could you please confirm Is it applicable to other branches as well, if yes
please confirm are you planning to send other branches also It will avoid patch
conflicts to further vim patches.
Regards,
Archana
From: openembedded-core@lists.openembedded.org
on behalf of Richard Purdie via
lists.openembedded.org
Sent: Wednesday, November 15, 2023 05:02
To: openembedded-core@lists.openembedded.org
Subject: [OE-core] [PATCH 2/2] vim: Improve locale handling
CAUTION: This email comes from a non Wind River email account!
Do not click links or open attachments unless you recognize the sender and know
the content is safe.
When making checkouts from git, the timestamps can vary and occasionally two
files
can end up with the same stamp. This triggers make to regenerate ru.cp1251.po
from
ru.po for example. If it isn't regenerated, the output isn't quite the same
leading
to reproducibility issues (CP1251 vs cp1251).
Since we added all locales to buildtools tarball now, we can drop the locale
restrictions too. We need to generate a native binary for the sjis conversion
tool so also tweak that.
Signed-off-by: Richard Purdie
---
meta/recipes-support/vim/vim.inc | 14 --
1 file changed, 4 insertions(+), 10 deletions(-)
diff --git a/meta/recipes-support/vim/vim.inc b/meta/recipes-support/vim/vim.inc
index 58025828f2b..38212a1fa60 100644
--- a/meta/recipes-support/vim/vim.inc
+++ b/meta/recipes-support/vim/vim.inc
@@ -40,22 +40,16 @@ 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
aclocal
autoconf
cd ..
oe_runconf
touch src/auto/configure
touch src/auto/config.mk src/auto/config.h
-}
-
-do_compile() {
-# We do not support fully / correctly the following locales. Attempting
-# to use these with msgfmt in order to update the ".desktop" files exposes
-# this problem and leads to the compile failing.
-for LOCALE in cs fr ko pl sk zh_CN zh_TW;do
-echo -n > src/po/${LOCALE}.po
-done
-autotools_do_compile
+# need a native tool, not a target one
+${BUILD_CC} src/po/sjiscorr.c -o src/po/sjiscorr
}
PACKAGECONFIG ??= "\
--
2.39.2
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#190589):
https://lists.openembedded.org/g/openembedded-core/message/190589
Mute This Topic: https://lists.openembedded.org/mt/102595254/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
[OE-core] [PATCH 2/2] vim: Improve locale handling
When making checkouts from git, the timestamps can vary and occasionally two
files
can end up with the same stamp. This triggers make to regenerate ru.cp1251.po
from
ru.po for example. If it isn't regenerated, the output isn't quite the same
leading
to reproducibility issues (CP1251 vs cp1251).
Since we added all locales to buildtools tarball now, we can drop the locale
restrictions too. We need to generate a native binary for the sjis conversion
tool so also tweak that.
Signed-off-by: Richard Purdie
---
meta/recipes-support/vim/vim.inc | 14 --
1 file changed, 4 insertions(+), 10 deletions(-)
diff --git a/meta/recipes-support/vim/vim.inc b/meta/recipes-support/vim/vim.inc
index 58025828f2b..38212a1fa60 100644
--- a/meta/recipes-support/vim/vim.inc
+++ b/meta/recipes-support/vim/vim.inc
@@ -40,22 +40,16 @@ 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
aclocal
autoconf
cd ..
oe_runconf
touch src/auto/configure
touch src/auto/config.mk src/auto/config.h
-}
-
-do_compile() {
-# We do not support fully / correctly the following locales. Attempting
-# to use these with msgfmt in order to update the ".desktop" files exposes
-# this problem and leads to the compile failing.
-for LOCALE in cs fr ko pl sk zh_CN zh_TW;do
-echo -n > src/po/${LOCALE}.po
-done
-autotools_do_compile
+# need a native tool, not a target one
+${BUILD_CC} src/po/sjiscorr.c -o src/po/sjiscorr
}
PACKAGECONFIG ??= "\
--
2.39.2
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#190524):
https://lists.openembedded.org/g/openembedded-core/message/190524
Mute This Topic: https://lists.openembedded.org/mt/102595254/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
