* [Buildroot] [PATCH v3 1/5] dos2unix: add target support
@ 2015-09-03 4:10 Baruch Siach
2015-09-03 4:10 ` [Buildroot] [PATCH v3 2/5] dos2unix: bump to version 7.3 Baruch Siach
` (5 more replies)
0 siblings, 6 replies; 14+ messages in thread
From: Baruch Siach @ 2015-09-03 4:10 UTC (permalink / raw)
To: buildroot
From: James Knight <james.knight@rockwellcollins.com>
Allow the `dos2unix` utility to be built and installed on the target
system.
[baruch: properly handle target gettext]
Signed-off-by: James Knight <james.knight@rockwellcollins.com>
Signed-off-by: Baruch Siach <baruch@tkos.co.il>
---
v3:
* Show only if BR2_PACKAGE_BUSYBOX_SHOW_OTHERS is enabled (Peter)
* Add busybox to _DEPENDENCIES
v2:
* Fix static build with gettext
* Support build without locale support
---
package/Config.in | 1 +
package/dos2unix/Config.in | 11 +++++++++++
package/dos2unix/dos2unix.mk | 25 ++++++++++++++++++++++---
3 files changed, 34 insertions(+), 3 deletions(-)
create mode 100644 package/dos2unix/Config.in
diff --git a/package/Config.in b/package/Config.in
index 6ba21a1aace8..2c1325af31c5 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -115,6 +115,7 @@ menu "Development tools"
source "package/cvs/Config.in"
if BR2_PACKAGE_BUSYBOX_SHOW_OTHERS
source "package/diffutils/Config.in"
+ source "package/dos2unix/Config.in"
source "package/findutils/Config.in"
endif
source "package/flex/Config.in"
diff --git a/package/dos2unix/Config.in b/package/dos2unix/Config.in
new file mode 100644
index 000000000000..fdcd0700509b
--- /dev/null
+++ b/package/dos2unix/Config.in
@@ -0,0 +1,11 @@
+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
diff --git a/package/dos2unix/dos2unix.mk b/package/dos2unix/dos2unix.mk
index 2d7fcbbc6958..b1d21f27364d 100644
--- a/package/dos2unix/dos2unix.mk
+++ b/package/dos2unix/dos2unix.mk
@@ -6,17 +6,36 @@
DOS2UNIX_VERSION = 7.0
DOS2UNIX_SITE = http://waterlan.home.xs4all.nl/dos2unix
-DOS2UNIX_DEPENDENCIES = host-gettext
DOS2UNIX_LICENSE = BSD-2c
DOS2UNIX_LICENSE_FILES = COPYING.txt
+DOS2UNIX_DEPENDENCIES = $(if $(BR2_PACKAGE_BUSYBOX),busybox)
+HOST_DOS2UNIX_DEPENDENCIES = host-gettext
+
+ifeq ($(BR2_ENABLE_LOCALE),)
+DOS2UNIX_MAKE_OPTS += ENABLE_NLS=
+endif
+
+ifeq ($(BR2_NEEDS_GETTEXT_IF_LOCALE),y)
+DOS2UNIX_DEPENDENCIES += gettext
+DOS2UNIX_MAKE_OPTS += LIBS_EXTRA=-lintl
+endif
+
+define DOS2UNIX_BUILD_CMDS
+ $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D) $(DOS2UNIX_MAKE_OPTS)
+endef
+
+define DOS2UNIX_INSTALL_TARGET_CMDS
+ $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D) DESTDIR=$(TARGET_DIR) \
+ $(DOS2UNIX_MAKE_OPTS) install
+endef
define HOST_DOS2UNIX_BUILD_CMDS
$(HOST_CONFIGURE_OPTS) $(MAKE) -C $(@D)
endef
define HOST_DOS2UNIX_INSTALL_CMDS
- $(HOST_CONFIGURE_OPTS) $(MAKE) -C $(@D) \
- install DESTDIR=$(HOST_DIR)
+ $(HOST_CONFIGURE_OPTS) $(MAKE) -C $(@D) DESTDIR=$(HOST_DIR) install
endef
+$(eval $(generic-package))
$(eval $(host-generic-package))
--
2.5.0
^ permalink raw reply related [flat|nested] 14+ messages in thread
* [Buildroot] [PATCH v3 2/5] dos2unix: bump to version 7.3
2015-09-03 4:10 [Buildroot] [PATCH v3 1/5] dos2unix: add target support Baruch Siach
@ 2015-09-03 4:10 ` Baruch Siach
2015-09-04 10:52 ` Vicente Olivert Riera
2015-09-03 4:10 ` [Buildroot] [PATCH v3 3/5] dos2unix: remove WCHAR dependency Baruch Siach
` (4 subsequent siblings)
5 siblings, 1 reply; 14+ messages in thread
From: Baruch Siach @ 2015-09-03 4:10 UTC (permalink / raw)
To: buildroot
Cc: James Knight <james.knight@rockwellcollins.com>
Signed-off-by: Baruch Siach <baruch@tkos.co.il>
---
v2:
* New patch in this series
---
package/dos2unix/dos2unix.hash | 2 +-
package/dos2unix/dos2unix.mk | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/package/dos2unix/dos2unix.hash b/package/dos2unix/dos2unix.hash
index 7880f1d85567..b22b6fc1682e 100644
--- a/package/dos2unix/dos2unix.hash
+++ b/package/dos2unix/dos2unix.hash
@@ -1,2 +1,2 @@
# Locally calculated after checking pgp signature
-sha256 551afe005a86e58664b4f41327408e73afafe92400488dd0aab1dad6deb4e72b dos2unix-7.0.tar.gz
+sha256 8175f7552a72edaaa8918fdee68ce2cbc982dc25452f33d4dc611d769f4944d1 dos2unix-7.3.tar.gz
diff --git a/package/dos2unix/dos2unix.mk b/package/dos2unix/dos2unix.mk
index b1d21f27364d..0d5a67456e6b 100644
--- a/package/dos2unix/dos2unix.mk
+++ b/package/dos2unix/dos2unix.mk
@@ -4,7 +4,7 @@
#
################################################################################
-DOS2UNIX_VERSION = 7.0
+DOS2UNIX_VERSION = 7.3
DOS2UNIX_SITE = http://waterlan.home.xs4all.nl/dos2unix
DOS2UNIX_LICENSE = BSD-2c
DOS2UNIX_LICENSE_FILES = COPYING.txt
--
2.5.0
^ permalink raw reply related [flat|nested] 14+ messages in thread
* [Buildroot] [PATCH v3 3/5] dos2unix: remove WCHAR dependency
2015-09-03 4:10 [Buildroot] [PATCH v3 1/5] dos2unix: add target support Baruch Siach
2015-09-03 4:10 ` [Buildroot] [PATCH v3 2/5] dos2unix: bump to version 7.3 Baruch Siach
@ 2015-09-03 4:10 ` Baruch Siach
2015-09-04 10:52 ` Vicente Olivert Riera
2015-09-03 4:10 ` [Buildroot] [PATCH v3 4/5] dos2unix: remove host-gettext dependency from host package Baruch Siach
` (3 subsequent siblings)
5 siblings, 1 reply; 14+ messages in thread
From: Baruch Siach @ 2015-09-03 4:10 UTC (permalink / raw)
To: buildroot
Add a patch fixing wchar build failure.
Signed-off-by: Baruch Siach <baruch@tkos.co.il>
---
I added this as a separate patch after version bump to avoid package patch
rebase churn.
v3:
* New patch in this series (Peter)
---
.../dos2unix/0001-fix-build-without-wchar.patch | 59 ++++++++++++++++++++++
package/dos2unix/Config.in | 4 --
package/dos2unix/dos2unix.mk | 4 ++
3 files changed, 63 insertions(+), 4 deletions(-)
create mode 100644 package/dos2unix/0001-fix-build-without-wchar.patch
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 000000000000..c3188363ec7e
--- /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
+ }
+ }
+
diff --git a/package/dos2unix/Config.in b/package/dos2unix/Config.in
index fdcd0700509b..782c25cf0e13 100644
--- a/package/dos2unix/Config.in
+++ b/package/dos2unix/Config.in
@@ -1,11 +1,7 @@
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
diff --git a/package/dos2unix/dos2unix.mk b/package/dos2unix/dos2unix.mk
index 0d5a67456e6b..4c5f4fcff384 100644
--- a/package/dos2unix/dos2unix.mk
+++ b/package/dos2unix/dos2unix.mk
@@ -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
--
2.5.0
^ permalink raw reply related [flat|nested] 14+ messages in thread
* [Buildroot] [PATCH v3 4/5] dos2unix: remove host-gettext dependency from host package
2015-09-03 4:10 [Buildroot] [PATCH v3 1/5] dos2unix: add target support Baruch Siach
2015-09-03 4:10 ` [Buildroot] [PATCH v3 2/5] dos2unix: bump to version 7.3 Baruch Siach
2015-09-03 4:10 ` [Buildroot] [PATCH v3 3/5] dos2unix: remove WCHAR dependency Baruch Siach
@ 2015-09-03 4:10 ` Baruch Siach
2015-09-04 10:52 ` Vicente Olivert Riera
2015-09-03 4:10 ` [Buildroot] [PATCH v3 5/5] dos2unix: update homepage link Baruch Siach
` (2 subsequent siblings)
5 siblings, 1 reply; 14+ messages in thread
From: Baruch Siach @ 2015-09-03 4:10 UTC (permalink / raw)
To: buildroot
This shortens build time.
Signed-off-by: Baruch Siach <baruch@tkos.co.il>
---
v3:
* New patch in this series (Peter)
---
package/dos2unix/dos2unix.mk | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/package/dos2unix/dos2unix.mk b/package/dos2unix/dos2unix.mk
index 4c5f4fcff384..55608c653f9c 100644
--- a/package/dos2unix/dos2unix.mk
+++ b/package/dos2unix/dos2unix.mk
@@ -9,7 +9,7 @@ DOS2UNIX_SITE = http://waterlan.home.xs4all.nl/dos2unix
DOS2UNIX_LICENSE = BSD-2c
DOS2UNIX_LICENSE_FILES = COPYING.txt
DOS2UNIX_DEPENDENCIES = $(if $(BR2_PACKAGE_BUSYBOX),busybox)
-HOST_DOS2UNIX_DEPENDENCIES = host-gettext
+HOST_DOS2UNIX_DEPENDENCIES =
ifeq ($(BR2_ENABLE_LOCALE),)
DOS2UNIX_MAKE_OPTS += ENABLE_NLS=
@@ -34,11 +34,12 @@ define DOS2UNIX_INSTALL_TARGET_CMDS
endef
define HOST_DOS2UNIX_BUILD_CMDS
- $(HOST_CONFIGURE_OPTS) $(MAKE) -C $(@D)
+ $(HOST_CONFIGURE_OPTS) $(MAKE) -C $(@D) ENABLE_NLS=
endef
define HOST_DOS2UNIX_INSTALL_CMDS
- $(HOST_CONFIGURE_OPTS) $(MAKE) -C $(@D) DESTDIR=$(HOST_DIR) install
+ $(HOST_CONFIGURE_OPTS) $(MAKE) -C $(@D) DESTDIR=$(HOST_DIR) ENABLE_NLS= \
+ install
endef
$(eval $(generic-package))
--
2.5.0
^ permalink raw reply related [flat|nested] 14+ messages in thread
* [Buildroot] [PATCH v3 5/5] dos2unix: update homepage link
2015-09-03 4:10 [Buildroot] [PATCH v3 1/5] dos2unix: add target support Baruch Siach
` (2 preceding siblings ...)
2015-09-03 4:10 ` [Buildroot] [PATCH v3 4/5] dos2unix: remove host-gettext dependency from host package Baruch Siach
@ 2015-09-03 4:10 ` Baruch Siach
2015-09-04 10:52 ` Vicente Olivert Riera
2015-09-04 10:52 ` [Buildroot] [PATCH v3 1/5] dos2unix: add target support Vicente Olivert Riera
2015-09-04 15:07 ` Peter Korsgaard
5 siblings, 1 reply; 14+ messages in thread
From: Baruch Siach @ 2015-09-03 4:10 UTC (permalink / raw)
To: buildroot
Use the maintainer page that is much more informative than freecode.com.
Signed-off-by: Baruch Siach <baruch@tkos.co.il>
---
v3:
* New patch in this series
---
package/dos2unix/Config.in | 2 +-
package/dos2unix/Config.in.host | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/package/dos2unix/Config.in b/package/dos2unix/Config.in
index 782c25cf0e13..ead1a8ffac78 100644
--- a/package/dos2unix/Config.in
+++ b/package/dos2unix/Config.in
@@ -4,4 +4,4 @@ config BR2_PACKAGE_DOS2UNIX
help
dos2unix converts text file line endings between CRLF and LF
- http://freshmeat.net/projects/dos2unix
+ http://waterlan.home.xs4all.nl/dos2unix.html
diff --git a/package/dos2unix/Config.in.host b/package/dos2unix/Config.in.host
index 012d614c0df4..5ec6033a8e32 100644
--- a/package/dos2unix/Config.in.host
+++ b/package/dos2unix/Config.in.host
@@ -3,4 +3,4 @@ config BR2_PACKAGE_HOST_DOS2UNIX
help
dos2unix converts text file line endings between CRLF and LF
- http://freecode.com/projects/dos2unix
+ http://waterlan.home.xs4all.nl/dos2unix.html
--
2.5.0
^ permalink raw reply related [flat|nested] 14+ messages in thread
* [Buildroot] [PATCH v3 1/5] dos2unix: add target support
2015-09-03 4:10 [Buildroot] [PATCH v3 1/5] dos2unix: add target support Baruch Siach
` (3 preceding siblings ...)
2015-09-03 4:10 ` [Buildroot] [PATCH v3 5/5] dos2unix: update homepage link Baruch Siach
@ 2015-09-04 10:52 ` Vicente Olivert Riera
2015-09-04 15:07 ` Peter Korsgaard
5 siblings, 0 replies; 14+ messages in thread
From: Vicente Olivert Riera @ 2015-09-04 10:52 UTC (permalink / raw)
To: buildroot
Dear Baruch Siach,
On 09/03/2015 05:10 AM, Baruch Siach wrote:
> From: James Knight <james.knight@rockwellcollins.com>
>
> Allow the `dos2unix` utility to be built and installed on the target
> system.
>
> [baruch: properly handle target gettext]
> Signed-off-by: James Knight <james.knight@rockwellcollins.com>
> Signed-off-by: Baruch Siach <baruch@tkos.co.il>
> ---
> v3:
> * Show only if BR2_PACKAGE_BUSYBOX_SHOW_OTHERS is enabled (Peter)
> * Add busybox to _DEPENDENCIES
>
> v2:
> * Fix static build with gettext
> * Support build without locale support
> ---
> package/Config.in | 1 +
> package/dos2unix/Config.in | 11 +++++++++++
> package/dos2unix/dos2unix.mk | 25 ++++++++++++++++++++++---
> 3 files changed, 34 insertions(+), 3 deletions(-)
> create mode 100644 package/dos2unix/Config.in
>
> diff --git a/package/Config.in b/package/Config.in
> index 6ba21a1aace8..2c1325af31c5 100644
> --- a/package/Config.in
> +++ b/package/Config.in
> @@ -115,6 +115,7 @@ menu "Development tools"
> source "package/cvs/Config.in"
> if BR2_PACKAGE_BUSYBOX_SHOW_OTHERS
> source "package/diffutils/Config.in"
> + source "package/dos2unix/Config.in"
> source "package/findutils/Config.in"
> endif
> source "package/flex/Config.in"
> diff --git a/package/dos2unix/Config.in b/package/dos2unix/Config.in
> new file mode 100644
> index 000000000000..fdcd0700509b
> --- /dev/null
> +++ b/package/dos2unix/Config.in
> @@ -0,0 +1,11 @@
> +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
> diff --git a/package/dos2unix/dos2unix.mk b/package/dos2unix/dos2unix.mk
> index 2d7fcbbc6958..b1d21f27364d 100644
> --- a/package/dos2unix/dos2unix.mk
> +++ b/package/dos2unix/dos2unix.mk
> @@ -6,17 +6,36 @@
>
> DOS2UNIX_VERSION = 7.0
> DOS2UNIX_SITE = http://waterlan.home.xs4all.nl/dos2unix
> -DOS2UNIX_DEPENDENCIES = host-gettext
> DOS2UNIX_LICENSE = BSD-2c
> DOS2UNIX_LICENSE_FILES = COPYING.txt
> +DOS2UNIX_DEPENDENCIES = $(if $(BR2_PACKAGE_BUSYBOX),busybox)
> +HOST_DOS2UNIX_DEPENDENCIES = host-gettext
> +
> +ifeq ($(BR2_ENABLE_LOCALE),)
> +DOS2UNIX_MAKE_OPTS += ENABLE_NLS=
> +endif
> +
> +ifeq ($(BR2_NEEDS_GETTEXT_IF_LOCALE),y)
> +DOS2UNIX_DEPENDENCIES += gettext
> +DOS2UNIX_MAKE_OPTS += LIBS_EXTRA=-lintl
> +endif
> +
> +define DOS2UNIX_BUILD_CMDS
> + $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D) $(DOS2UNIX_MAKE_OPTS)
> +endef
> +
> +define DOS2UNIX_INSTALL_TARGET_CMDS
> + $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D) DESTDIR=$(TARGET_DIR) \
> + $(DOS2UNIX_MAKE_OPTS) install
> +endef
>
> define HOST_DOS2UNIX_BUILD_CMDS
> $(HOST_CONFIGURE_OPTS) $(MAKE) -C $(@D)
> endef
>
> define HOST_DOS2UNIX_INSTALL_CMDS
> - $(HOST_CONFIGURE_OPTS) $(MAKE) -C $(@D) \
> - install DESTDIR=$(HOST_DIR)
> + $(HOST_CONFIGURE_OPTS) $(MAKE) -C $(@D) DESTDIR=$(HOST_DIR) install
> endef
>
> +$(eval $(generic-package))
> $(eval $(host-generic-package))
>
Reviewed-by: Vicente Olivert Riera <Vincent.Riera@imgtec.com>
Tested-by: Vicente Olivert Riera <Vincent.Riera@imgtec.com>
Compile test for MIPS architecture:
$ grep ^DOS2UNIX_VERSION package/dos2unix/dos2unix.mk
DOS2UNIX_VERSION = 7.0
$ file output/target/usr/bin/dos2unix
output/target/usr/bin/dos2unix: ELF 32-bit MSB executable, MIPS, MIPS32
rel2 version 1 (SYSV), dynamically linked (uses shared libs), for
GNU/Linux 2.6.32, with unknown capability 0x41000000 = 0xf676e75, with
unknown capability 0x10000 = 0x70401, stripped
Regards,
Vincent.
^ permalink raw reply [flat|nested] 14+ messages in thread
* [Buildroot] [PATCH v3 2/5] dos2unix: bump to version 7.3
2015-09-03 4:10 ` [Buildroot] [PATCH v3 2/5] dos2unix: bump to version 7.3 Baruch Siach
@ 2015-09-04 10:52 ` Vicente Olivert Riera
0 siblings, 0 replies; 14+ messages in thread
From: Vicente Olivert Riera @ 2015-09-04 10:52 UTC (permalink / raw)
To: buildroot
Dear Baruch Siach,
On 09/03/2015 05:10 AM, Baruch Siach wrote:
> Cc: James Knight <james.knight@rockwellcollins.com>
> Signed-off-by: Baruch Siach <baruch@tkos.co.il>
> ---
> v2:
> * New patch in this series
> ---
> package/dos2unix/dos2unix.hash | 2 +-
> package/dos2unix/dos2unix.mk | 2 +-
> 2 files changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/package/dos2unix/dos2unix.hash b/package/dos2unix/dos2unix.hash
> index 7880f1d85567..b22b6fc1682e 100644
> --- a/package/dos2unix/dos2unix.hash
> +++ b/package/dos2unix/dos2unix.hash
> @@ -1,2 +1,2 @@
> # Locally calculated after checking pgp signature
> -sha256 551afe005a86e58664b4f41327408e73afafe92400488dd0aab1dad6deb4e72b dos2unix-7.0.tar.gz
> +sha256 8175f7552a72edaaa8918fdee68ce2cbc982dc25452f33d4dc611d769f4944d1 dos2unix-7.3.tar.gz
> diff --git a/package/dos2unix/dos2unix.mk b/package/dos2unix/dos2unix.mk
> index b1d21f27364d..0d5a67456e6b 100644
> --- a/package/dos2unix/dos2unix.mk
> +++ b/package/dos2unix/dos2unix.mk
> @@ -4,7 +4,7 @@
> #
> ################################################################################
>
> -DOS2UNIX_VERSION = 7.0
> +DOS2UNIX_VERSION = 7.3
> DOS2UNIX_SITE = http://waterlan.home.xs4all.nl/dos2unix
> DOS2UNIX_LICENSE = BSD-2c
> DOS2UNIX_LICENSE_FILES = COPYING.txt
>
Reviewed-by: Vicente Olivert Riera <Vincent.Riera@imgtec.com>
Tested-by: Vicente Olivert Riera <Vincent.Riera@imgtec.com>
Compile test for MIPS architecture:
$ grep ^DOS2UNIX_VERSION package/dos2unix/dos2unix.mk
DOS2UNIX_VERSION = 7.3
$ file output/target/usr/bin/dos2unix
output/target/usr/bin/dos2unix: ELF 32-bit MSB executable, MIPS, MIPS32
rel2 version 1 (SYSV), dynamically linked (uses shared libs), for
GNU/Linux 2.6.32, with unknown capability 0x41000000 = 0xf676e75, with
unknown capability 0x10000 = 0x70401, stripped
Regards,
Vincent.
^ permalink raw reply [flat|nested] 14+ messages in thread
* [Buildroot] [PATCH v3 3/5] dos2unix: remove WCHAR dependency
2015-09-03 4:10 ` [Buildroot] [PATCH v3 3/5] dos2unix: remove WCHAR dependency Baruch Siach
@ 2015-09-04 10:52 ` Vicente Olivert Riera
2015-09-04 12:16 ` Baruch Siach
0 siblings, 1 reply; 14+ messages in thread
From: Vicente Olivert Riera @ 2015-09-04 10:52 UTC (permalink / raw)
To: buildroot
Dear Baruch Siach,
On 09/03/2015 05:10 AM, Baruch Siach wrote:
> Add a patch fixing wchar build failure.
>
> Signed-off-by: Baruch Siach <baruch@tkos.co.il>
> ---
> I added this as a separate patch after version bump to avoid package patch
> rebase churn.
>
> v3:
> * New patch in this series (Peter)
> ---
> .../dos2unix/0001-fix-build-without-wchar.patch | 59 ++++++++++++++++++++++
> package/dos2unix/Config.in | 4 --
> package/dos2unix/dos2unix.mk | 4 ++
> 3 files changed, 63 insertions(+), 4 deletions(-)
> create mode 100644 package/dos2unix/0001-fix-build-without-wchar.patch
>
> 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 000000000000..c3188363ec7e
> --- /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
> + }
> + }
> +
> diff --git a/package/dos2unix/Config.in b/package/dos2unix/Config.in
> index fdcd0700509b..782c25cf0e13 100644
> --- a/package/dos2unix/Config.in
> +++ b/package/dos2unix/Config.in
> @@ -1,11 +1,7 @@
> 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
> diff --git a/package/dos2unix/dos2unix.mk b/package/dos2unix/dos2unix.mk
> index 0d5a67456e6b..4c5f4fcff384 100644
> --- a/package/dos2unix/dos2unix.mk
> +++ b/package/dos2unix/dos2unix.mk
> @@ -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
>
Reviewed-by: Vicente Olivert Riera <Vincent.Riera@imgtec.com>
Any instructions on how to reproduce the build failure so I can test it?
Also, does that patch fixes an autobuild failure? If so, please add the
"Fixes" line and the URL.
Regards,
Vincent.
^ permalink raw reply [flat|nested] 14+ messages in thread
* [Buildroot] [PATCH v3 4/5] dos2unix: remove host-gettext dependency from host package
2015-09-03 4:10 ` [Buildroot] [PATCH v3 4/5] dos2unix: remove host-gettext dependency from host package Baruch Siach
@ 2015-09-04 10:52 ` Vicente Olivert Riera
0 siblings, 0 replies; 14+ messages in thread
From: Vicente Olivert Riera @ 2015-09-04 10:52 UTC (permalink / raw)
To: buildroot
Dear Baruch Siach,
On 09/03/2015 05:10 AM, Baruch Siach wrote:
> This shortens build time.
>
> Signed-off-by: Baruch Siach <baruch@tkos.co.il>
> ---
> v3:
> * New patch in this series (Peter)
> ---
> package/dos2unix/dos2unix.mk | 7 ++++---
> 1 file changed, 4 insertions(+), 3 deletions(-)
>
> diff --git a/package/dos2unix/dos2unix.mk b/package/dos2unix/dos2unix.mk
> index 4c5f4fcff384..55608c653f9c 100644
> --- a/package/dos2unix/dos2unix.mk
> +++ b/package/dos2unix/dos2unix.mk
> @@ -9,7 +9,7 @@ DOS2UNIX_SITE = http://waterlan.home.xs4all.nl/dos2unix
> DOS2UNIX_LICENSE = BSD-2c
> DOS2UNIX_LICENSE_FILES = COPYING.txt
> DOS2UNIX_DEPENDENCIES = $(if $(BR2_PACKAGE_BUSYBOX),busybox)
> -HOST_DOS2UNIX_DEPENDENCIES = host-gettext
> +HOST_DOS2UNIX_DEPENDENCIES =
>
> ifeq ($(BR2_ENABLE_LOCALE),)
> DOS2UNIX_MAKE_OPTS += ENABLE_NLS=
> @@ -34,11 +34,12 @@ define DOS2UNIX_INSTALL_TARGET_CMDS
> endef
>
> define HOST_DOS2UNIX_BUILD_CMDS
> - $(HOST_CONFIGURE_OPTS) $(MAKE) -C $(@D)
> + $(HOST_CONFIGURE_OPTS) $(MAKE) -C $(@D) ENABLE_NLS=
> endef
>
> define HOST_DOS2UNIX_INSTALL_CMDS
> - $(HOST_CONFIGURE_OPTS) $(MAKE) -C $(@D) DESTDIR=$(HOST_DIR) install
> + $(HOST_CONFIGURE_OPTS) $(MAKE) -C $(@D) DESTDIR=$(HOST_DIR) ENABLE_NLS= \
> + install
> endef
>
> $(eval $(generic-package))
>
Reviewed-by: Vicente Olivert Riera <Vincent.Riera@imgtec.com>
Tested-by: Vicente Olivert Riera <Vincent.Riera@imgtec.com>
Compile test for MIPS architecture:
$ grep gettext output/build/build-time.log
$
$ grep host-dos2unix output/build/build-time.log | grep install
1441363609:start:install-host : host-dos2unix
1441363609:end :install-host : host-dos2unix
However I think your commit message is not correct. What your patch does
is disable the native language support therefore there is no need to
depend on gettext. Perhaps you could improve your commit message. Anyway
you can keep my reviewed-by and tested-by.
Regards,
Vincent.
^ permalink raw reply [flat|nested] 14+ messages in thread
* [Buildroot] [PATCH v3 5/5] dos2unix: update homepage link
2015-09-03 4:10 ` [Buildroot] [PATCH v3 5/5] dos2unix: update homepage link Baruch Siach
@ 2015-09-04 10:52 ` Vicente Olivert Riera
0 siblings, 0 replies; 14+ messages in thread
From: Vicente Olivert Riera @ 2015-09-04 10:52 UTC (permalink / raw)
To: buildroot
Dear Baruch Siach,
On 09/03/2015 05:10 AM, Baruch Siach wrote:
> Use the maintainer page that is much more informative than freecode.com.
>
> Signed-off-by: Baruch Siach <baruch@tkos.co.il>
> ---
> v3:
> * New patch in this series
> ---
> package/dos2unix/Config.in | 2 +-
> package/dos2unix/Config.in.host | 2 +-
> 2 files changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/package/dos2unix/Config.in b/package/dos2unix/Config.in
> index 782c25cf0e13..ead1a8ffac78 100644
> --- a/package/dos2unix/Config.in
> +++ b/package/dos2unix/Config.in
> @@ -4,4 +4,4 @@ config BR2_PACKAGE_DOS2UNIX
> help
> dos2unix converts text file line endings between CRLF and LF
>
> - http://freshmeat.net/projects/dos2unix
> + http://waterlan.home.xs4all.nl/dos2unix.html
> diff --git a/package/dos2unix/Config.in.host b/package/dos2unix/Config.in.host
> index 012d614c0df4..5ec6033a8e32 100644
> --- a/package/dos2unix/Config.in.host
> +++ b/package/dos2unix/Config.in.host
> @@ -3,4 +3,4 @@ config BR2_PACKAGE_HOST_DOS2UNIX
> help
> dos2unix converts text file line endings between CRLF and LF
>
> - http://freecode.com/projects/dos2unix
> + http://waterlan.home.xs4all.nl/dos2unix.html
>
Reviewed-by: Vicente Olivert Riera <Vincent.Riera@imgtec.com>
Regards,
Vincent.
^ permalink raw reply [flat|nested] 14+ messages in thread
* [Buildroot] [PATCH v3 3/5] dos2unix: remove WCHAR dependency
2015-09-04 10:52 ` Vicente Olivert Riera
@ 2015-09-04 12:16 ` Baruch Siach
0 siblings, 0 replies; 14+ messages in thread
From: Baruch Siach @ 2015-09-04 12:16 UTC (permalink / raw)
To: buildroot
Hi Vincent,
On Fri, Sep 04, 2015 at 11:52:25AM +0100, Vicente Olivert Riera wrote:
> On 09/03/2015 05:10 AM, Baruch Siach wrote:
> > 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>
>
> Any instructions on how to reproduce the build failure so I can test it?
> Also, does that patch fixes an autobuild failure? If so, please add the
> "Fixes" line and the URL.
This patch doesn't fix any build failure because current Buildroot master
doesn't support target dos2unix. Event with the previous patches applied, the
WCHAR dependency would prevent the build failure that the patch describes.
Thanks for reviewing,
baruch
--
http://baruch.siach.name/blog/ ~. .~ Tk Open Systems
=}------------------------------------------------ooO--U--Ooo------------{=
- baruch at tkos.co.il - tel: +972.2.679.5364, http://www.tkos.co.il -
^ permalink raw reply [flat|nested] 14+ messages in thread
* [Buildroot] [PATCH v3 1/5] dos2unix: add target support
2015-09-03 4:10 [Buildroot] [PATCH v3 1/5] dos2unix: add target support Baruch Siach
` (4 preceding siblings ...)
2015-09-04 10:52 ` [Buildroot] [PATCH v3 1/5] dos2unix: add target support Vicente Olivert Riera
@ 2015-09-04 15:07 ` Peter Korsgaard
2015-09-06 9:36 ` Baruch Siach
5 siblings, 1 reply; 14+ messages in thread
From: Peter Korsgaard @ 2015-09-04 15:07 UTC (permalink / raw)
To: buildroot
>>>>> "Baruch" == Baruch Siach <baruch@tkos.co.il> writes:
> From: James Knight <james.knight@rockwellcollins.com>
> Allow the `dos2unix` utility to be built and installed on the target
> system.
> [baruch: properly handle target gettext]
> Signed-off-by: James Knight <james.knight@rockwellcollins.com>
> Signed-off-by: Baruch Siach <baruch@tkos.co.il>
> ---
> v3:
> * Show only if BR2_PACKAGE_BUSYBOX_SHOW_OTHERS is enabled (Peter)
> * Add busybox to _DEPENDENCIES
Committed series, thanks!
--
Bye, Peter Korsgaard
^ permalink raw reply [flat|nested] 14+ messages in thread
* [Buildroot] [PATCH v3 1/5] dos2unix: add target support
2015-09-04 15:07 ` Peter Korsgaard
@ 2015-09-06 9:36 ` Baruch Siach
2015-09-06 9:42 ` Peter Korsgaard
0 siblings, 1 reply; 14+ messages in thread
From: Baruch Siach @ 2015-09-06 9:36 UTC (permalink / raw)
To: buildroot
Hi Peter,
On Fri, Sep 04, 2015 at 05:07:27PM +0200, Peter Korsgaard wrote:
> >>>>> "Baruch" == Baruch Siach <baruch@tkos.co.il> writes:
>
> > From: James Knight <james.knight@rockwellcollins.com>
> > Allow the `dos2unix` utility to be built and installed on the target
> > system.
>
> > [baruch: properly handle target gettext]
> > Signed-off-by: James Knight <james.knight@rockwellcollins.com>
> > Signed-off-by: Baruch Siach <baruch@tkos.co.il>
> > ---
> > v3:
> > * Show only if BR2_PACKAGE_BUSYBOX_SHOW_OTHERS is enabled (Peter)
> > * Add busybox to _DEPENDENCIES
>
> Committed series, thanks!
Thanks. All patches except the last one (5/5: dos2unix: update homepage link)
are in the master branch. What happened to the last one?
baruch
--
http://baruch.siach.name/blog/ ~. .~ Tk Open Systems
=}------------------------------------------------ooO--U--Ooo------------{=
- baruch at tkos.co.il - tel: +972.2.679.5364, http://www.tkos.co.il -
^ permalink raw reply [flat|nested] 14+ messages in thread
* [Buildroot] [PATCH v3 1/5] dos2unix: add target support
2015-09-06 9:36 ` Baruch Siach
@ 2015-09-06 9:42 ` Peter Korsgaard
0 siblings, 0 replies; 14+ messages in thread
From: Peter Korsgaard @ 2015-09-06 9:42 UTC (permalink / raw)
To: buildroot
>>>>> "Baruch" == Baruch Siach <baruch@tkos.co.il> writes:
Hi,
>> Committed series, thanks!
> Thanks. All patches except the last one (5/5: dos2unix: update homepage link)
> are in the master branch. What happened to the last one?
Hmm, I don't know. I've committed it now. Thanks!
--
Venlig hilsen,
Peter Korsgaard
^ permalink raw reply [flat|nested] 14+ messages in thread
end of thread, other threads:[~2015-09-06 9:42 UTC | newest]
Thread overview: 14+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-09-03 4:10 [Buildroot] [PATCH v3 1/5] dos2unix: add target support Baruch Siach
2015-09-03 4:10 ` [Buildroot] [PATCH v3 2/5] dos2unix: bump to version 7.3 Baruch Siach
2015-09-04 10:52 ` Vicente Olivert Riera
2015-09-03 4:10 ` [Buildroot] [PATCH v3 3/5] dos2unix: remove WCHAR dependency Baruch Siach
2015-09-04 10:52 ` Vicente Olivert Riera
2015-09-04 12:16 ` Baruch Siach
2015-09-03 4:10 ` [Buildroot] [PATCH v3 4/5] dos2unix: remove host-gettext dependency from host package Baruch Siach
2015-09-04 10:52 ` Vicente Olivert Riera
2015-09-03 4:10 ` [Buildroot] [PATCH v3 5/5] dos2unix: update homepage link Baruch Siach
2015-09-04 10:52 ` Vicente Olivert Riera
2015-09-04 10:52 ` [Buildroot] [PATCH v3 1/5] dos2unix: add target support Vicente Olivert Riera
2015-09-04 15:07 ` Peter Korsgaard
2015-09-06 9:36 ` Baruch Siach
2015-09-06 9:42 ` Peter Korsgaard
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox