uclibc: make target utils optional

These are broken for blackfin unfortunately so they're disabled.

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Reviewed-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Acked-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>

diff --git a/package/uclibc/Config.in b/package/uclibc/Config.in
index 17176f69e9826a95e11bebec0b3996b41be04a0b..92e04e9d6146676e35da577d9b2b96e950f38577 100644 (file)
--- a/package/uclibc/Config.in
+++ b/package/uclibc/Config.in
@@ -129,6 +129,17 @@ config BR2_PTHREAD_DEBUG
        help
          Build the thread library with debugging enabled.
 
+config BR2_UCLIBC_INSTALL_UTILS
+       bool "Compile and install uClibc utilities"
+       depends on !BR2_bfin
+       default y
+       help
+         Enabling this option will compile and install the getconf,
+         ldconfig and ldd uClibc utilities for the target.
+
+         You can save ~32 KiB in target space by disabling them since
+         they're normally not needed.
+
 config BR2_UCLIBC_INSTALL_TEST_SUITE
        bool "Compile and install uClibc tests"
        select BR2_PACKAGE_MAKE

diff --git a/package/uclibc/uclibc.mk b/package/uclibc/uclibc.mk
index cf53280c9b83a89aa3e62fda8acb4023777bc942..4a37fa0bad0798d26ae5418f614027c7bc30c9de 100644 (file)
--- a/package/uclibc/uclibc.mk
+++ b/package/uclibc/uclibc.mk
@@ -451,6 +451,16 @@ define UCLIBC_INSTALL_TEST_SUITE
 endef
 endif
 
+ifeq ($(BR2_UCLIBC_INSTALL_UTILS),y)
+define UCLIBC_INSTALL_UTILS_TARGET
+       $(MAKE1) -C $(@D) \
+               CC="$(TARGET_CC)" CPP="$(TARGET_CPP)" LD="$(TARGET_LD)" \
+               ARCH="$(UCLIBC_TARGET_ARCH)" \
+               PREFIX=$(TARGET_DIR) \
+               utils install_utils
+endef
+endif
+
 define UCLIBC_INSTALL_TARGET_CMDS
        $(MAKE1) -C $(@D) \
                $(UCLIBC_MAKE_FLAGS) \
@@ -458,11 +468,7 @@ define UCLIBC_INSTALL_TARGET_CMDS
                DEVEL_PREFIX=/usr/ \
                RUNTIME_PREFIX=/ \
                install_runtime
-       $(MAKE1) -C $(@D) \
-               CC="$(TARGET_CC)" CPP="$(TARGET_CPP)" LD="$(TARGET_LD)" \
-               ARCH="$(UCLIBC_TARGET_ARCH)" \
-               PREFIX=$(TARGET_DIR) \
-               utils install_utils
+       $(UCLIBC_INSTALL_UTILS_TARGET)
        $(UCLIBC_INSTALL_TEST_SUITE)
 endef