Restore patches to po/Makefile.in.in
PATCH 1/1 Restore patches to po/Makefile.in.in
These were inadvertently lost during the conversion to Gnulib. The files in po/gettext-patches/ can be imported using "git am" on top of the gettext tag corresponding to AM_GNU_GETTEXT_VERSION in configure.ac (currently 0.18.3). They handle translation of messages in shell files, make msgfmt output in little-endian format, and arrange to use @SHELL@ rather than /bin/sh.
There were some changes solely for the purpose of distributing extra files; for ease of maintenance, I've added these to conf/Makefile.extra-dist instead.
--- bootstrap.conf | 8 +++ conf/Makefile.extra-dist | 15 ++++++ docs/grub-dev.texi | 3 ++ .../0001-Support-POTFILES-shell.patch | 54 +++++++++++++++++++ ...Handle-gettext_printf-shell-function.patch | 46 ++++++++++++++++ ...-Make-msgfmt-output-in-little-endian.patch | 34 ++++++++++++ .../0004-Use-SHELL-rather-than-bin-sh.patch | 26 +++++++++ 7 files changed, 186 insertions(+) create mode 100644 po/gettext-patches/0001-Support-POTFILES-shell.patch create mode 100644 po/gettext-patches/0002-Handle-gettext_printf-shell-function.patch create mode 100644 po/gettext-patches/0003-Make-msgfmt-output-in-little-endian.patch create mode 100644 po/gettext-patches/0004-Use-SHELL-rather-than-bin-sh.patch
bootstrap.conf +8 -0
@@ -83,6 +83,14 @@ bootstrap_post_import_hook () { patch -d grub-core/lib/gnulib -p2 \ < "grub-core/lib/gnulib-patches/$patchname.patch" done + for patchname in \ + 0001-Support-POTFILES-shell \ + 0002-Handle-gettext_printf-shell-function \ + 0003-Make-msgfmt-output-in-little-endian \ + 0004-Use-SHELL-rather-than-bin-sh; do + patch -d po -p3 \ + < "po/gettext-patches/$patchname.patch" + done FROM_BOOTSTRAP=1 ./autogen.sh set +e # bootstrap expects this }
conf/Makefile.extra-dist +15 -0
@@ -111,6 +111,21 @@ EXTRA_DIST += grub-core/osdep/windows/password.c EXTRA_DIST += grub-core/osdep/windows/random.c EXTRA_DIST += grub-core/osdep/windows/sleep.c +EXTRA_DIST += po/gettext-patches/0001-Support-POTFILES-shell.patch +EXTRA_DIST += po/gettext-patches/0002-Handle-gettext_printf-shell-function.patch +EXTRA_DIST += po/gettext-patches/0003-Make-msgfmt-output-in-little-endian.patch +EXTRA_DIST += po/gettext-patches/0004-Use-SHELL-rather-than-bin-sh.patch + +EXTRA_DIST += po/POTFILES-shell.in +EXTRA_DIST += po/README +EXTRA_DIST += po/Rules-translit +EXTRA_DIST += po/Rules-windowsdir +EXTRA_DIST += po/arabic.sed +EXTRA_DIST += po/cyrillic.sed +EXTRA_DIST += po/greek.sed +EXTRA_DIST += po/grub.d.sed +EXTRA_DIST += po/hebrew.sed + EXTRA_DIST += tests/dfly-mbr-mbexample.mbr.img.gz EXTRA_DIST += tests/dfly-mbr-mbexample.dfly.img.gz
docs/grub-dev.texi +3 -0
@@ -547,6 +547,9 @@ AC_SYS_LARGEFILE @end example +It will also be necessary to adjust the patches in +@file{po/gettext-patches/} to apply to an older version of gettext. + @node jsmn @section jsmn
po/gettext-patches/0001-Support-POTFILES-shell.patch new file +54 -0
54 lines not on this page · raw message
po/gettext-patches/0002-Handle-gettext_printf-shell-function.patch new file +46 -0
46 lines not on this page · raw message
po/gettext-patches/0003-Make-msgfmt-output-in-little-endian.patch new file +34 -0
@@ -0,0 +1,34 @@ +From 156c523e2945c9b43c5500fb93988b0dd2f08d75 Mon Sep 17 00:00:00 2001 +From: Vladimir Serbinenko <[email protected]> +Date: Sun, 1 Mar 2020 12:09:25 +0000 +Subject: [PATCH 3/4] Make msgfmt output in little-endian + +GRUB expects this. +--- + gettext-runtime/po/Makefile.in.in | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/gettext-runtime/po/Makefile.in.in b/gettext-runtime/po/Makefile.in.in +index 32e0c99a2..f3ef54c39 100644 +--- a/gettext-runtime/po/Makefile.in.in ++++ b/gettext-runtime/po/Makefile.in.in +@@ -84,13 +84,13 @@ CATALOGS = @CATALOGS@ + + .po.mo: + @echo "$(MSGFMT) -c -o $@ $<"; \ +- $(MSGFMT) -c -o t-$@ $< && mv t-$@ $@ ++ $(MSGFMT) --endianness=little -c -o t-$@ $< && mv t-$@ $@ + + .po.gmo: + @lang=`echo $* | sed -e 's,.*/,,'`; \ + test "$(srcdir)" = . && cdcmd="" || cdcmd="cd $(srcdir) && "; \ +- echo "$${cdcmd}rm -f $${lang}.gmo && $(GMSGFMT) -c --statistics --verbose -o $${lang}.gmo $${lang}.po"; \ +- cd $(srcdir) && rm -f $${lang}.gmo && $(GMSGFMT) -c --statistics --verbose -o t-$${lang}.gmo $${lang}.po && mv t-$${lang}.gmo $${lang}.gmo ++ echo "$${cdcmd}rm -f $${lang}.gmo && $(GMSGFMT) --endianness=little -c --statistics --verbose -o $${lang}.gmo $${lang}.po"; \ ++ cd $(srcdir) && rm -f $${lang}.gmo && $(GMSGFMT) --endianness=little -c --statistics --verbose -o t-$${lang}.gmo $${lang}.po && mv t-$${lang}.gmo $${lang}.gmo + + .sin.sed: + sed -e '/^#/d' $< > t-$@ +-- +2.17.1 +
po/gettext-patches/0004-Use-SHELL-rather-than-bin-sh.patch new file +26 -0
@@ -0,0 +1,26 @@ +From f36f12e77798223ee7ee882c0d09e0e63db11454 Mon Sep 17 00:00:00 2001 +From: Colin Watson <[email protected]> +Date: Sun, 1 Mar 2020 12:14:07 +0000 +Subject: [PATCH 4/4] Use @SHELL rather than /bin/sh + +/bin/sh might not exist. +--- + gettext-runtime/po/Makefile.in.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/gettext-runtime/po/Makefile.in.in b/gettext-runtime/po/Makefile.in.in +index f3ef54c39..285a55a9d 100644 +--- a/gettext-runtime/po/Makefile.in.in ++++ b/gettext-runtime/po/Makefile.in.in +@@ -16,7 +16,7 @@ VERSION = @VERSION@ + PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ + + SED = @SED@ +-SHELL = /bin/sh ++SHELL = @SHELL@ + @SET_MAKE@ + + srcdir = @srcdir@ +-- +2.17.1 +
Signature · 1 line
2.17.1
Quoted 7 lines · Colin Watson
These were inadvertently lost during the conversion to Gnulib. The files in po/gettext-patches/ can be imported using "git am" on top of the gettext tag corresponding to
AM_GNU_GETTEXT_VERSIONin configure.ac (currently 0.18.3). They handle translation of messages in shell files, make msgfmt output in little-endian format, and arrange to use @SHELL@ rather than/bin/sh.
Quoted 6 lines
There were some changes solely for the purpose of distributing extra files; for ease of maintenance, I've added these to conf/Makefile.extra-dist instead.
Signed-off-by Colin Watson <[email protected]>
Daniel