From cf86df688a8e7aeba28767ae0f841022a2e8347b Mon Sep 17 00:00:00 2001 From: Alexey Neyman Date: Mon, 28 Nov 2016 16:55:22 -0800 Subject: Add 'companion tools for host' step. Signed-off-by: Alexey Neyman --- scripts/build/companion_tools/300-automake.sh | 35 ++++++++++++++++++++------- 1 file changed, 26 insertions(+), 9 deletions(-) (limited to 'scripts/build/companion_tools/300-automake.sh') diff --git a/scripts/build/companion_tools/300-automake.sh b/scripts/build/companion_tools/300-automake.sh index 9d1b6e8e..85afaea0 100644 --- a/scripts/build/companion_tools/300-automake.sh +++ b/scripts/build/companion_tools/300-automake.sh @@ -12,20 +12,37 @@ do_companion_tools_automake_extract() { } do_companion_tools_automake_for_build() { - CT_DoStep EXTRA "Installing automake" - mkdir -p "${CT_BUILD_DIR}/build-automake" - CT_Pushd "${CT_BUILD_DIR}/build-automake" - + CT_DoStep EXTRA "Installing automake for build" + CT_mkdir_pushd "${CT_BUILD_DIR}/build-automake-build" + do_automake_backend host=${CT_BUILD} prefix="${CT_BUILD_COMPTOOLS_DIR}" + CT_Popd + CT_EndStep +} + +do_companion_tools_automake_for_host() { + CT_DoStep EXTRA "Installing automake for host" + CT_mkdir_pushd "${CT_BUILD_DIR}/build-automake-host" + do_automake_backend host=${CT_HOST} prefix="${CT_PREFIX_DIR}" + CT_Popd + CT_EndStep +} + +do_automake_backend() { + local host + local prefix + + for arg in "$@"; do + eval "${arg// /\\ }" + done + CT_DoLog EXTRA "Configuring automake" - CT_DoExecLog CFG \ - "${CT_SRC_DIR}/automake-${CT_AUTOMAKE_VERSION}/configure" \ - --prefix="${CT_BUILDTOOLS_PREFIX_DIR}" + CT_DoExecLog CFG "${CT_SRC_DIR}/automake-${CT_AUTOMAKE_VERSION}/configure" \ + --host="${host}" \ + --prefix="${prefix}" CT_DoLog EXTRA "Building automake" CT_DoExecLog ALL make CT_DoLog EXTRA "Installing automake" CT_DoExecLog ALL make install - CT_Popd - CT_EndStep } -- cgit v1.2.3