Commit 9669819e authored by James Knight's avatar James Knight Committed by Peter Korsgaard
Browse files

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: default avatarJames Knight <james.knight@rockwellcollins.com>
Signed-off-by: default avatarBaruch Siach <baruch@tkos.co.il>
Reviewed-by: default avatarVicente Olivert Riera <Vincent.Riera@imgtec.com>
Tested-by: default avatarVicente Olivert Riera <Vincent.Riera@imgtec.com>
Signed-off-by: default avatarPeter Korsgaard <peter@korsgaard.com>
parent 0610de14

package/Config.in

+1 −0
Original line number Diff line number Diff line
@@ -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"

package/dos2unix/Config.in

0 → 100644
+11 −0
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

+22 −3
Original line number Diff line number Diff line
@@ -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))