From d1f24b9dc1ecc42c8f747430b94e42d6e6826b83 Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Sat, 20 Jul 2013 09:52:09 -0300 Subject: [PATCH] uclibc: make target utils optional These are broken for blackfin unfortunately so they're disabled. Signed-off-by: Gustavo Zacarias Reviewed-by: "Yann E. MORIN" Acked-by: "Yann E. MORIN" Signed-off-by: Thomas Petazzoni --- package/uclibc/Config.in | 11 +++++++++++ package/uclibc/uclibc.mk | 16 +++++++++++----- 2 files changed, 22 insertions(+), 5 deletions(-) diff --git a/package/uclibc/Config.in b/package/uclibc/Config.in index 17176f69e9..92e04e9d61 100644 --- 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 cf53280c9b..4a37fa0bad 100644 --- 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 -- 2.30.2