diff options
| author | Baruch Siach <baruch@tkos.co.il> | 2015-09-03 07:10:52 +0300 |
|---|---|---|
| committer | Peter Korsgaard <peter@korsgaard.com> | 2015-09-04 17:03:52 +0200 |
| commit | 966968c8a99604130fc69b8948f2c4d28592005a (patch) | |
| tree | 6349034c0a4a346aceada954aa518f19944b7636 /package/dos2unix/0001-fix-build-without-wchar.patch | |
| parent | 99ff3896fd9243a95c2136e8ced9f528250adcf9 (diff) | |
| download | buildroot-966968c8a99604130fc69b8948f2c4d28592005a.tar.gz buildroot-966968c8a99604130fc69b8948f2c4d28592005a.zip | |
dos2unix: remove WCHAR dependency
Add a patch fixing wchar build failure.
Signed-off-by: Baruch Siach <baruch@tkos.co.il>
Reviewed-by: Vicente Olivert Riera <Vincent.Riera@imgtec.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
Diffstat (limited to 'package/dos2unix/0001-fix-build-without-wchar.patch')
| -rw-r--r-- | package/dos2unix/0001-fix-build-without-wchar.patch | 59 |
1 files changed, 59 insertions, 0 deletions
diff --git a/package/dos2unix/0001-fix-build-without-wchar.patch b/package/dos2unix/0001-fix-build-without-wchar.patch new file mode 100644 index 0000000000..c3188363ec --- /dev/null +++ b/package/dos2unix/0001-fix-build-without-wchar.patch @@ -0,0 +1,59 @@ +Don't reference wchar_t when D2U_UNICODE is not defined. + +Patch status: upstream (http://sourceforge.net/p/dos2unix/code/736) + +Signed-off-by: Baruch Siach <baruch@tkos.co.il> + +diff -Nuar dos2unix-7.3.orig/common.c dos2unix-7.3/common.c +--- dos2unix-7.3.orig/common.c 2015-08-21 02:02:31.000000000 +0300 ++++ dos2unix-7.3/common.c 2015-09-02 22:13:33.648486366 +0300 +@@ -1615,9 +1615,11 @@ + } else if (pFlag->status & WRONG_CODEPAGE) { + d2u_fprintf(stderr,"%s: ",progname); + d2u_fprintf(stderr, _("code page %d is not supported.\n"), pFlag->ConvMode); ++#ifdef D2U_UNICODE + } else if (pFlag->status & WCHAR_T_TOO_SMALL) { + d2u_fprintf(stderr,"%s: ",progname); + d2u_fprintf(stderr, _("Skipping UTF-16 file %s, the size of wchar_t is %d bytes.\n"), "stdin", (int)sizeof(wchar_t)); ++#endif + } else if (pFlag->status & UNICODE_CONVERSION_ERROR) { + d2u_fprintf(stderr,"%s: ",progname); + d2u_fprintf(stderr, _("Skipping UTF-16 file %s, an UTF-16 conversion error occurred on line %u.\n"), "stdin", pFlag->line_nr); +@@ -1701,9 +1703,11 @@ + } else if (pFlag->status & WRONG_CODEPAGE) { + d2u_fprintf(stderr,"%s: ",progname); + d2u_fprintf(stderr, _("code page %d is not supported.\n"), pFlag->ConvMode); ++#ifdef D2U_UNICODE + } else if (pFlag->status & WCHAR_T_TOO_SMALL) { + d2u_fprintf(stderr,"%s: ",progname); + d2u_fprintf(stderr, _("Skipping UTF-16 file %s, the size of wchar_t is %d bytes.\n"), infile, (int)sizeof(wchar_t)); ++#endif + } else if (pFlag->status & UNICODE_CONVERSION_ERROR) { + d2u_fprintf(stderr,"%s: ",progname); + d2u_fprintf(stderr, _("Skipping UTF-16 file %s, an UTF-16 conversion error occurred on line %u.\n"), infile, pFlag->line_nr); +@@ -1781,9 +1785,11 @@ + } else if (pFlag->status & WRONG_CODEPAGE) { + d2u_fprintf(stderr,"%s: ",progname); + d2u_fprintf(stderr, _("code page %d is not supported.\n"), pFlag->ConvMode); ++#ifdef D2U_UNICODE + } else if (pFlag->status & WCHAR_T_TOO_SMALL) { + d2u_fprintf(stderr,"%s: ",progname); + d2u_fprintf(stderr, _("Skipping UTF-16 file %s, the size of wchar_t is %d bytes.\n"), infile, (int)sizeof(wchar_t)); ++#endif + } else if (pFlag->status & UNICODE_CONVERSION_ERROR) { + d2u_fprintf(stderr,"%s: ",progname); + d2u_fprintf(stderr, _("Skipping UTF-16 file %s, an UTF-16 conversion error occurred on line %u.\n"), infile, pFlag->line_nr); +@@ -1834,11 +1840,13 @@ + d2u_fprintf(stderr,"%s: ",progname); + d2u_fprintf(stderr, _("Skipping symbolic link %s, target is not a regular file.\n"), infile); + } ++#ifdef D2U_UNICODE + } else if (pFlag->status & WCHAR_T_TOO_SMALL) { + if (pFlag->verbose) { + d2u_fprintf(stderr,"%s: ",progname); + d2u_fprintf(stderr, _("Skipping UTF-16 file %s, the size of wchar_t is %d bytes.\n"), infile, (int)sizeof(wchar_t)); + } ++#endif + } + } + |
