scripts/build/companion_tools/050-make.sh
author "Benoît THÉBAUDEAU" <benoit.thebaudeau@advansee.com>
Thu Jul 28 22:09:31 2011 +0200 (2011-07-28)
changeset 2573 424fa2092ace
parent 2309 2e0f0757289d
permissions -rw-r--r--
scripts/libc: do not build add-ons by default

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" <benoit.thebaudeau@advansee.com>
yann@2285
     1
# Build script for make
yann@2285
     2
yann@2285
     3
CT_MAKE_VERSION=3.81
yann@2285
     4
yann@2285
     5
do_companion_tools_make_get() {
yann@2285
     6
    CT_GetFile "make-${CT_MAKE_VERSION}" \
yann@2285
     7
               {http,ftp}://ftp.gnu.org/gnu/make
yann@2285
     8
}
yann@2285
     9
yann@2285
    10
do_companion_tools_make_extract() {
yann@2285
    11
    CT_Extract "make-${CT_MAKE_VERSION}"
yann@2328
    12
    CT_DoExecLog ALL chmod -R u+w "${CT_SRC_DIR}/make-${CT_MAKE_VERSION}"
yann@2285
    13
    CT_Patch "make" "${CT_MAKE_VERSION}"
yann@2285
    14
}
yann@2285
    15
yann@2285
    16
do_companion_tools_make_build() {
yann@2285
    17
    CT_DoStep EXTRA "Installing make"
yann@2285
    18
    mkdir -p "${CT_BUILD_DIR}/build-make"
yann@2285
    19
    CT_Pushd "${CT_BUILD_DIR}/build-make"
yann@2285
    20
yann@2285
    21
    CT_DoExecLog CFG "${CT_SRC_DIR}/make-${CT_MAKE_VERSION}/configure" \
yann@2309
    22
                     --prefix="${CT_BUILDTOOLS_PREFIX_DIR}"
yann@2285
    23
    CT_DoExecLog ALL make
yann@2285
    24
    CT_DoExecLog ALL make install
yann@2285
    25
    CT_Popd
yann@2285
    26
    CT_EndStep
yann@2285
    27
}