summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGustavo Zacarias <gustavo@zacarias.com.ar>2012-04-26 00:15:24 (GMT)
committer Peter Korsgaard <jacmet@sunsite.dk>2012-04-29 08:52:39 (GMT)
commitd7616cc9be8b1c7d91df9133dac24a59bb2e19c8 (patch)
tree19d2945c829488e3b3a826d864526e23a41e5db0
parentb59f9e1562395411d10b8137ffd69e0ab573c6e2 (diff)
downloadbuildroot-d7616cc9be8b1c7d91df9133dac24a59bb2e19c8.tar.gz
buildroot-d7616cc9be8b1c7d91df9133dac24a59bb2e19c8.tar.bz2
lsof: add busybox tweaks
Since busybox 1.20+ includes a lsof applet make sure lsof gets built after busybox so that we get the full-blown version if both are enabled. Also hide the lsof package unless BUSYBOX_SHOW_OTHERS is true. Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar> Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
-rw-r--r--package/Config.in2
-rw-r--r--package/lsof/lsof.mk3
2 files changed, 5 insertions, 0 deletions
diff --git a/package/Config.in b/package/Config.in
index a310146..34570be 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -24,7 +24,9 @@ source "package/dmalloc/Config.in"
source "package/kexec/Config.in"
source "package/latencytop/Config.in"
source "package/lmbench/Config.in"
+if BR2_PACKAGE_BUSYBOX_SHOW_OTHERS
source "package/lsof/Config.in"
+endif
source "package/ltp-testsuite/Config.in"
source "package/lttng-babeltrace/Config.in"
source "package/lttng-modules/Config.in"
diff --git a/package/lsof/lsof.mk b/package/lsof/lsof.mk
index c07fb2d..7bc22c0 100644
--- a/package/lsof/lsof.mk
+++ b/package/lsof/lsof.mk
@@ -8,6 +8,9 @@ LSOF_VERSION = 4.85
LSOF_SOURCE = lsof_$(LSOF_VERSION).tar.bz2
LSOF_SITE = ftp://lsof.itap.purdue.edu/pub/tools/unix/lsof/
+# Make certain full-blown lsof gets built after the busybox version (1.20+)
+LSOF_DEPENDENCIES += $(if $(BR2_PACKAGE_BUSYBOX),busybox)
+
BR2_LSOF_CFLAGS =
ifeq ($(BR2_LARGEFILE),)
BR2_LSOF_CFLAGS += -U_FILE_OFFSET_BITS