# HG changeset patch # User "Yann E. MORIN" # Date 1282598329 -7200 # Node ID 1bb063c8a0cad78369ca34170ca15ea3b250dee8 # Parent 9a8f0e3fe60506ca6e55ef5e1aa00cae59f65601 complibs: noone is using companion libs on the target; nuke them As there's no longer any user of the companion libraries on the target, nuke the build for the target. Well, at least, there's libelf that's still needed by ltrace, so we keep it. Signed-off-by: "Yann E. MORIN" diff -r 9a8f0e3fe605 -r 1bb063c8a0ca config/companion_libs.in --- a/config/companion_libs.in Mon Aug 23 10:38:15 2010 +0200 +++ b/config/companion_libs.in Mon Aug 23 23:18:49 2010 +0200 @@ -102,57 +102,22 @@ can say 'Y' here, although it is unknown yet if any other component can use it. -config GMP_TARGET - bool - -config MPFR_TARGET - bool - select GMP_TARGET - -config PPL_TARGET - bool - select GMP_TARGET - select MPFR_TARGET - -config CLOOG_TARGET - bool - select GMP_TARGET - select MPFR_TARGET - select PPL_TARGET - -config MPC_TARGET - bool - select GMP_TARGET - select MPFR_TARGET - select PPL_TARGET - select CLOOG_TARGET - config LIBELF_TARGET bool -if GMP || GMP_TARGET -comment "GMP version needed to build for target" - depends on !GMP +if GMP source "config/companion_libs/gmp.in" endif -if MPFR || MPFR_TARGET -comment "MPFR version needed to build for target" - depends on !MPFR +if MPFR source "config/companion_libs/mpfr.in" endif -if PPL || PPL_TARGET -comment "PPL version needed to build for target" - depends on !PPL +if PPL source "config/companion_libs/ppl.in" endif -if CLOOG || CLOOG_TARGET -comment "CLOOG version needed to build for target" - depends on !CLOOG +if CLOOG source "config/companion_libs/cloog.in" endif -if MPC || MPC_TARGET -comment "MPC version needed to build for target" - depends on !MPC +if MPC source "config/companion_libs/mpc.in" endif if LIBELF || LIBELF_TARGET diff -r 9a8f0e3fe605 -r 1bb063c8a0ca scripts/build/companion_libs/cloog.sh --- a/scripts/build/companion_libs/cloog.sh Mon Aug 23 10:38:15 2010 +0200 +++ b/scripts/build/companion_libs/cloog.sh Mon Aug 23 23:18:49 2010 +0200 @@ -5,7 +5,6 @@ do_cloog_get() { :; } do_cloog_extract() { :; } do_cloog() { :; } -do_cloog_target() { :; } # Overide functions depending on configuration if [ "${CT_CLOOG}" = "y" ]; then diff -r 9a8f0e3fe605 -r 1bb063c8a0ca scripts/build/companion_libs/gmp.sh --- a/scripts/build/companion_libs/gmp.sh Mon Aug 23 10:38:15 2010 +0200 +++ b/scripts/build/companion_libs/gmp.sh Mon Aug 23 23:18:49 2010 +0200 @@ -5,10 +5,9 @@ do_gmp_get() { :; } do_gmp_extract() { :; } do_gmp() { :; } -do_gmp_target() { :; } # Overide functions depending on configuration -if [ "${CT_GMP}" = "y" -o "${CT_GMP_TARGET}" = "y" ]; then +if [ "${CT_GMP}" = "y" ]; then # Download GMP do_gmp_get() { @@ -21,8 +20,6 @@ CT_Patch "gmp" "${CT_GMP_VERSION}" } -if [ "${CT_GMP}" = "y" ]; then - do_gmp() { local -a gmp_opts @@ -65,38 +62,3 @@ } fi # CT_GMP - -if [ "${CT_GMP_TARGET}" = "y" ]; then - -do_gmp_target() { - mkdir -p "${CT_BUILD_DIR}/build-gmp-target" - cd "${CT_BUILD_DIR}/build-gmp-target" - - CT_DoStep INFO "Installing GMP for the target" - - CT_DoLog EXTRA "Configuring GMP" - CFLAGS="${CT_CFLAGS_FOR_TARGET}" \ - CT_DoExecLog ALL \ - "${CT_SRC_DIR}/gmp-${CT_GMP_VERSION}/configure" \ - --build=${CT_BUILD} \ - --host=${CT_TARGET} \ - --prefix=/usr \ - --disable-shared \ - --enable-static \ - --enable-fft \ - --enable-mpbsd \ - - CT_DoLog EXTRA "Building GMP" - CT_DoExecLog ALL make ${PARALLELMFLAGS} - - # Not possible to check MPFR while X-compiling - - CT_DoLog EXTRA "Installing GMP" - CT_DoExecLog ALL make DESTDIR="${CT_SYSROOT_DIR}" install - - CT_EndStep -} - -fi # CT_GMP_TARGET - -fi # CT_GMP || CT_GMP_TARGET diff -r 9a8f0e3fe605 -r 1bb063c8a0ca scripts/build/companion_libs/mpc.sh --- a/scripts/build/companion_libs/mpc.sh Mon Aug 23 10:38:15 2010 +0200 +++ b/scripts/build/companion_libs/mpc.sh Mon Aug 23 23:18:49 2010 +0200 @@ -5,7 +5,6 @@ do_mpc_get() { :; } do_mpc_extract() { :; } do_mpc() { :; } -do_mpc_target() { :; } # Overide functions depending on configuration if [ "${CT_MPC}" = "y" ]; then diff -r 9a8f0e3fe605 -r 1bb063c8a0ca scripts/build/companion_libs/mpfr.sh --- a/scripts/build/companion_libs/mpfr.sh Mon Aug 23 10:38:15 2010 +0200 +++ b/scripts/build/companion_libs/mpfr.sh Mon Aug 23 23:18:49 2010 +0200 @@ -5,10 +5,9 @@ do_mpfr_get() { :; } do_mpfr_extract() { :; } do_mpfr() { :; } -do_mpfr_target() { :; } # Overide function depending on configuration -if [ "${CT_MPFR}" = "y" -o "${CT_MPFR_TARGET}" = "y" ]; then +if [ "${CT_MPFR}" = "y" ]; then # Download MPFR do_mpfr_get() { @@ -64,8 +63,6 @@ esac } -if [ "${CT_MPFR}" = "y" ]; then - do_mpfr() { local -a mpfr_opts @@ -114,46 +111,3 @@ } fi # CT_MPFR - -if [ "${CT_MPFR_TARGET}" = "y" ]; then - -do_mpfr_target() { - mkdir -p "${CT_BUILD_DIR}/build-mpfr-target" - cd "${CT_BUILD_DIR}/build-mpfr-target" - - CT_DoStep INFO "Installing MPFR for the target" - - mpfr_opt= - # Under Cygwin, we can't build a thread-safe library - case "${CT_TARGET}" in - *-cygwin) mpfr_opt="--disable-thread-safe";; - *) mpfr_opt="--enable-thread-safe";; - esac - - CT_DoLog EXTRA "Configuring MPFR" - CC="${CT_TARGET}-gcc" \ - CFLAGS="${CT_CFLAGS_FOR_TARGET}" \ - CT_DoExecLog ALL \ - "${CT_SRC_DIR}/mpfr-${CT_MPFR_VERSION}/configure" \ - --build=${CT_BUILD} \ - --host=${CT_TARGET} \ - --prefix=/usr \ - ${mpfr_opt} \ - --disable-shared \ - --enable-static \ - --with-gmp="${CT_SYSROOT_DIR}/usr" - - CT_DoLog EXTRA "Building MPFR" - CT_DoExecLog ALL make ${PARALLELMFLAGS} - - # Not possible to check MPFR while X-compiling - - CT_DoLog EXTRA "Installing MPFR" - CT_DoExecLog ALL make DESTDIR="${CT_SYSROOT_DIR}" install - - CT_EndStep -} - -fi # CT_MPFR_TARGET - -fi # CT_MPFR || CT_MPFR_TARGET diff -r 9a8f0e3fe605 -r 1bb063c8a0ca scripts/build/companion_libs/ppl.sh --- a/scripts/build/companion_libs/ppl.sh Mon Aug 23 10:38:15 2010 +0200 +++ b/scripts/build/companion_libs/ppl.sh Mon Aug 23 23:18:49 2010 +0200 @@ -5,7 +5,6 @@ do_ppl_get() { :; } do_ppl_extract() { :; } do_ppl() { :; } -do_ppl_target() { :; } # Overide functions depending on configuration if [ "${CT_PPL}" = "y" ]; then diff -r 9a8f0e3fe605 -r 1bb063c8a0ca steps.mk --- a/steps.mk Mon Aug 23 10:38:15 2010 +0200 +++ b/steps.mk Mon Aug 23 23:18:49 2010 +0200 @@ -34,8 +34,6 @@ libc \ cc \ libc_finish \ - gmp_target \ - mpfr_target \ libelf_target \ binutils_target \ debug \