summaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
authorAlexey Neyman <stilor@att.net>2017-01-26 06:39:21 (GMT)
committerGitHub <noreply@github.com>2017-01-26 06:39:21 (GMT)
commite1132fc82936f9dfe79f1f28054e11cb405122bf (patch)
tree410a058b21cff616cea07c91089d8527f42b09b7 /scripts
parent8168cab172678667a25f76301a78660877e28502 (diff)
parent7186e39f326150371b7909e2a938fe573f05cda1 (diff)
Merge pull request #557 from stilor/config-shell
Run all configure scripts using ${CONFIG_SHELL}
Diffstat (limited to 'scripts')
-rw-r--r--scripts/build/binutils/binutils.sh3
-rw-r--r--scripts/build/cc/100-gcc.sh34
-rw-r--r--scripts/build/companion_libs/100-gmp.sh1
-rw-r--r--scripts/build/companion_libs/110-mpfr.sh1
-rw-r--r--scripts/build/companion_libs/121-isl.sh1
-rw-r--r--scripts/build/companion_libs/130-cloog.sh1
-rw-r--r--scripts/build/companion_libs/140-mpc.sh1
-rw-r--r--scripts/build/companion_libs/200-libelf.sh1
-rwxr-xr-xscripts/build/companion_libs/210-expat.sh1
-rw-r--r--scripts/build/companion_libs/220-ncurses.sh1
-rw-r--r--scripts/build/companion_libs/320-libiconv.sh1
-rw-r--r--scripts/build/companion_libs/330-gettext.sh1
-rw-r--r--scripts/build/companion_tools/050-make.sh1
-rw-r--r--scripts/build/companion_tools/100-m4.sh1
-rw-r--r--scripts/build/companion_tools/200-autoconf.sh3
-rw-r--r--scripts/build/companion_tools/300-automake.sh4
-rw-r--r--scripts/build/companion_tools/400-libtool.sh4
-rw-r--r--scripts/build/debug/300-gdb.sh3
-rw-r--r--scripts/build/debug/400-ltrace.sh2
-rw-r--r--scripts/build/debug/500-strace.sh1
-rw-r--r--scripts/build/libc/avr-libc.sh1
-rw-r--r--scripts/build/libc/glibc.sh1
-rw-r--r--scripts/build/libc/mingw.sh4
-rw-r--r--scripts/build/libc/musl.sh1
-rw-r--r--scripts/build/libc/newlib.sh1
25 files changed, 55 insertions, 19 deletions
diff --git a/scripts/build/binutils/binutils.sh b/scripts/build/binutils/binutils.sh
index 17ea138..579ec95 100644
--- a/scripts/build/binutils/binutils.sh
+++ b/scripts/build/binutils/binutils.sh
@@ -216,6 +216,7 @@ do_binutils_backend() {
CFLAGS="${cflags}" \
CXXFLAGS="${cflags}" \
LDFLAGS="${ldflags}" \
+ ${CONFIG_SHELL} \
"${CT_SRC_DIR}/binutils-${CT_BINUTILS_VERSION}/configure" \
--build=${CT_BUILD} \
--host=${host} \
@@ -300,6 +301,7 @@ do_elf2flt_backend() {
CFLAGS="${cflags}" \
LDFLAGS="${ldflags}" \
LIBS="-ldl" \
+ ${CONFIG_SHELL} \
"${CT_SRC_DIR}/elf2flt-${CT_ELF2FLT_VERSION}/configure" \
--build=${CT_BUILD} \
--host=${host} \
@@ -359,6 +361,7 @@ do_binutils_for_target() {
[ "${CT_TOOLCHAIN_ENABLE_NLS}" != "y" ] && extra_config+=("--disable-nls")
CT_DoExecLog CFG \
+ ${CONFIG_SHELL} \
"${CT_SRC_DIR}/binutils-${CT_BINUTILS_VERSION}/configure" \
--build=${CT_BUILD} \
--host=${CT_TARGET} \
diff --git a/scripts/build/cc/100-gcc.sh b/scripts/build/cc/100-gcc.sh
index 0bf4aed..9dc56f6 100644
--- a/scripts/build/cc/100-gcc.sh
+++ b/scripts/build/cc/100-gcc.sh
@@ -595,6 +595,7 @@ do_gcc_core_backend() {
CFLAGS_FOR_TARGET="${CT_TARGET_CFLAGS}" \
CXXFLAGS_FOR_TARGET="${CT_TARGET_CFLAGS}" \
LDFLAGS_FOR_TARGET="${CT_TARGET_LDFLAGS}" \
+ ${CONFIG_SHELL} \
"${CT_SRC_DIR}/gcc-${CT_CC_GCC_VERSION}/configure" \
--build=${CT_BUILD} \
--host=${host} \
@@ -1109,23 +1110,24 @@ do_gcc_backend() {
cflags="$cflags "-fbracket-depth=512
fi
- CT_DoExecLog CFG \
- CC_FOR_BUILD="${CT_BUILD}-gcc" \
- CFLAGS="${cflags}" \
- CXXFLAGS="${cflags}" \
- LDFLAGS="${final_LDFLAGS[*]}" \
- CFLAGS_FOR_TARGET="${CT_TARGET_CFLAGS}" \
- CXXFLAGS_FOR_TARGET="${CT_TARGET_CFLAGS}" \
- LDFLAGS_FOR_TARGET="${CT_TARGET_LDFLAGS}" \
+ CT_DoExecLog CFG \
+ CC_FOR_BUILD="${CT_BUILD}-gcc" \
+ CFLAGS="${cflags}" \
+ CXXFLAGS="${cflags}" \
+ LDFLAGS="${final_LDFLAGS[*]}" \
+ CFLAGS_FOR_TARGET="${CT_TARGET_CFLAGS}" \
+ CXXFLAGS_FOR_TARGET="${CT_TARGET_CFLAGS}" \
+ LDFLAGS_FOR_TARGET="${CT_TARGET_LDFLAGS}" \
+ ${CONFIG_SHELL} \
"${CT_SRC_DIR}/gcc-${CT_CC_GCC_VERSION}/configure" \
- --build=${CT_BUILD} \
- --host=${host} \
- --target=${CT_TARGET} \
- --prefix="${prefix}" \
- ${CC_SYSROOT_ARG} \
- "${extra_config[@]}" \
- --with-local-prefix="${CT_SYSROOT_DIR}" \
- --enable-long-long \
+ --build=${CT_BUILD} \
+ --host=${host} \
+ --target=${CT_TARGET} \
+ --prefix="${prefix}" \
+ ${CC_SYSROOT_ARG} \
+ "${extra_config[@]}" \
+ --with-local-prefix="${CT_SYSROOT_DIR}" \
+ --enable-long-long \
"${CT_CC_GCC_EXTRA_CONFIG_ARRAY[@]}"
if [ "${CT_CANADIAN}" = "y" ]; then
diff --git a/scripts/build/companion_libs/100-gmp.sh b/scripts/build/companion_libs/100-gmp.sh
index f0df3d1..8ce500e 100644
--- a/scripts/build/companion_libs/100-gmp.sh
+++ b/scripts/build/companion_libs/100-gmp.sh
@@ -92,6 +92,7 @@ do_gmp_backend() {
CT_DoExecLog CFG \
CFLAGS="${cflags} -fexceptions" \
LDFLAGS="${ldflags}" \
+ ${CONFIG_SHELL} \
"${CT_SRC_DIR}/gmp-${CT_GMP_VERSION}/configure" \
--build=${CT_BUILD} \
--host=${host} \
diff --git a/scripts/build/companion_libs/110-mpfr.sh b/scripts/build/companion_libs/110-mpfr.sh
index bcbe90f..05b6860 100644
--- a/scripts/build/companion_libs/110-mpfr.sh
+++ b/scripts/build/companion_libs/110-mpfr.sh
@@ -137,6 +137,7 @@ do_mpfr_backend() {
CC="${host}-gcc" \
CFLAGS="${cflags}" \
LDFLAGS="${ldflags}" \
+ ${CONFIG_SHELL} \
"${CT_SRC_DIR}/mpfr-${CT_MPFR_VERSION}/configure" \
--build=${CT_BUILD} \
--host=${host} \
diff --git a/scripts/build/companion_libs/121-isl.sh b/scripts/build/companion_libs/121-isl.sh
index 8cc6dc2..bde63e3 100644
--- a/scripts/build/companion_libs/121-isl.sh
+++ b/scripts/build/companion_libs/121-isl.sh
@@ -100,6 +100,7 @@ do_isl_backend() {
CFLAGS="${cflags}" \
CXXFLAGS="${cxxflags}" \
LDFLAGS="${ldflags}" \
+ ${CONFIG_SHELL} \
"${CT_SRC_DIR}/isl-${CT_ISL_VERSION}/configure" \
--build=${CT_BUILD} \
--host=${host} \
diff --git a/scripts/build/companion_libs/130-cloog.sh b/scripts/build/companion_libs/130-cloog.sh
index 5504ac2..b1c307c 100644
--- a/scripts/build/companion_libs/130-cloog.sh
+++ b/scripts/build/companion_libs/130-cloog.sh
@@ -98,6 +98,7 @@ do_cloog_backend() {
CFLAGS="${cflags}" \
LDFLAGS="${ldflags}" \
LIBS="-lm" \
+ ${CONFIG_SHELL} \
"${CT_SRC_DIR}/cloog-${CT_CLOOG_VERSION}/configure" \
--build=${CT_BUILD} \
--host=${host} \
diff --git a/scripts/build/companion_libs/140-mpc.sh b/scripts/build/companion_libs/140-mpc.sh
index f68e18e..f753c51 100644
--- a/scripts/build/companion_libs/140-mpc.sh
+++ b/scripts/build/companion_libs/140-mpc.sh
@@ -87,6 +87,7 @@ do_mpc_backend() {
CT_DoExecLog CFG \
CFLAGS="${cflags}" \
LDFLAGS="${ldflags}" \
+ ${CONFIG_SHELL} \
"${CT_SRC_DIR}/mpc-${CT_MPC_VERSION}/configure" \
--build=${CT_BUILD} \
--host=${host} \
diff --git a/scripts/build/companion_libs/200-libelf.sh b/scripts/build/companion_libs/200-libelf.sh
index 8652f22..41e4564 100644
--- a/scripts/build/companion_libs/200-libelf.sh
+++ b/scripts/build/companion_libs/200-libelf.sh
@@ -131,6 +131,7 @@ do_libelf_backend() {
RANLIB="${host}-ranlib" \
CFLAGS="${cflags} -fPIC" \
LDFLAGS="${ldflags}" \
+ ${CONFIG_SHELL} \
"${CT_SRC_DIR}/libelf-${CT_LIBELF_VERSION}/configure" \
--build=${CT_BUILD} \
--host=${host} \
diff --git a/scripts/build/companion_libs/210-expat.sh b/scripts/build/companion_libs/210-expat.sh
index 4b21b59..5aa8e31 100755
--- a/scripts/build/companion_libs/210-expat.sh
+++ b/scripts/build/companion_libs/210-expat.sh
@@ -94,6 +94,7 @@ do_expat_backend() {
CT_DoExecLog CFG \
CFLAGS="${cflags}" \
LDFLAGS="${ldflags}" \
+ ${CONFIG_SHELL} \
"${CT_SRC_DIR}/expat-${CT_EXPAT_VERSION}/configure" \
--build=${CT_BUILD} \
--host=${host} \
diff --git a/scripts/build/companion_libs/220-ncurses.sh b/scripts/build/companion_libs/220-ncurses.sh
index ed7df2b..7cbd360 100644
--- a/scripts/build/companion_libs/220-ncurses.sh
+++ b/scripts/build/companion_libs/220-ncurses.sh
@@ -147,6 +147,7 @@ do_ncurses_backend() {
CT_DoExecLog CFG \
CFLAGS="${cflags}" \
LDFLAGS="${ldflags}" \
+ ${CONFIG_SHELL} \
"${CT_SRC_DIR}/ncurses-${CT_NCURSES_VERSION}/configure" \
--build=${CT_BUILD} \
--host=${host} \
diff --git a/scripts/build/companion_libs/320-libiconv.sh b/scripts/build/companion_libs/320-libiconv.sh
index 3f3ce24..3e7df3d 100644
--- a/scripts/build/companion_libs/320-libiconv.sh
+++ b/scripts/build/companion_libs/320-libiconv.sh
@@ -85,6 +85,7 @@ do_libiconv_backend() {
CT_DoExecLog CFG \
CFLAGS="${cflags}" \
LDFLAGS="${ldflags}" \
+ ${CONFIG_SHELL} \
"${CT_SRC_DIR}/libiconv-${CT_LIBICONV_VERSION}/configure" \
--build=${CT_BUILD} \
--host="${host}" \
diff --git a/scripts/build/companion_libs/330-gettext.sh b/scripts/build/companion_libs/330-gettext.sh
index 88384f8..9c1f1de 100644
--- a/scripts/build/companion_libs/330-gettext.sh
+++ b/scripts/build/companion_libs/330-gettext.sh
@@ -106,6 +106,7 @@ do_gettext_backend() {
CT_DoExecLog CFG \
CFLAGS="${cflags}" \
LDFLAGS="${ldflags}" \
+ ${CONFIG_SHELL} \
"${CT_SRC_DIR}/gettext-${CT_GETTEXT_VERSION}/configure" \
--build=${CT_BUILD} \
--host="${host}" \
diff --git a/scripts/build/companion_tools/050-make.sh b/scripts/build/companion_tools/050-make.sh
index 60cfa04..44487c1 100644
--- a/scripts/build/companion_tools/050-make.sh
+++ b/scripts/build/companion_tools/050-make.sh
@@ -55,6 +55,7 @@ do_make_backend() {
CT_DoExecLog CFG \
CFLAGS="${cflags}" \
LDFLAGS="${ldflags}" \
+ ${CONFIG_SHELL} \
"${CT_SRC_DIR}/make-${CT_MAKE_VERSION}/configure" \
--host="${host}" \
--prefix="${prefix}"
diff --git a/scripts/build/companion_tools/100-m4.sh b/scripts/build/companion_tools/100-m4.sh
index 2373c69..e0fccd7 100644
--- a/scripts/build/companion_tools/100-m4.sh
+++ b/scripts/build/companion_tools/100-m4.sh
@@ -57,6 +57,7 @@ do_m4_backend() {
CT_DoExecLog CFG \
CFLAGS="${cflags}" \
LDFLAGS="${ldflags}" \
+ ${CONFIG_SHELL} \
"${CT_SRC_DIR}/m4-${CT_M4_VERSION}/configure" \
--host="${host}" \
--prefix="${prefix}"
diff --git a/scripts/build/companion_tools/200-autoconf.sh b/scripts/build/companion_tools/200-autoconf.sh
index 4f9fc63..bccef75 100644
--- a/scripts/build/companion_tools/200-autoconf.sh
+++ b/scripts/build/companion_tools/200-autoconf.sh
@@ -40,7 +40,8 @@ do_autoconf_backend() {
# For reference see:
# http://www.gnu.org/software/autoconf/manual/autoconf.html#CONFIG_005fSHELL
CT_DoLog EXTRA "Configuring autoconf"
- CT_DoExecLog CFG ${CONFIG_SHELL} \
+ CT_DoExecLog CFG \
+ ${CONFIG_SHELL} \
"${CT_SRC_DIR}/autoconf-${CT_AUTOCONF_VERSION}/configure" \
--host="${host}" \
--prefix="${prefix}"
diff --git a/scripts/build/companion_tools/300-automake.sh b/scripts/build/companion_tools/300-automake.sh
index e936e7b..ee76463 100644
--- a/scripts/build/companion_tools/300-automake.sh
+++ b/scripts/build/companion_tools/300-automake.sh
@@ -36,7 +36,9 @@ do_automake_backend() {
done
CT_DoLog EXTRA "Configuring automake"
- CT_DoExecLog CFG "${CT_SRC_DIR}/automake-${CT_AUTOMAKE_VERSION}/configure" \
+ CT_DoExecLog CFG \
+ ${CONFIG_SHELL} \
+ "${CT_SRC_DIR}/automake-${CT_AUTOMAKE_VERSION}/configure" \
--host="${host}" \
--prefix="${prefix}"
diff --git a/scripts/build/companion_tools/400-libtool.sh b/scripts/build/companion_tools/400-libtool.sh
index cfcc85b..4461207 100644
--- a/scripts/build/companion_tools/400-libtool.sh
+++ b/scripts/build/companion_tools/400-libtool.sh
@@ -36,7 +36,9 @@ do_libtool_backend() {
done
CT_DoLog EXTRA "Configuring libtool"
- CT_DoExecLog CFG "${CT_SRC_DIR}/libtool-${CT_LIBTOOL_VERSION}/configure" \
+ CT_DoExecLog CFG \
+ ${CONFIG_SHELL} \
+ "${CT_SRC_DIR}/libtool-${CT_LIBTOOL_VERSION}/configure" \
--host="${host}" \
--prefix="${prefix}"
diff --git a/scripts/build/debug/300-gdb.sh b/scripts/build/debug/300-gdb.sh
index fe7787b..2370964 100644
--- a/scripts/build/debug/300-gdb.sh
+++ b/scripts/build/debug/300-gdb.sh
@@ -128,6 +128,7 @@ do_debug_gdb_build() {
CC="${CC_for_gdb}" \
CXX="${CXX_for_gdb}" \
LD="${LD_for_gdb}" \
+ ${CONFIG_SHELL} \
"${gdb_src_dir}/configure" \
--build=${CT_BUILD} \
--host=${CT_HOST} \
@@ -239,6 +240,7 @@ do_debug_gdb_build() {
CC="${CC_for_gdb}" \
CXX="${CXX_for_gdb}" \
LD="${LD_for_gdb}" \
+ ${CONFIG_SHELL} \
"${gdb_src_dir}/configure" \
--build=${CT_BUILD} \
--host=${CT_TARGET} \
@@ -309,6 +311,7 @@ do_debug_gdb_build() {
CPP="${CT_TARGET}-cpp" \
LD="${CT_TARGET}-ld" \
LDFLAGS="${gdbserver_LDFLAGS}" \
+ ${CONFIG_SHELL} \
"${gdb_src_dir}/gdb/gdbserver/configure" \
--build=${CT_BUILD} \
--host=${CT_TARGET} \
diff --git a/scripts/build/debug/400-ltrace.sh b/scripts/build/debug/400-ltrace.sh
index fdf1e40..2926876 100644
--- a/scripts/build/debug/400-ltrace.sh
+++ b/scripts/build/debug/400-ltrace.sh
@@ -42,9 +42,11 @@ do_debug_ltrace_build() {
HOST="${ltrace_host}" \
HOST_OS="${CT_TARGET_KERNEL}" \
CFLAGS="${CT_TARGET_CFLAGS}" \
+ ${CONFIG_SHELL} \
./configure --prefix=/usr
else
CT_DoExecLog CFG \
+ ${CONFIG_SHELL} \
./configure \
--build=${CT_BUILD} \
--host=${CT_TARGET} \
diff --git a/scripts/build/debug/500-strace.sh b/scripts/build/debug/500-strace.sh
index 2d8c7df..6eb2357 100644
--- a/scripts/build/debug/500-strace.sh
+++ b/scripts/build/debug/500-strace.sh
@@ -22,6 +22,7 @@ do_debug_strace_build() {
CC="${CT_TARGET}-${CT_CC}" \
CPP="${CT_TARGET}-cpp" \
LD="${CT_TARGET}-ld" \
+ ${CONFIG_SHELL} \
"${CT_SRC_DIR}/strace-${CT_STRACE_VERSION}/configure" \
--build=${CT_BUILD} \
--host=${CT_TARGET} \
diff --git a/scripts/build/libc/avr-libc.sh b/scripts/build/libc/avr-libc.sh
index 431e876..f94b601 100644
--- a/scripts/build/libc/avr-libc.sh
+++ b/scripts/build/libc/avr-libc.sh
@@ -22,6 +22,7 @@ do_libc_configure() {
CT_DoLog EXTRA "Configuring C library"
CT_DoExecLog CFG \
+ ${CONFIG_SHELL} \
./configure \
--build=${CT_BUILD} \
--host=${CT_TARGET} \
diff --git a/scripts/build/libc/glibc.sh b/scripts/build/libc/glibc.sh
index bce4cb8..c514cb7 100644
--- a/scripts/build/libc/glibc.sh
+++ b/scripts/build/libc/glibc.sh
@@ -502,6 +502,7 @@ do_libc_locales() {
CT_DoExecLog CFG \
CFLAGS="${glibc_cflags}" \
+ ${CONFIG_SHELL} \
"${src_dir}/configure" \
--prefix=/usr \
--cache-file="$(pwd)/config.cache" \
diff --git a/scripts/build/libc/mingw.sh b/scripts/build/libc/mingw.sh
index fddf1f7..eb04cb6 100644
--- a/scripts/build/libc/mingw.sh
+++ b/scripts/build/libc/mingw.sh
@@ -48,6 +48,7 @@ do_libc_start_files() {
do_set_mingw_install_prefix
CT_DoExecLog CFG \
+ ${CONFIG_SHELL} \
"${CT_SRC_DIR}/mingw-w64-${CT_WINAPI_VERSION_DOWNLOADED}/mingw-w64-headers/configure" \
--build=${CT_BUILD} \
--host=${CT_TARGET} \
@@ -93,6 +94,7 @@ do_mingw_tools() {
CT_mkdir_pushd "${CT_BUILD_DIR}/build-mingw-w64-tools/${f}"
CT_DoExecLog CFG \
+ ${CONFIG_SHELL} \
"${CT_SRC_DIR}/mingw-w64-${CT_WINAPI_VERSION_DOWNLOADED}/mingw-w64-tools/${f}/configure" \
--build=${CT_BUILD} \
--host=${CT_HOST} \
@@ -119,6 +121,7 @@ do_libc() {
do_set_mingw_install_prefix
CT_DoExecLog CFG \
+ ${CONFIG_SHELL} \
"${CT_SRC_DIR}/mingw-w64-${CT_WINAPI_VERSION_DOWNLOADED}/mingw-w64-crt/configure" \
--with-sysroot=${CT_SYSROOT_DIR} \
--prefix=${MINGW_INSTALL_PREFIX} \
@@ -158,6 +161,7 @@ do_pthreads() {
CT_mkdir_pushd "${CT_BUILD_DIR}/build-mingw-w64-winpthreads"
CT_DoExecLog CFG \
+ ${CONFIG_SHELL} \
"${CT_SRC_DIR}/mingw-w64-${CT_WINAPI_VERSION_DOWNLOADED}/mingw-w64-libraries/winpthreads/configure" \
--with-sysroot=${CT_SYSROOT_DIR} \
--prefix=${MINGW_INSTALL_PREFIX} \
diff --git a/scripts/build/libc/musl.sh b/scripts/build/libc/musl.sh
index 3eb0357..9bbd95a 100644
--- a/scripts/build/libc/musl.sh
+++ b/scripts/build/libc/musl.sh
@@ -110,6 +110,7 @@ do_libc_backend_once() {
CT_DoExecLog CFG \
CFLAGS="${extra_cflags[*]}" \
CROSS_COMPILE="${CT_TARGET}-" \
+ ${CONFIG_SHELL} \
${src_dir}/configure \
--host="${multi_target}" \
--target="${multi_target}" \
diff --git a/scripts/build/libc/newlib.sh b/scripts/build/libc/newlib.sh
index 0c0c2aa..3b48507 100644
--- a/scripts/build/libc/newlib.sh
+++ b/scripts/build/libc/newlib.sh
@@ -130,6 +130,7 @@ ENABLE_TARGET_OPTSPACE:target-optspace
CFLAGS_FOR_TARGET="${cflags_for_target}" \
AR_FOR_TARGET="`which ${CT_TARGET}-gcc-ar`" \
RANLIB_FOR_TARGET="`which ${CT_TARGET}-gcc-ranlib`" \
+ ${CONFIG_SHELL} \
"${CT_SRC_DIR}/newlib-${CT_LIBC_VERSION}/configure" \
--host=${CT_BUILD} \
--target=${CT_TARGET} \