Commit 966968c8 authored by Baruch Siach's avatar Baruch Siach Committed by Peter Korsgaard
Browse files

dos2unix: remove WCHAR dependency 



Add a patch fixing wchar build failure.

Signed-off-by: default avatarBaruch Siach <baruch@tkos.co.il>
Reviewed-by: default avatarVicente Olivert Riera <Vincent.Riera@imgtec.com>
Signed-off-by: default avatarPeter Korsgaard <peter@korsgaard.com>
parent 99ff3896

package/dos2unix/0001-fix-build-without-wchar.patch

0 → 100644
+59 −0
Original line number Diff line number Diff line 
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

   }

 }

package/dos2unix/Config.in

+0 −4
Original line number Diff line number Diff line 
config BR2_PACKAGE_DOS2UNIX

	select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT_IF_LOCALE

	depends on BR2_USE_WCHAR # gettext

	bool "dos2unix"

	help

	  dos2unix converts text file line endings between CRLF and LF



	  http://freshmeat.net/projects/dos2unix
 


comment "dos2unix needs a toolchain w/ wchar"

	depends on !BR2_USE_WCHAR

package/dos2unix/dos2unix.mk

+4 −0
Original line number Diff line number Diff line
@@ -20,6 +20,10 @@ DOS2UNIX_DEPENDENCIES += gettext 
DOS2UNIX_MAKE_OPTS += LIBS_EXTRA=-lintl

endif



ifeq ($(BR2_USE_WCHAR),)

DOS2UNIX_MAKE_OPTS += UCS=

endif



define DOS2UNIX_BUILD_CMDS

	$(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D) $(DOS2UNIX_MAKE_OPTS)

endef