1.1 --- a/scripts/build/companion_libs/mpc.sh	Wed Apr 06 22:30:57 2011 +0200
     1.2 +++ b/scripts/build/companion_libs/mpc.sh	Sun Jul 17 18:56:30 2011 +0200
     1.3 @@ -4,7 +4,7 @@
     1.4  
     1.5  do_mpc_get() { :; }
     1.6  do_mpc_extract() { :; }
     1.7 -do_mpc() { :; }
     1.8 +do_mpc_for_host() { :; }
     1.9  
    1.10  # Overide functions depending on configuration
    1.11  if [ "${CT_MPC}" = "y" ]; then
    1.12 @@ -21,22 +21,47 @@
    1.13      CT_Patch "mpc" "${CT_MPC_VERSION}"
    1.14  }
    1.15  
    1.16 -do_mpc() {
    1.17 -    mkdir -p "${CT_BUILD_DIR}/build-mpc"
    1.18 -    cd "${CT_BUILD_DIR}/build-mpc"
    1.19 +# Build MPC for running on host
    1.20 +do_mpc_for_host() {
    1.21 +    local -a mpc_opts
    1.22  
    1.23 -    CT_DoStep INFO "Installing MPC"
    1.24 +    CT_DoStep INFO "Installing MPC for host"
    1.25 +    CT_mkdir_pushd "${CT_BUILD_DIR}/build-mpc-host-${CT_HOST}"
    1.26 +
    1.27 +    mpc_opts+=( "host=${CT_HOST}" )
    1.28 +    mpc_opts+=( "prefix=${CT_COMPLIBS_DIR}" )
    1.29 +    mpc_opts+=( "cflags=${CT_CFLAGS_FOR_HOST}" )
    1.30 +    do_mpc_backend "${mpc_opts[@]}"
    1.31 +
    1.32 +    CT_Popd
    1.33 +    CT_EndStep
    1.34 +}
    1.35 +
    1.36 +# Build MPC
    1.37 +#     Parameter     : description               : type      : default
    1.38 +#     host          : machine to run on         : tuple     : (none)
    1.39 +#     prefix        : prefix to install into    : dir       : (none)
    1.40 +#     cflags        : host cflags to use        : string    : (empty)
    1.41 +do_mpc_backend() {
    1.42 +    local host
    1.43 +    local prefix
    1.44 +    local cflags
    1.45 +    local arg
    1.46 +
    1.47 +    for arg in "$@"; do
    1.48 +        eval "${arg// /\\ }"
    1.49 +    done
    1.50  
    1.51      CT_DoLog EXTRA "Configuring MPC"
    1.52  
    1.53      CT_DoExecLog CFG                                \
    1.54 -    CFLAGS="${CT_CFLAGS_FOR_HOST}"                  \
    1.55 +    CFLAGS="${cflags}"                              \
    1.56      "${CT_SRC_DIR}/mpc-${CT_MPC_VERSION}/configure" \
    1.57          --build=${CT_BUILD}                         \
    1.58 -        --host=${CT_HOST}                           \
    1.59 -        --prefix="${CT_COMPLIBS_DIR}"               \
    1.60 -        --with-gmp="${CT_COMPLIBS_DIR}"             \
    1.61 -        --with-mpfr="${CT_COMPLIBS_DIR}"            \
    1.62 +        --host=${host}                              \
    1.63 +        --prefix="${prefix}"                        \
    1.64 +        --with-gmp="${prefix}"                      \
    1.65 +        --with-mpfr="${prefix}"                     \
    1.66          --disable-shared                            \
    1.67          --enable-static
    1.68  
    1.69 @@ -50,8 +75,6 @@
    1.70  
    1.71      CT_DoLog EXTRA "Installing MPC"
    1.72      CT_DoExecLog ALL make install
    1.73 -
    1.74 -    CT_EndStep
    1.75  }
    1.76  
    1.77  fi # CT_MPC