Fix the references to old config variables

Signed-off-by: Alexey Neyman <stilor@att.net>

11 files changed, 35 insertions, 67 deletions

diff --git a/scripts/build/companion_libs/050-zlib.sh b/scripts/build/companion_libs/050-zlib.sh
index a3ba638..868bf3d 100644
--- a/scripts/build/companion_libs/050-zlib.sh
+++ b/scripts/build/companion_libs/050-zlib.sh
@@ -13,14 +13,12 @@ if [ "${CT_ZLIB}" = "y" ]; then
 
 # Download zlib
 do_zlib_get() {
-    CT_GetFile "zlib-${CT_ZLIB_VERSION}"         \
-        "http://downloads.sourceforge.net/project/libpng/zlib/${CT_ZLIB_VERSION}"
+    CT_Fetch ZLIB
 }
 
 # Extract zlib
 do_zlib_extract() {
-    CT_Extract "zlib-${CT_ZLIB_VERSION}"
-    CT_Patch "zlib" "${CT_ZLIB_VERSION}"
+    CT_ExtractPatch ZLIB
 }
 
 # Build zlib for running on build
@@ -87,7 +85,7 @@ do_zlib_backend() {
         # zlib treats mingw host differently and requires using a different
         # makefile rather than configure+make. It also does not support
         # out-of-tree building.
-        cp -av "${CT_SRC_DIR}/zlib-${CT_ZLIB_VERSION}/." .
+        cp -av "${CT_SRC_DIR}/zlib/." .
         extra_make=( -f win32/Makefile.gcc \
             PREFIX="${host}-" \
             SHAREDLIB= \
@@ -107,7 +105,7 @@ do_zlib_backend() {
         LDFLAGS="${ldflags}"                              \
         CHOST="${host}"                                   \
         ${CONFIG_SHELL}                                   \
-        "${CT_SRC_DIR}/zlib-${CT_ZLIB_VERSION}/configure" \
+        "${CT_SRC_DIR}/zlib/configure"                    \
             --prefix="${prefix}"                          \
             --static                                      \
             "${extra_config[@]}"
diff --git a/scripts/build/companion_libs/100-gmp.sh b/scripts/build/companion_libs/100-gmp.sh
index 0fc5875..272af66 100644
--- a/scripts/build/companion_libs/100-gmp.sh
+++ b/scripts/build/companion_libs/100-gmp.sh
@@ -13,15 +13,12 @@ if [ "${CT_GMP}" = "y" ]; then
 
 # Download GMP
 do_gmp_get() {
-    CT_GetFile "gmp-${CT_GMP_VERSION}"         \
-        https://gmplib.org/download/gmp        \
-        {http,ftp,https}://ftp.gnu.org/gnu/gmp
+    CT_Fetch GMP
 }
 
 # Extract GMP
 do_gmp_extract() {
-    CT_Extract "gmp-${CT_GMP_VERSION}"
-    CT_Patch "gmp" "${CT_GMP_VERSION}"
+    CT_ExtractPatch GMP
 }
 
 # Build GMP for running on build
@@ -97,7 +94,7 @@ do_gmp_backend() {
     CFLAGS="${cflags} -fexceptions"                 \
     LDFLAGS="${ldflags}"                            \
     ${CONFIG_SHELL}                                 \
-    "${CT_SRC_DIR}/gmp-${CT_GMP_VERSION}/configure" \
+    "${CT_SRC_DIR}/gmp/configure"                   \
         --build=${CT_BUILD}                         \
         --host=${host}                              \
         --prefix="${prefix}"                        \
diff --git a/scripts/build/companion_libs/110-mpfr.sh b/scripts/build/companion_libs/110-mpfr.sh
index 5a89077..b4be3f4 100644
--- a/scripts/build/companion_libs/110-mpfr.sh
+++ b/scripts/build/companion_libs/110-mpfr.sh
@@ -13,16 +13,14 @@ if [ "${CT_MPFR}" = "y" ]; then
 
 # Download MPFR
 do_mpfr_get() {
-    CT_GetFile "mpfr-${CT_MPFR_VERSION}"            \
-        {https,http,ftp}://ftp.gnu.org/gnu/mpfr     \
-        http://www.mpfr.org/mpfr-${CT_MPFR_VERSION}
+    CT_Fetch MPFR
 }
 
 # Extract MPFR
 do_mpfr_extract() {
-    CT_Extract "mpfr-${CT_MPFR_VERSION}"
-    CT_Patch "mpfr" "${CT_MPFR_VERSION}"
+    CT_ExtractPatch MPFR
 
+    # TBD is it a problem with 2.4.x? The comment says it is not, yet the code is run
     # OK, Gentoo have a sanity check that libtool.m4 and ltmain.sh have the
     # same version number. Unfortunately, some tarballs of MPFR are not
     # built sanely, and thus ./configure fails on Gentoo.
@@ -115,7 +113,7 @@ do_mpfr_backend() {
     CFLAGS="${cflags}"                                  \
     LDFLAGS="${ldflags}"                                \
     ${CONFIG_SHELL}                                     \
-    "${CT_SRC_DIR}/mpfr-${CT_MPFR_VERSION}/configure"   \
+    "${CT_SRC_DIR}/mpfr/configure"                      \
         --build=${CT_BUILD}                             \
         --host=${host}                                  \
         --prefix="${prefix}"                            \
diff --git a/scripts/build/companion_libs/121-isl.sh b/scripts/build/companion_libs/121-isl.sh
index 0b8777b..d96e9ce 100644
--- a/scripts/build/companion_libs/121-isl.sh
+++ b/scripts/build/companion_libs/121-isl.sh
@@ -13,14 +13,12 @@ if [ "${CT_ISL}" = "y" ]; then
 
 # Download ISL
 do_isl_get() {
-    CT_GetFile "isl-${CT_ISL_VERSION}" \
-        http://isl.gforge.inria.fr
+    CT_Fetch ISL
 }
 
 # Extract ISL
 do_isl_extract() {
-    CT_Extract "isl-${CT_ISL_VERSION}"
-    CT_Patch "isl" "${CT_ISL_VERSION}"
+    CT_ExtractPatch ISL
 }
 
 # Build ISL for running on build
@@ -100,7 +98,7 @@ do_isl_backend() {
     CXXFLAGS="${cxxflags}"                          \
     LDFLAGS="${ldflags}"                            \
     ${CONFIG_SHELL}                                 \
-    "${CT_SRC_DIR}/isl-${CT_ISL_VERSION}/configure" \
+    "${CT_SRC_DIR}/isl/configure"                   \
         --build=${CT_BUILD}                         \
         --host=${host}                              \
         --prefix="${prefix}"                        \
diff --git a/scripts/build/companion_libs/130-cloog.sh b/scripts/build/companion_libs/130-cloog.sh
index 6090b27..445d259 100644
--- a/scripts/build/companion_libs/130-cloog.sh
+++ b/scripts/build/companion_libs/130-cloog.sh
@@ -13,18 +13,12 @@ if [ "${CT_CLOOG}" = "y" ]; then
 
 # Download CLooG
 do_cloog_get() {
-    CT_GetFile "cloog-${CT_CLOOG_VERSION}"          \
-        http://www.bastoul.net/cloog/pages/download \
-        ftp://gcc.gnu.org/pub/gcc/infrastructure
+    CT_Fetch CLOOG
 }
 
 # Extract CLooG
 do_cloog_extract() {
-    CT_Extract "cloog-${CT_CLOOG_VERSION}"
-    CT_Patch "cloog" "${CT_CLOOG_VERSION}"
-
-    # Help the autostuff in case it thinks there are things to regenerate...
-    CT_DoExecLog DEBUG mkdir -p "${CT_SRC_DIR}/cloog-${CT_CLOOG_VERSION}/m4"
+    CT_ExtractPatch CLOOG
 }
 
 # Build CLooG for running on build
@@ -98,7 +92,7 @@ do_cloog_backend() {
     LDFLAGS="${ldflags}"                                \
     LIBS="-lm"                                          \
     ${CONFIG_SHELL}                                     \
-    "${CT_SRC_DIR}/cloog-${CT_CLOOG_VERSION}/configure" \
+    "${CT_SRC_DIR}/cloog/configure"                     \
         --build=${CT_BUILD}                             \
         --host=${host}                                  \
         --prefix="${prefix}"                            \
diff --git a/scripts/build/companion_libs/140-mpc.sh b/scripts/build/companion_libs/140-mpc.sh
index e6efb4f..3136ab4 100644
--- a/scripts/build/companion_libs/140-mpc.sh
+++ b/scripts/build/companion_libs/140-mpc.sh
@@ -13,15 +13,12 @@ if [ "${CT_MPC}" = "y" ]; then
 
 # Download MPC
 do_mpc_get() {
-    CT_GetFile "mpc-${CT_MPC_VERSION}" .tar.gz      \
-        {http,ftp,https}://ftp.gnu.org/gnu/mpc      \
-        http://www.multiprecision.org/mpc/download
+    CT_Fetch MPC
 }
 
 # Extract MPC
 do_mpc_extract() {
-    CT_Extract "mpc-${CT_MPC_VERSION}"
-    CT_Patch "mpc" "${CT_MPC_VERSION}"
+    CT_ExtractPatch MPC
 }
 
 # Build MPC for running on build
@@ -87,7 +84,7 @@ do_mpc_backend() {
     CFLAGS="${cflags}"                              \
     LDFLAGS="${ldflags}"                            \
     ${CONFIG_SHELL}                                 \
-    "${CT_SRC_DIR}/mpc-${CT_MPC_VERSION}/configure" \
+    "${CT_SRC_DIR}/mpc/configure"                   \
         --build=${CT_BUILD}                         \
         --host=${host}                              \
         --prefix="${prefix}"                        \
diff --git a/scripts/build/companion_libs/200-libelf.sh b/scripts/build/companion_libs/200-libelf.sh
index 807ce7e..d1ac0b4 100644
--- a/scripts/build/companion_libs/200-libelf.sh
+++ b/scripts/build/companion_libs/200-libelf.sh
@@ -9,15 +9,11 @@ do_libelf_for_target() { :; }
 if [ "${CT_LIBELF}" = "y" -o "${CT_LIBELF_TARGET}" = "y" ]; then
 
 do_libelf_get() {
-    # The server hosting libelf will return an "HTTP 300 : Multiple Choices"
-    # error code if we try to download a file that does not exists there.
-    # So we have to request the file with an explicit extension.
-    CT_GetFile "libelf-${CT_LIBELF_VERSION}" .tar.gz http://www.mr511.de/software/
+    CT_Fetch LIBELF
 }
 
 do_libelf_extract() {
-    CT_Extract "libelf-${CT_LIBELF_VERSION}"
-    CT_Patch "libelf" "${CT_LIBELF_VERSION}"
+    CT_ExtractPatch LIBELF
 }
 
 if [ "${CT_LIBELF}" = "y" ]; then
@@ -131,7 +127,7 @@ do_libelf_backend() {
     CFLAGS="${cflags} -fPIC"                                \
     LDFLAGS="${ldflags}"                                    \
     ${CONFIG_SHELL}                                         \
-    "${CT_SRC_DIR}/libelf-${CT_LIBELF_VERSION}/configure"   \
+    "${CT_SRC_DIR}/libelf/configure"                        \
         --build=${CT_BUILD}                                 \
         --host=${host}                                      \
         --target=${CT_TARGET}                               \
diff --git a/scripts/build/companion_libs/210-expat.sh b/scripts/build/companion_libs/210-expat.sh
index 5aa8e31..dcb7208 100644
--- a/scripts/build/companion_libs/210-expat.sh
+++ b/scripts/build/companion_libs/210-expat.sh
@@ -9,13 +9,11 @@ do_expat_for_target() { :; }
 if [ "${CT_EXPAT_TARGET}" = "y" -o "${CT_EXPAT}" = "y" ]; then
 
 do_expat_get() {
-    CT_GetFile "expat-${CT_EXPAT_VERSION}" .tar.gz    \
-               http://downloads.sourceforge.net/project/expat/expat/${CT_EXPAT_VERSION}
+    CT_Fetch EXPAT
 }
 
 do_expat_extract() {
-    CT_Extract "expat-${CT_EXPAT_VERSION}"
-    CT_Patch "expat" "${CT_EXPAT_VERSION}"
+    CT_ExtractPatch EXPAT
 }
 
 if [ "${CT_EXPAT}" = "y" ]; then
@@ -95,7 +93,7 @@ do_expat_backend() {
     CFLAGS="${cflags}"                                              \
     LDFLAGS="${ldflags}"                                            \
     ${CONFIG_SHELL}                                                 \
-    "${CT_SRC_DIR}/expat-${CT_EXPAT_VERSION}/configure"             \
+    "${CT_SRC_DIR}/expat/configure"                                 \
         --build=${CT_BUILD}                                         \
         --host=${host}                                              \
         --prefix="${prefix}"                                        \
diff --git a/scripts/build/companion_libs/220-ncurses.sh b/scripts/build/companion_libs/220-ncurses.sh
index 7a1379d..815cf4b 100644
--- a/scripts/build/companion_libs/220-ncurses.sh
+++ b/scripts/build/companion_libs/220-ncurses.sh
@@ -9,15 +9,11 @@ do_ncurses_for_target() { :; }
 if [ "${CT_NCURSES_TARGET}" = "y" -o "${CT_NCURSES}" = "y" ]; then
 
 do_ncurses_get() {
-    CT_GetFile "ncurses-${CT_NCURSES_VERSION}" .tar.gz  \
-               {http,ftp,https}://ftp.gnu.org/pub/gnu/ncurses     \
-               ftp://invisible-island.net/ncurses
+    CT_Fetch NCURSES
 }
 
 do_ncurses_extract() {
-    CT_Extract "ncurses-${CT_NCURSES_VERSION}"
-    CT_DoExecLog ALL chmod -R u+w "${CT_SRC_DIR}/ncurses-${CT_NCURSES_VERSION}"
-    CT_Patch "ncurses" "${CT_NCURSES_VERSION}"
+    CT_ExtractPatch NCURSES
 }
 
 # We need tic that runs on the build when building ncurses for host/target
@@ -157,7 +153,7 @@ do_ncurses_backend() {
     CFLAGS="${cflags}"                                                  \
     LDFLAGS="${ldflags}"                                                \
     ${CONFIG_SHELL}                                                     \
-    "${CT_SRC_DIR}/ncurses-${CT_NCURSES_VERSION}/configure"             \
+    "${CT_SRC_DIR}/ncurses/configure"                                   \
         --build=${CT_BUILD}                                             \
         --host=${host}                                                  \
         --prefix="${prefix}"                                            \
diff --git a/scripts/build/companion_libs/320-libiconv.sh b/scripts/build/companion_libs/320-libiconv.sh
index f2f0bef..ad571a9 100644
--- a/scripts/build/companion_libs/320-libiconv.sh
+++ b/scripts/build/companion_libs/320-libiconv.sh
@@ -9,13 +9,11 @@ do_libiconv_for_target() { :; }
 if [ "${CT_LIBICONV}" = "y" ]; then
 
 do_libiconv_get() {
-    CT_GetFile "libiconv-${CT_LIBICONV_VERSION}" \
-               http://ftp.gnu.org/pub/gnu/libiconv/
+    CT_Fetch LIBICONV
 }
 
 do_libiconv_extract() {
-    CT_Extract "libiconv-${CT_LIBICONV_VERSION}"
-    CT_Patch "libiconv" "${CT_LIBICONV_VERSION}"
+    CT_ExtractPatch LIBICONV
 }
 
 # Build libiconv for running on build
@@ -93,7 +91,7 @@ do_libiconv_backend() {
     CFLAGS="${cflags}"                                        \
     LDFLAGS="${ldflags}"                                      \
     ${CONFIG_SHELL}                                           \
-    "${CT_SRC_DIR}/libiconv-${CT_LIBICONV_VERSION}/configure" \
+    "${CT_SRC_DIR}/libiconv/configure"                        \
         --build=${CT_BUILD}                                   \
         --host="${host}"                                      \
         --prefix="${prefix}"                                  \
diff --git a/scripts/build/companion_libs/330-gettext.sh b/scripts/build/companion_libs/330-gettext.sh
index 8828e5d..f3f1497 100644
--- a/scripts/build/companion_libs/330-gettext.sh
+++ b/scripts/build/companion_libs/330-gettext.sh
@@ -9,13 +9,11 @@ do_gettext_for_target() { :; }
 if [ "${CT_GETTEXT}" = "y" ]; then
 
 do_gettext_get() {
-    CT_GetFile "gettext-${CT_GETTEXT_VERSION}" \
-               http://ftp.gnu.org/pub/gnu/gettext/
+    CT_Fetch GETTEXT
 }
 
 do_gettext_extract() {
-    CT_Extract "gettext-${CT_GETTEXT_VERSION}"
-    CT_Patch "gettext" "${CT_GETTEXT_VERSION}"
+    CT_ExtractPatch GETTEXT
 }
 
 # Build gettext for running on build
@@ -112,7 +110,7 @@ do_gettext_backend() {
     CFLAGS="${cflags}"                                      \
     LDFLAGS="${ldflags}"                                    \
     ${CONFIG_SHELL}                                         \
-    "${CT_SRC_DIR}/gettext-${CT_GETTEXT_VERSION}/configure" \
+    "${CT_SRC_DIR}/gettext/configure"                       \
         --build=${CT_BUILD}                                 \
         --host="${host}"                                    \
         --prefix="${prefix}"                                \