use package version files for static libs

ia16/gcc

@@ -1,9 +1,10 @@
 GCC_VERSION="ia16"
-ISL_VERSION=0.15
 
 GCC_GIT="https://github.com/tkchia/gcc-ia16.git::gcc-6_3_0-ia16-tkchia"
 
 GCC_CONFIGURE_OPTIONS="--disable-plugin
                        --enable-lto
                        --disable-libstdcxx-dual-abi
                        ${GCC_CONFIGURE_OPTIONS}"
+
+source lib/isl-0.15

lib/gmp

@@ -0,0 +1 @@
+source lib/gmp-6.3.0

lib/gmp-6.3.0

@@ -0,0 +1,2 @@
+GMP_VERSION=6.3.0
+GMP_ARCHIVE="http://ftpmirror.gnu.org/gnu/gmp/gmp-${GMP_VERSION}.tar.xz"

lib/isl

@@ -0,0 +1 @@
+source lib/isl-0.24

lib/isl-0.15

@@ -0,0 +1,2 @@
+ISL_VERSION=0.15
+ISL_ARCHIVE="http://gcc.gnu.org/pub/gcc/infrastructure/isl-${ISL_VERSION}.tar.bz2"

lib/isl-0.24

@@ -0,0 +1,2 @@
+ISL_VERSION=0.24
+ISL_ARCHIVE="http://gcc.gnu.org/pub/gcc/infrastructure/isl-${ISL_VERSION}.tar.bz2"

lib/mpc

@@ -0,0 +1 @@
+source lib/mpc-1.3.1

lib/mpc-1.3.1

@@ -0,0 +1,2 @@
+MPC_VERSION=1.3.1
+MPC_ARCHIVE="http://ftpmirror.gnu.org/gnu/mpc/mpc-${MPC_VERSION}.tar.gz"

lib/mpfr

@@ -0,0 +1 @@
+source lib/mpfr-4.2.1

lib/mpfr-4.2.1

@@ -0,0 +1,2 @@
+MPFR_VERSION=4.2.1
+MPFR_ARCHIVE="http://ftpmirror.gnu.org/gnu/mpfr/mpfr-${MPFR_VERSION}.tar.xz"

script/build-tools.sh

@@ -1,7 +1,3 @@
-TMPINST="${BASE}/build/tmpinst"
-mkdir -p "$TMPINST"
-export PATH="${TMPINST}/bin:$PATH"
-
 cd "${BASE}/build/" || exit 1
 
 # build GNU sed if needed.

script/check-deps-and-confirm.sh

@@ -1,16 +1,26 @@
-if [ -z ${IGNORE_DEPENDENCIES} ]; then
-  for DEP in ${DEPS}; do
-    case $DEP in
-      djgpp)    [ -z "$(get_version djgpp)" ]    && add_pkg djgpp ;;
-      newlib)   [ -z "$(get_version newlib)" ]   && add_pkg newlib ;;
-      avr-libc) [ -z "$(get_version avr-libc)" ] && add_pkg avr-libc ;;
-      binutils) [ -z "$(get_version binutils)" ] && add_pkg binutils ;;
-      gcc)      [ -z "$(get_version gcc)" ]      && add_pkg gcc ;;
-      gdb)      [ -z "$(get_version gdb)" ]      && add_pkg gdb ;;
-    esac
+if [ -z "$IGNORE_DEPENDENCIES" ]; then
+  for DEP in $DEPS; do
+    [ -z "$(get_version "$DEP")" ] && add_pkg "$DEP"
   done
 fi
 
+LIBDEPS=''
+
+if [ ! -z "$GCC_VERSION" ] || [ ! -z "$GDB_VERSION" ]; then
+  LIBDEPS+=' gmp mpfr'
+fi
+
+if [ ! -z "$GCC_VERSION" ]; then
+  LIBDEPS+=' mpc isl'
+fi
+
+for DEP in $LIBDEPS; do
+  VERSION_VAR="${DEP^^}_VERSION"
+  if [ -z "${!VERSION_VAR}" ]; then
+    source "lib/$DEP" || exit 1
+  fi
+done
+
 if [ ! -z ${GCC_VERSION} ] && [ -z ${DJCROSS_GCC_ARCHIVE} ] && [ "${DJCROSS_METHOD}" == 'djcross' ]; then
   DJCROSS_GCC_ARCHIVE="${DJGPP_DOWNLOAD_BASE}/djgpp/rpms/djcross-gcc-${GCC_VERSION}/djcross-gcc-${GCC_VERSION}.tar.bz2"
   # djcross-gcc-X.XX-tar.* maybe moved from /djgpp/rpms/ to /djgpp/deleted/rpms/ directory.
@@ -22,29 +32,6 @@ case $TARGET in
 *) unset DJCROSS_GCC_ARCHIVE OLD_DJCROSS_GCC_ARCHIVE ;;
 esac
 
-if [ ! -z "$GCC_VERSION" ] || [ ! -z "$GDB_VERSION" ]; then
-  GMP_VERSION="${GMP_VERSION:-6.3.0}"
-  MPFR_VERSION="${MPFR_VERSION:-4.2.1}"
-fi
-
-if [ ! -z "$GCC_VERSION" ]; then
-  MPC_VERSION="${MPC_VERSION:-1.3.1}"
-  ISL_VERSION="${ISL_VERSION:-0.24}"
-fi
-
-if [ ! -z "$GMP_VERSION" ]; then
-  GMP_ARCHIVE="http://ftpmirror.gnu.org/gnu/gmp/gmp-${GMP_VERSION}.tar.xz"
-fi
-if [ ! -z "$MPFR_VERSION" ]; then
-  MPFR_ARCHIVE="http://ftpmirror.gnu.org/gnu/mpfr/mpfr-${MPFR_VERSION}.tar.xz"
-fi
-if [ ! -z "$MPC_VERSION" ]; then
-  MPC_ARCHIVE="http://ftpmirror.gnu.org/gnu/mpc/mpc-${MPC_VERSION}.tar.gz"
-fi
-if [ ! -z "$ISL_VERSION" ]; then
-  ISL_ARCHIVE="http://gcc.gnu.org/pub/gcc/infrastructure/isl-${ISL_VERSION}.tar.bz2"
-fi
-
 # check GNU sed is installed or not.
 # It is for OSX, which doesn't ship with GNU sed.
 if ! sed --version 2>/dev/null | grep "GNU sed" > /dev/null ;then

script/init.sh

@@ -6,6 +6,9 @@ unset INSTALL
 umask 022
 
 BASE=`pwd`
+TMPINST="${BASE}/build/tmpinst"
+mkdir -p "$TMPINST"
+export PATH="${TMPINST}/bin:$PATH"
 
 # number of parallel build threads
 if nproc > /dev/null 2>&1 ; then