1.1 --- a/config/companion_libs.in Mon Aug 23 10:38:15 2010 +0200
1.2 +++ b/config/companion_libs.in Mon Aug 23 23:18:49 2010 +0200
1.3 @@ -102,57 +102,22 @@
1.4 can say 'Y' here, although it is unknown yet if any other component
1.5 can use it.
1.6
1.7 -config GMP_TARGET
1.8 - bool
1.9 -
1.10 -config MPFR_TARGET
1.11 - bool
1.12 - select GMP_TARGET
1.13 -
1.14 -config PPL_TARGET
1.15 - bool
1.16 - select GMP_TARGET
1.17 - select MPFR_TARGET
1.18 -
1.19 -config CLOOG_TARGET
1.20 - bool
1.21 - select GMP_TARGET
1.22 - select MPFR_TARGET
1.23 - select PPL_TARGET
1.24 -
1.25 -config MPC_TARGET
1.26 - bool
1.27 - select GMP_TARGET
1.28 - select MPFR_TARGET
1.29 - select PPL_TARGET
1.30 - select CLOOG_TARGET
1.31 -
1.32 config LIBELF_TARGET
1.33 bool
1.34
1.35 -if GMP || GMP_TARGET
1.36 -comment "GMP version needed to build for target"
1.37 - depends on !GMP
1.38 +if GMP
1.39 source "config/companion_libs/gmp.in"
1.40 endif
1.41 -if MPFR || MPFR_TARGET
1.42 -comment "MPFR version needed to build for target"
1.43 - depends on !MPFR
1.44 +if MPFR
1.45 source "config/companion_libs/mpfr.in"
1.46 endif
1.47 -if PPL || PPL_TARGET
1.48 -comment "PPL version needed to build for target"
1.49 - depends on !PPL
1.50 +if PPL
1.51 source "config/companion_libs/ppl.in"
1.52 endif
1.53 -if CLOOG || CLOOG_TARGET
1.54 -comment "CLOOG version needed to build for target"
1.55 - depends on !CLOOG
1.56 +if CLOOG
1.57 source "config/companion_libs/cloog.in"
1.58 endif
1.59 -if MPC || MPC_TARGET
1.60 -comment "MPC version needed to build for target"
1.61 - depends on !MPC
1.62 +if MPC
1.63 source "config/companion_libs/mpc.in"
1.64 endif
1.65 if LIBELF || LIBELF_TARGET
2.1 --- a/scripts/build/companion_libs/cloog.sh Mon Aug 23 10:38:15 2010 +0200
2.2 +++ b/scripts/build/companion_libs/cloog.sh Mon Aug 23 23:18:49 2010 +0200
2.3 @@ -5,7 +5,6 @@
2.4 do_cloog_get() { :; }
2.5 do_cloog_extract() { :; }
2.6 do_cloog() { :; }
2.7 -do_cloog_target() { :; }
2.8
2.9 # Overide functions depending on configuration
2.10 if [ "${CT_CLOOG}" = "y" ]; then
3.1 --- a/scripts/build/companion_libs/gmp.sh Mon Aug 23 10:38:15 2010 +0200
3.2 +++ b/scripts/build/companion_libs/gmp.sh Mon Aug 23 23:18:49 2010 +0200
3.3 @@ -5,10 +5,9 @@
3.4 do_gmp_get() { :; }
3.5 do_gmp_extract() { :; }
3.6 do_gmp() { :; }
3.7 -do_gmp_target() { :; }
3.8
3.9 # Overide functions depending on configuration
3.10 -if [ "${CT_GMP}" = "y" -o "${CT_GMP_TARGET}" = "y" ]; then
3.11 +if [ "${CT_GMP}" = "y" ]; then
3.12
3.13 # Download GMP
3.14 do_gmp_get() {
3.15 @@ -21,8 +20,6 @@
3.16 CT_Patch "gmp" "${CT_GMP_VERSION}"
3.17 }
3.18
3.19 -if [ "${CT_GMP}" = "y" ]; then
3.20 -
3.21 do_gmp() {
3.22 local -a gmp_opts
3.23
3.24 @@ -65,38 +62,3 @@
3.25 }
3.26
3.27 fi # CT_GMP
3.28 -
3.29 -if [ "${CT_GMP_TARGET}" = "y" ]; then
3.30 -
3.31 -do_gmp_target() {
3.32 - mkdir -p "${CT_BUILD_DIR}/build-gmp-target"
3.33 - cd "${CT_BUILD_DIR}/build-gmp-target"
3.34 -
3.35 - CT_DoStep INFO "Installing GMP for the target"
3.36 -
3.37 - CT_DoLog EXTRA "Configuring GMP"
3.38 - CFLAGS="${CT_CFLAGS_FOR_TARGET}" \
3.39 - CT_DoExecLog ALL \
3.40 - "${CT_SRC_DIR}/gmp-${CT_GMP_VERSION}/configure" \
3.41 - --build=${CT_BUILD} \
3.42 - --host=${CT_TARGET} \
3.43 - --prefix=/usr \
3.44 - --disable-shared \
3.45 - --enable-static \
3.46 - --enable-fft \
3.47 - --enable-mpbsd \
3.48 -
3.49 - CT_DoLog EXTRA "Building GMP"
3.50 - CT_DoExecLog ALL make ${PARALLELMFLAGS}
3.51 -
3.52 - # Not possible to check MPFR while X-compiling
3.53 -
3.54 - CT_DoLog EXTRA "Installing GMP"
3.55 - CT_DoExecLog ALL make DESTDIR="${CT_SYSROOT_DIR}" install
3.56 -
3.57 - CT_EndStep
3.58 -}
3.59 -
3.60 -fi # CT_GMP_TARGET
3.61 -
3.62 -fi # CT_GMP || CT_GMP_TARGET
4.1 --- a/scripts/build/companion_libs/mpc.sh Mon Aug 23 10:38:15 2010 +0200
4.2 +++ b/scripts/build/companion_libs/mpc.sh Mon Aug 23 23:18:49 2010 +0200
4.3 @@ -5,7 +5,6 @@
4.4 do_mpc_get() { :; }
4.5 do_mpc_extract() { :; }
4.6 do_mpc() { :; }
4.7 -do_mpc_target() { :; }
4.8
4.9 # Overide functions depending on configuration
4.10 if [ "${CT_MPC}" = "y" ]; then
5.1 --- a/scripts/build/companion_libs/mpfr.sh Mon Aug 23 10:38:15 2010 +0200
5.2 +++ b/scripts/build/companion_libs/mpfr.sh Mon Aug 23 23:18:49 2010 +0200
5.3 @@ -5,10 +5,9 @@
5.4 do_mpfr_get() { :; }
5.5 do_mpfr_extract() { :; }
5.6 do_mpfr() { :; }
5.7 -do_mpfr_target() { :; }
5.8
5.9 # Overide function depending on configuration
5.10 -if [ "${CT_MPFR}" = "y" -o "${CT_MPFR_TARGET}" = "y" ]; then
5.11 +if [ "${CT_MPFR}" = "y" ]; then
5.12
5.13 # Download MPFR
5.14 do_mpfr_get() {
5.15 @@ -64,8 +63,6 @@
5.16 esac
5.17 }
5.18
5.19 -if [ "${CT_MPFR}" = "y" ]; then
5.20 -
5.21 do_mpfr() {
5.22 local -a mpfr_opts
5.23
5.24 @@ -114,46 +111,3 @@
5.25 }
5.26
5.27 fi # CT_MPFR
5.28 -
5.29 -if [ "${CT_MPFR_TARGET}" = "y" ]; then
5.30 -
5.31 -do_mpfr_target() {
5.32 - mkdir -p "${CT_BUILD_DIR}/build-mpfr-target"
5.33 - cd "${CT_BUILD_DIR}/build-mpfr-target"
5.34 -
5.35 - CT_DoStep INFO "Installing MPFR for the target"
5.36 -
5.37 - mpfr_opt=
5.38 - # Under Cygwin, we can't build a thread-safe library
5.39 - case "${CT_TARGET}" in
5.40 - *-cygwin) mpfr_opt="--disable-thread-safe";;
5.41 - *) mpfr_opt="--enable-thread-safe";;
5.42 - esac
5.43 -
5.44 - CT_DoLog EXTRA "Configuring MPFR"
5.45 - CC="${CT_TARGET}-gcc" \
5.46 - CFLAGS="${CT_CFLAGS_FOR_TARGET}" \
5.47 - CT_DoExecLog ALL \
5.48 - "${CT_SRC_DIR}/mpfr-${CT_MPFR_VERSION}/configure" \
5.49 - --build=${CT_BUILD} \
5.50 - --host=${CT_TARGET} \
5.51 - --prefix=/usr \
5.52 - ${mpfr_opt} \
5.53 - --disable-shared \
5.54 - --enable-static \
5.55 - --with-gmp="${CT_SYSROOT_DIR}/usr"
5.56 -
5.57 - CT_DoLog EXTRA "Building MPFR"
5.58 - CT_DoExecLog ALL make ${PARALLELMFLAGS}
5.59 -
5.60 - # Not possible to check MPFR while X-compiling
5.61 -
5.62 - CT_DoLog EXTRA "Installing MPFR"
5.63 - CT_DoExecLog ALL make DESTDIR="${CT_SYSROOT_DIR}" install
5.64 -
5.65 - CT_EndStep
5.66 -}
5.67 -
5.68 -fi # CT_MPFR_TARGET
5.69 -
5.70 -fi # CT_MPFR || CT_MPFR_TARGET
6.1 --- a/scripts/build/companion_libs/ppl.sh Mon Aug 23 10:38:15 2010 +0200
6.2 +++ b/scripts/build/companion_libs/ppl.sh Mon Aug 23 23:18:49 2010 +0200
6.3 @@ -5,7 +5,6 @@
6.4 do_ppl_get() { :; }
6.5 do_ppl_extract() { :; }
6.6 do_ppl() { :; }
6.7 -do_ppl_target() { :; }
6.8
6.9 # Overide functions depending on configuration
6.10 if [ "${CT_PPL}" = "y" ]; then
7.1 --- a/steps.mk Mon Aug 23 10:38:15 2010 +0200
7.2 +++ b/steps.mk Mon Aug 23 23:18:49 2010 +0200
7.3 @@ -34,8 +34,6 @@
7.4 libc \
7.5 cc \
7.6 libc_finish \
7.7 - gmp_target \
7.8 - mpfr_target \
7.9 libelf_target \
7.10 binutils_target \
7.11 debug \