From 7120d81f48b421fa6a9c15fc4026eec5dc271860 Mon Sep 17 00:00:00 2001 From: "Kirill K. Smirnov" Date: Mon, 29 Aug 2016 19:30:21 +0300 Subject: uClibc: install native utils This change adds native ldd and ldconfig utils to sysroot. For glibc just 'make install' installs everything including utils. For uclibc there exists a separate goal 'install_utils'. Make it. Signed-off-by: Kirill K. Smirnov diff --git a/scripts/build/libc/uClibc.sh b/scripts/build/libc/uClibc.sh index 18f234e..3e1463e 100644 --- a/scripts/build/libc/uClibc.sh +++ b/scripts/build/libc/uClibc.sh @@ -231,7 +231,7 @@ do_libc_backend_once() { # - "make install" calls install_runtime and install_dev # - so we're left with re-installing the headers... Sigh... CT_DoLog EXTRA "Installing C library" - CT_DoExecLog ALL ${make} "${make_args[@]}" install + CT_DoExecLog ALL ${make} "${make_args[@]}" install install_utils fi # libc_mode == final # Now, if installing headers into a subdirectory, put everything in its place. -- cgit v0.10.2-6-g49f6 From 41cd6542a737af78e4a38a00cc86c6ee138691e0 Mon Sep 17 00:00:00 2001 From: "Kirill K. Smirnov" Date: Mon, 29 Aug 2016 20:46:02 +0300 Subject: uClibc: propagate SHARED_LIBS option. This patch synchronizes crosstool CT_SHARED_LIBS and uclibc HAVE_SHARED options. Signed-off-by: Kirill K. Smirnov diff --git a/scripts/build/libc/uClibc.sh b/scripts/build/libc/uClibc.sh index 3e1463e..47e135b 100644 --- a/scripts/build/libc/uClibc.sh +++ b/scripts/build/libc/uClibc.sh @@ -278,6 +278,12 @@ manage_uClibc_config() { CT_KconfigDisableOption "ARCH_USE_MMU" "${dst}" fi + if [ "${CT_SHARED_LIBS}" = "y" ]; then + CT_KconfigEnableOption "HAVE_SHARED" "${dst}" + else + CT_KconfigDisableOption "HAVE_SHARED" "${dst}" + fi + # Accomodate for old and new uClibc version, where the # way to select between hard/soft float has changed case "${CT_ARCH_FLOAT}" in -- cgit v0.10.2-6-g49f6