diff options
| author | Dimitar Dimitrov <dimitar@dinux.eu> | 2024-05-26 22:32:54 +0300 |
|---|---|---|
| committer | Chris Packham <judge.packham@gmail.com> | 2024-06-13 15:28:26 +1200 |
| commit | 0c615353476c84f680551541b7e4f9453b7ee855 (patch) | |
| tree | b3f24ac8d65e202d798a1f2bdcf0827bc0de4d72 | |
| parent | 78980241378010f4983e320df76b5edf58a62ab7 (diff) | |
| download | crosstool-ng-0c615353476c84f680551541b7e4f9453b7ee855.tar.gz crosstool-ng-0c615353476c84f680551541b7e4f9453b7ee855.tar.bz2 crosstool-ng-0c615353476c84f680551541b7e4f9453b7ee855.zip | |
gettext: Fix cross build for mingw
Cherry-pick the following commit from gnulib:
ctime, localtime, tzset, wcsftime: Fix env access (regr. 2024-02-09).
https://git.savannah.gnu.org/gitweb/?p=gnulib.git;a=commit;h=92cdf62b56462b914193c7770440e505a37c2526
This upstream patch fixes the following error:
[ERROR] .../.build/HOST-x86_64-w64-mingw32/pru-elf/src/gettext/gettext-tools/gnulib-lib/localtime.c:66:24: error: initialization of 'char *' from incompatible pointer type 'char **' [-Wincompatible-pointer-types]
[ALL ] 66 | for (char *s = env; *s != NULL; s++)
Crosstool configuration:
build: x86_64-unknown-linux-gnu
host: x86_64-w64-mingw32
target: pru-elf
Signed-off-by: Dimitar Dimitrov <dimitar@dinux.eu>
| -rw-r--r-- | packages/gettext/0.22.5/0001-ctime-localtime-tzset-wcsftime-Fix-env-access-regr.-.patch | 53 |
1 files changed, 53 insertions, 0 deletions
diff --git a/packages/gettext/0.22.5/0001-ctime-localtime-tzset-wcsftime-Fix-env-access-regr.-.patch b/packages/gettext/0.22.5/0001-ctime-localtime-tzset-wcsftime-Fix-env-access-regr.-.patch new file mode 100644 index 00000000..58f07db0 --- /dev/null +++ b/packages/gettext/0.22.5/0001-ctime-localtime-tzset-wcsftime-Fix-env-access-regr.-.patch @@ -0,0 +1,53 @@ +From 10d51e3990092af7279b8ba86906984eace216ae Mon Sep 17 00:00:00 2001 +From: Bruno Haible <bruno@clisp.org> +Date: Sat, 27 Apr 2024 16:09:55 +0200 +Subject: [PATCH] ctime, localtime, tzset, wcsftime: Fix env access (regr. + 2024-02-09). +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Reported by Markus Mützel <markus.muetzel@gmx.de> in +<https://lists.gnu.org/archive/html/bug-gnulib/2024-04/msg00457.html>. + +* lib/ctime.c (rpl_ctime): Fix logic of environment traversal. +* lib/localtime.c (rpl_localtime): Likewise. +* lib/tzset.c (rpl_tzset): Likewise. +* lib/wcsftime.c (rpl_wcsftime): Likewise. +--- + gettext-tools/gnulib-lib/localtime.c | 18 ++++++++++++------ + 1 file changed, 12 insertions(+), 6 deletions(-) + +diff --git a/gettext-tools/gnulib-lib/localtime.c b/gettext-tools/gnulib-lib/localtime.c +index f0e91ac..df0278e 100644 +--- a/gettext-tools/gnulib-lib/localtime.c ++++ b/gettext-tools/gnulib-lib/localtime.c +@@ -63,13 +63,19 @@ rpl_localtime (const time_t *tp) + char **env = _environ; + wchar_t **wenv = _wenviron; + if (env != NULL) +- for (char *s = env; *s != NULL; s++) +- if (s[0] == 'T' && s[1] == 'Z' && s[2] == '=') +- s[0] = '$'; ++ for (char **ep = env; *ep != NULL; ep++) ++ { ++ char *s = *ep; ++ if (s[0] == 'T' && s[1] == 'Z' && s[2] == '=') ++ s[0] = '$'; ++ } + if (wenv != NULL) +- for (wchar_t *ws = wenv; *ws != NULL; ws++) +- if (ws[0] == L'T' && ws[1] == L'Z' && ws[2] == L'=') +- ws[0] = L'$'; ++ for (wchar_t **wep = wenv; *wep != NULL; wep++) ++ { ++ wchar_t *ws = *wep; ++ if (ws[0] == L'T' && ws[1] == L'Z' && ws[2] == L'=') ++ ws[0] = L'$'; ++ } + } + #endif + +-- +2.45.1 + |