summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorYann E. MORIN <yann.morin.1998@free.fr>2018-07-08 11:46:05 +0200
committerArnout Vandecappelle (Essensium/Mind) <arnout@mind.be>2018-07-08 13:08:05 +0200
commitae39bfe24ee16bc01047fdf55aebb45d5bedc820 (patch)
tree3fbf25686185c6fb25f24014e4fe349bc91eb960
parent1561592231a086b3384ddc1ce2ad05eb3c29376c (diff)
downloadbuildroot-ae39bfe24ee16bc01047fdf55aebb45d5bedc820.tar.gz
buildroot-ae39bfe24ee16bc01047fdf55aebb45d5bedc820.zip
package/busybox: invert dependency with dos2unix
Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr> Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
-rw-r--r--package/busybox/busybox.mk1
-rw-r--r--package/dos2unix/dos2unix.mk4
2 files changed, 2 insertions, 3 deletions
diff --git a/package/busybox/busybox.mk b/package/busybox/busybox.mk
index 166d187081..e50ca1447d 100644
--- a/package/busybox/busybox.mk
+++ b/package/busybox/busybox.mk
@@ -22,6 +22,7 @@ BUSYBOX_LDFLAGS = \
# Packages that provide commands that may also be busybox applets:
BUSYBOX_DEPENDENCIES = \
+ $(if $(BR2_PACKAGE_DOS2UNIX),dos2unix) \
$(if $(BR2_PACKAGE_E2FSPROGS),e2fsprogs) \
$(if $(BR2_PACKAGE_FBSET),fbset) \
$(if $(BR2_PACKAGE_GAWK),gawk) \
diff --git a/package/dos2unix/dos2unix.mk b/package/dos2unix/dos2unix.mk
index 5001397f05..0522ad1671 100644
--- a/package/dos2unix/dos2unix.mk
+++ b/package/dos2unix/dos2unix.mk
@@ -8,9 +8,7 @@ DOS2UNIX_VERSION = 7.4.0
DOS2UNIX_SITE = http://waterlan.home.xs4all.nl/dos2unix
DOS2UNIX_LICENSE = BSD-2-Clause
DOS2UNIX_LICENSE_FILES = COPYING.txt
-DOS2UNIX_DEPENDENCIES = \
- $(if $(BR2_PACKAGE_BUSYBOX),busybox) \
- $(TARGET_NLS_DEPENDENCIES)
+DOS2UNIX_DEPENDENCIES = $(TARGET_NLS_DEPENDENCIES)
ifeq ($(BR2_SYSTEM_ENABLE_NLS),y)
DOS2UNIX_MAKE_OPTS += ENABLE_NLS=1
OpenPOWER on IntegriCloud