From 2ea05ecaa77cafacdb5664e0c5bec73a0164e15b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Beno=C3=AEt=20TH=C3=89BAUDEAU=22?= Date: Thu, 28 Jul 2011 22:09:31 +0200 Subject: scripts/libc: do not build add-ons by default MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Currently, no --enable-add-ons option is passed to libc configure when "$(do_libc_add_ons_list ,)" is empty, which makes configure automatically search for present add-ons. In that case, all present add-ons are built, although no add-on was selected by the user in the config. Moreover, this can make the configure fail if some non-standard add-ons like eglibc-localedef are present. This behavior also leads to an inconsistency from a user point of view between the following cases: - LIBC_ADDONS_LIST="", LIBC_GLIBC_USE_PORTS=n and THREADS="none" in the config, which makes "$(do_libc_add_ons_list ,)" return "", so all present add-ons are built. - LIBC_ADDONS_LIST="", LIBC_GLIBC_USE_PORTS=n and THREADS!="none" in the config, which makes "$(do_libc_add_ons_list ,)" return the add-on supporting the chosen threading implementation, e.g. "nptl", so only this add-on is built. This patch disables the building of all add-ons in that case. It is still possible to build all present add-ons by adding --enable-add-ons to LIBC_GLIBC_EXTRA_CONFIG_ARRAY. Signed-off-by: "Benoît THÉBAUDEAU" diff --git a/scripts/build/libc/glibc-eglibc.sh-common b/scripts/build/libc/glibc-eglibc.sh-common index 6e423b6..f57e9e9 100644 --- a/scripts/build/libc/glibc-eglibc.sh-common +++ b/scripts/build/libc/glibc-eglibc.sh-common @@ -142,7 +142,7 @@ do_libc_backend() { fi case "$(do_libc_add_ons_list ,)" in - "") ;; + "") extra_config+=("--enable-add-ons=no");; *) extra_config+=("--enable-add-ons=$(do_libc_add_ons_list ,)");; esac -- cgit v0.10.2-6-g49f6