summaryrefslogtreecommitdiffstats
path: root/package/dos2unix
diff options
context:
space:
mode:
authorJames Knight <james.knight@rockwellcollins.com>2015-09-03 07:10:50 +0300
committerPeter Korsgaard <peter@korsgaard.com>2015-09-04 16:51:49 +0200
commit9669819efdf885fa279f3e99c03bbb4c311de068 (patch)
treee67fe82cc61561911864500f55f844d2d3f53bc4 /package/dos2unix
parent0610de14901e5ad0f6c9b4db488477db47d2ff57 (diff)
downloadbuildroot-9669819efdf885fa279f3e99c03bbb4c311de068.tar.gz
buildroot-9669819efdf885fa279f3e99c03bbb4c311de068.zip
dos2unix: add target support
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> Reviewed-by: Vicente Olivert Riera <Vincent.Riera@imgtec.com> Tested-by: Vicente Olivert Riera <Vincent.Riera@imgtec.com> Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
Diffstat (limited to 'package/dos2unix')
-rw-r--r--package/dos2unix/Config.in11
-rw-r--r--package/dos2unix/dos2unix.mk25
2 files changed, 33 insertions, 3 deletions
diff --git a/package/dos2unix/Config.in b/package/dos2unix/Config.in
new file mode 100644
index 0000000000..fdcd070050
--- /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 2d7fcbbc69..b1d21f2736 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))
OpenPOWER on IntegriCloud