diff options
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/build/companion_tools/050-make.sh | 4 | ||||
| -rw-r--r-- | scripts/build/companion_tools/100-m4.sh | 4 | ||||
| -rw-r--r-- | scripts/build/companion_tools/200-autoconf.sh | 4 | ||||
| -rw-r--r-- | scripts/build/companion_tools/300-automake.sh | 4 | ||||
| -rw-r--r-- | scripts/build/companion_tools/400-libtool.sh | 4 | ||||
| -rw-r--r-- | scripts/build/libc/mingw.sh | 30 | ||||
| -rw-r--r-- | scripts/build/libc/uClibc.sh | 7 |
7 files changed, 47 insertions, 10 deletions
diff --git a/scripts/build/companion_tools/050-make.sh b/scripts/build/companion_tools/050-make.sh index d8f6b665..60cfa04e 100644 --- a/scripts/build/companion_tools/050-make.sh +++ b/scripts/build/companion_tools/050-make.sh @@ -12,7 +12,7 @@ do_companion_tools_make_extract() { } do_companion_tools_make_for_build() { - CT_DoStep EXTRA "Installing make for build" + CT_DoStep INFO "Installing make for build" CT_mkdir_pushd "${CT_BUILD_DIR}/build-make-build" do_make_backend \ host=${CT_BUILD} \ @@ -27,7 +27,7 @@ do_companion_tools_make_for_build() { } do_companion_tools_make_for_host() { - CT_DoStep EXTRA "Installing make for host" + CT_DoStep INFO "Installing make for host" CT_mkdir_pushd "${CT_BUILD_DIR}/build-make-host" do_make_backend \ host=${CT_HOST} \ diff --git a/scripts/build/companion_tools/100-m4.sh b/scripts/build/companion_tools/100-m4.sh index 96cde39d..2373c690 100644 --- a/scripts/build/companion_tools/100-m4.sh +++ b/scripts/build/companion_tools/100-m4.sh @@ -11,7 +11,7 @@ do_companion_tools_m4_extract() { } do_companion_tools_m4_for_build() { - CT_DoStep EXTRA "Installing m4 for build" + CT_DoStep INFO "Installing m4 for build" CT_mkdir_pushd "${CT_BUILD_DIR}/build-m4-build" do_m4_backend \ host=${CT_BUILD} \ @@ -23,7 +23,7 @@ do_companion_tools_m4_for_build() { } do_companion_tools_m4_for_host() { - CT_DoStep EXTRA "Installing m4 for host" + CT_DoStep INFO "Installing m4 for host" CT_mkdir_pushd "${CT_BUILD_DIR}/build-m4-host" do_m4_backend \ host=${CT_HOST} \ diff --git a/scripts/build/companion_tools/200-autoconf.sh b/scripts/build/companion_tools/200-autoconf.sh index 95b7115f..4f9fc637 100644 --- a/scripts/build/companion_tools/200-autoconf.sh +++ b/scripts/build/companion_tools/200-autoconf.sh @@ -12,7 +12,7 @@ do_companion_tools_autoconf_extract() { } do_companion_tools_autoconf_for_build() { - CT_DoStep EXTRA "Installing autoconf for build" + CT_DoStep INFO "Installing autoconf for build" CT_mkdir_pushd "${CT_BUILD_DIR}/build-autoconf-build" do_autoconf_backend host=${CT_BUILD} prefix="${CT_BUILD_COMPTOOLS_DIR}" CT_Popd @@ -20,7 +20,7 @@ do_companion_tools_autoconf_for_build() { } do_companion_tools_autoconf_for_host() { - CT_DoStep EXTRA "Installing autoconf for host" + CT_DoStep INFO "Installing autoconf for host" CT_mkdir_pushd "${CT_BUILD_DIR}/build-autoconf-host" do_autoconf_backend host=${CT_HOST} prefix="${CT_PREFIX_DIR}" CT_Popd diff --git a/scripts/build/companion_tools/300-automake.sh b/scripts/build/companion_tools/300-automake.sh index 85afaea0..e936e7be 100644 --- a/scripts/build/companion_tools/300-automake.sh +++ b/scripts/build/companion_tools/300-automake.sh @@ -12,7 +12,7 @@ do_companion_tools_automake_extract() { } do_companion_tools_automake_for_build() { - CT_DoStep EXTRA "Installing automake for build" + CT_DoStep INFO "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 @@ -20,7 +20,7 @@ do_companion_tools_automake_for_build() { } do_companion_tools_automake_for_host() { - CT_DoStep EXTRA "Installing automake for host" + CT_DoStep INFO "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 diff --git a/scripts/build/companion_tools/400-libtool.sh b/scripts/build/companion_tools/400-libtool.sh index 39aa204e..cfcc85b7 100644 --- a/scripts/build/companion_tools/400-libtool.sh +++ b/scripts/build/companion_tools/400-libtool.sh @@ -12,7 +12,7 @@ do_companion_tools_libtool_extract() { } do_companion_tools_libtool_for_build() { - CT_DoStep EXTRA "Installing libtool for build" + CT_DoStep INFO "Installing libtool for build" CT_mkdir_pushd "${CT_BUILD_DIR}/build-libtool-build" do_libtool_backend host=${CT_BUILD} prefix="${CT_BUILD_COMPTOOLS_DIR}" CT_Popd @@ -20,7 +20,7 @@ do_companion_tools_libtool_for_build() { } do_companion_tools_libtool_for_host() { - CT_DoStep EXTRA "Installing libtool for host" + CT_DoStep INFO "Installing libtool for host" CT_mkdir_pushd "${CT_BUILD_DIR}/build-libtool-host" do_libtool_backend host=${CT_HOST} prefix="${CT_PREFIX_DIR}" CT_Popd diff --git a/scripts/build/libc/mingw.sh b/scripts/build/libc/mingw.sh index 705f8c95..fddf1f7d 100644 --- a/scripts/build/libc/mingw.sh +++ b/scripts/build/libc/mingw.sh @@ -83,6 +83,31 @@ do_check_mingw_vendor_tuple() fi } +do_mingw_tools() { + for f in gendef genidl genlib genpeimg widl + do + if [[ ! -d "${CT_SRC_DIR}/mingw-w64-${CT_WINAPI_VERSION_DOWNLOADED}/mingw-w64-tools/${f}" ]]; then + continue; + fi + + CT_mkdir_pushd "${CT_BUILD_DIR}/build-mingw-w64-tools/${f}" + + CT_DoExecLog CFG \ + "${CT_SRC_DIR}/mingw-w64-${CT_WINAPI_VERSION_DOWNLOADED}/mingw-w64-tools/${f}/configure" \ + --build=${CT_BUILD} \ + --host=${CT_HOST} \ + --target=${CT_TARGET} \ + --program-prefix=${CT_TARGET}- \ + --prefix="${CT_PREFIX_DIR}" + + CT_DoExecLog ALL ${make} ${JOBSFLAGS} + + CT_DoExecLog ALL ${make} install + + CT_Popd + done +} + do_libc() { do_check_mingw_vendor_tuple @@ -109,6 +134,11 @@ do_libc() { CT_DoLog EXTRA "Installing mingw-w64-crt" CT_DoExecLog ALL make install DESTDIR=${CT_SYSROOT_DIR} + if [[ ${CT_MINGW_TOOLS} == "y" ]]; then + CT_DoLog EXTRA "Installing mingw-w64 companion tools" + do_mingw_tools + fi + CT_EndStep if [ "${CT_THREADS}" = "posix" ]; then diff --git a/scripts/build/libc/uClibc.sh b/scripts/build/libc/uClibc.sh index d86ae1ae..e58912cb 100644 --- a/scripts/build/libc/uClibc.sh +++ b/scripts/build/libc/uClibc.sh @@ -299,6 +299,13 @@ manage_uClibc_config() { esac if [ "${CT_LIBC_UCLIBC_FENV}" = "y" ]; then CT_KconfigEnableOption "UCLIBC_HAS_FENV" "${dst}" + else + CT_KconfigDisableOption "UCLIBC_HAS_FENV" "${dst}" + fi + if [ "${CT_LIBC_UCLIBC_RPC}" = "y" ]; then + CT_KconfigEnableOption "UCLIBC_HAS_RPC" "${dst}" + else + CT_KconfigDisableOption "UCLIBC_HAS_RPC" "${dst}" fi # We always want ctor/dtor |