From 1504a1ef106643278e80bd98b21dd4439204e8ec Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN\"" Date: Mon, 23 Aug 2010 23:18:49 +0200 Subject: 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 --git a/config/companion_libs.in b/config/companion_libs.in index 386d382..6659884 100644 --- a/config/companion_libs.in +++ b/config/companion_libs.in @@ -102,57 +102,22 @@ config LIBELF 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 --git a/scripts/build/companion_libs/cloog.sh b/scripts/build/companion_libs/cloog.sh index d1219ea..3ee17b5 100644 --- a/scripts/build/companion_libs/cloog.sh +++ b/scripts/build/companion_libs/cloog.sh @@ -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 --git a/scripts/build/companion_libs/gmp.sh b/scripts/build/companion_libs/gmp.sh index 11da8f7..6f41696 100644 --- a/scripts/build/companion_libs/gmp.sh +++ b/scripts/build/companion_libs/gmp.sh @@ -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 @@ do_gmp_extract() { CT_Patch "gmp" "${CT_GMP_VERSION}" } -if [ "${CT_GMP}" = "y" ]; then - do_gmp() { local -a gmp_opts @@ -65,38 +62,3 @@ do_gmp() { } 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 --git a/scripts/build/companion_libs/mpc.sh b/scripts/build/companion_libs/mpc.sh index 652931f..043fb39 100644 --- a/scripts/build/companion_libs/mpc.sh +++ b/scripts/build/companion_libs/mpc.sh @@ -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 --git a/scripts/build/companion_libs/mpfr.sh b/scripts/build/companion_libs/mpfr.sh index 97e00b8..7088d16 100644 --- a/scripts/build/companion_libs/mpfr.sh +++ b/scripts/build/companion_libs/mpfr.sh @@ -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 @@ do_mpfr_extract() { esac } -if [ "${CT_MPFR}" = "y" ]; then - do_mpfr() { local -a mpfr_opts @@ -114,46 +111,3 @@ do_mpfr() { } 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 --git a/scripts/build/companion_libs/ppl.sh b/scripts/build/companion_libs/ppl.sh index 7746af1..6807476 100644 --- a/scripts/build/companion_libs/ppl.sh +++ b/scripts/build/companion_libs/ppl.sh @@ -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 --git a/steps.mk b/steps.mk index 63d5a47..18d4362 100644 --- a/steps.mk +++ b/steps.mk @@ -34,8 +34,6 @@ CT_STEPS := libc_check_config \ libc \ cc \ libc_finish \ - gmp_target \ - mpfr_target \ libelf_target \ binutils_target \ debug \ -- cgit v0.10.2-6-g49f6