build gmp/mpfr/mpc/isl libs separately

Author: jwt27

.github/workflows/main.yml

@@ -61,7 +61,7 @@ jobs:
         run: |
           sudo add-apt-repository ppa:ubuntu-toolchain-r/test
           sudo apt-get update
-          sudo apt-get install bison flex curl make texinfo zlib1g-dev tar bzip2 gzip xz-utils unzip dos2unix libtool-bin gcc-11 g++-11 cmake help2man python2-dev nasm libslang2-dev ccache libmpfr-dev libgmp-dev
+          sudo apt-get install bison flex curl make texinfo zlib1g-dev tar bzip2 gzip xz-utils unzip dos2unix libtool-bin gcc-11 g++-11 cmake help2man python2-dev nasm libslang2-dev ccache
           echo "CC=gcc-12" >> $GITHUB_ENV
           echo "CXX=g++-12" >> $GITHUB_ENV
           mkdir -p ~/.ccache
@@ -72,7 +72,7 @@ jobs:
         if: contains(matrix.os, 'macos')
         run: |
           brew update
-          brew install bash bison flex curl make texinfo zlib bzip2 gzip xz unzip dos2unix libtool cmake help2man nasm s-lang ccache mpfr gmp
+          brew install bash bison flex curl make texinfo zlib bzip2 gzip xz unzip dos2unix libtool cmake help2man nasm s-lang ccache
           mkdir -p ~/.ccache
           echo "CCACHE_DIR=~/.ccache" >> $GITHUB_ENV
           echo "$(brew --prefix)/opt/ccache/libexec" >> $GITHUB_PATH

build-djgpp.sh

@@ -211,19 +211,6 @@ if [ ! -z ${GCC_VERSION} ]; then
 
     cd ${BUILDDIR}/gnu/gcc-${GCC_VERSION} || exit 1
 
-    if [ ! -z ${BUILD_DEB} ]; then
-      echo "Unpacking gcc dependencies"
-      for URL in $GMP_ARCHIVE $MPFR_ARCHIVE $MPC_ARCHIVE $ISL_ARCHIVE; do
-        FILE=`basename $URL`
-        untar ${FILE}
-        mv ${FILE%.*.*} ${FILE%%-*} || exit 1
-      done
-    else
-      echo "Downloading gcc dependencies"
-      sed -i 's/ftp/http/g' contrib/download_prerequisites
-      ./contrib/download_prerequisites || exit 1
-    fi
-
     # apply extra patches if necessary
     cat ${BASE}/patch/djgpp-gcc-${GCC_VERSION}/* | patch -p1 -u || exit 1
 
@@ -331,7 +318,6 @@ if [ ! -z ${GCC_VERSION} ]; then
   echo "Installing gcc (stage 2)"
   ${SUDO} ${MAKE_J} install-strip || \
   ${SUDO} ${MAKE_J} install-strip || exit 1
-  ${SUDO} ${MAKE_J} -C mpfr install DESTDIR=${TMPINST}
 
   CFLAGS="$TEMP_CFLAGS"
   CXXFLAGS="$TEMP_CXXFLAGS"

debian/control

@@ -21,8 +21,6 @@ Build-Depends:
     nasm,
     libslang2-dev,
     pkg-config,
-    libgmp-dev,
-    libmpfr-dev,
     debhelper (>= 11)
 Standards-Version: 4.1.2
 Homepage: https://github.com/jwt27/build-gcc

script/build-avr-gcc.sh

@@ -54,7 +54,7 @@ if [ ! -z ${GCC_VERSION} ]; then
 
   GCC_CONFIGURE_OPTIONS+=" --target=${TARGET} --prefix=${PREFIX} ${HOST_FLAG} ${BUILD_FLAG}
                            --enable-languages=${ENABLE_LANGUAGES}
-                           --with-avrlibc"
+                           --with-avrlibc ${WITH_LIBS}"
   strip_whitespace GCC_CONFIGURE_OPTIONS
 
   if [ ! -e configure-prefix ] || [ ! "`cat configure-prefix`" == "${GCC_CONFIGURE_OPTIONS}" ]; then
@@ -117,7 +117,6 @@ if [ ! -z ${GCC_VERSION} ]; then
   echo "Installing gcc"
   ${SUDO} ${MAKE_J} install-strip || \
   ${SUDO} ${MAKE_J} install-strip || exit 1
-  ${SUDO} ${MAKE_J} -C mpfr install DESTDIR=${BASE}/build/tmpinst
 
   CFLAGS="$TEMP_CFLAGS"
   CXXFLAGS="$TEMP_CXXFLAGS"

script/build-gdb.sh

@@ -15,8 +15,7 @@ if [ ! -z ${GDB_VERSION} ]; then
 
   echo "Building gdb"
 
-  GDB_CONFIGURE_OPTIONS+=" --target=${TARGET} --prefix=${PREFIX} ${HOST_FLAG} ${BUILD_FLAG}"
-  [ -e ${BASE}/build/tmpinst${PREFIX}/lib/libmpfr.a ] && GDB_CONFIGURE_OPTIONS+=" --with-mpfr=${BASE}/build/tmpinst${PREFIX}"
+  GDB_CONFIGURE_OPTIONS+=" --target=${TARGET} --prefix=${PREFIX} ${HOST_FLAG} ${BUILD_FLAG} ${WITH_LIBS}"
   strip_whitespace GDB_CONFIGURE_OPTIONS
 
   if [ ! -e configure-prefix ] || [ ! "`cat configure-prefix`" = "${GDB_CONFIGURE_OPTIONS}" ]; then

script/build-newlib-gcc.sh

@@ -46,7 +46,7 @@ if [ ! -z ${GCC_VERSION} ]; then
 
   GCC_CONFIGURE_OPTIONS+=" --target=${TARGET} --prefix=${PREFIX} ${HOST_FLAG} ${BUILD_FLAG}
                            --enable-languages=${ENABLE_LANGUAGES}
-                           --with-newlib"
+                           --with-newlib ${WITH_LIBS}"
   strip_whitespace GCC_CONFIGURE_OPTIONS
 
   if [ ! -e configure-prefix ] || [ ! "`cat configure-prefix`" == "${GCC_CONFIGURE_OPTIONS}" ]; then
@@ -110,7 +110,6 @@ if [ ! -z ${GCC_VERSION} ]; then
   echo "Installing gcc"
   ${SUDO} ${MAKE_J} install-strip || \
   ${SUDO} ${MAKE_J} install-strip || exit 1
-  ${SUDO} ${MAKE_J} -C mpfr install DESTDIR=${BASE}/build/tmpinst
 
   CFLAGS="$TEMP_CFLAGS"
   CXXFLAGS="$TEMP_CXXFLAGS"

script/build-tools.sh

@@ -5,7 +5,7 @@ cd ${BASE}/build || exit 1
 
 # build GNU sed if needed.
 if [ ! -z "${SED_VERSION}" ]; then
-  if [ ! "$(${BASE}/build/tmpinst/sed-version 2> /dev/null)" == "${SED_VERSION}" ]; then
+  if [ ! "$(cat ${BASE}/build/tmpinst/sed-version 2> /dev/null)" == "${SED_VERSION}" ]; then
     echo "Building sed"
     untar ${SED_ARCHIVE} || exit 1
     cd sed-${SED_VERSION}/
@@ -18,3 +18,29 @@ if [ ! -z "${SED_VERSION}" ]; then
     echo ${SED_VERSION} > ${BASE}/build/tmpinst/sed-version
   fi
 fi
+
+build_lib()
+{
+  local display_name=$1
+  local name=${2:-${display_name,,}}
+  local archive_var=${3:-${name^^}_ARCHIVE}
+  local version_var=${4:-${name^^}_VERSION}
+  local archive=${!archive_var}
+  local version=${!version_var}
+  if [ ! -z "$version" ]; then
+    if [ "$(cat ${BASE}/build/tmpinst/${name}-version 2> /dev/null)" != "$version" ]; then
+      echo "Building $display_name $version"
+      untar $archive || exit 1
+      cd $name-$version/ || exit 1
+      ./configure --prefix=${BASE}/build/tmpinst --disable-shared || exit 1
+      ${MAKE_J} || exit 1
+      ${MAKE_J} DESTDIR= install || exit 1
+      echo $version > ${BASE}/build/tmpinst/${name}-version
+    fi
+  fi
+}
+
+build_lib GMP
+build_lib MPFR
+build_lib MPC
+build_lib ISL

script/check-deps-and-confirm.sh

@@ -22,18 +22,24 @@ case $TARGET in
 *) unset DJCROSS_GCC_ARCHIVE OLD_DJCROSS_GCC_ARCHIVE ;;
 esac
 
-if [ ! -z ${BUILD_DEB} ] && [ ! -z ${GCC_VERSION} ]; then
-  GMP_VERSION=${GMP_VERSION:-6.2.1}
-  MPFR_VERSION=${MPFR_VERSION:-4.1.0}
-  MPC_VERSION=${MPC_VERSION:-1.2.1}
-  ISL_VERSION=${ISL_VERSION:-0.24}
+if [ ! -z ${GCC_VERSION} ] || [ ! -z ${GDB_VERSION} ]; then
+  GMP_VERSION=${GMP_VERSION:-6.3.0}
+  MPFR_VERSION=${MPFR_VERSION:-4.2.1}
 
   GMP_ARCHIVE="http://ftpmirror.gnu.org/gnu/gmp/gmp-${GMP_VERSION}.tar.xz"
   MPFR_ARCHIVE="http://ftpmirror.gnu.org/gnu/mpfr/mpfr-${MPFR_VERSION}.tar.xz"
+fi
+
+if [ ! -z ${GCC_VERSION} ]; then
+  MPC_VERSION=${MPC_VERSION:-1.3.1}
+  ISL_VERSION=${ISL_VERSION:-0.24}
+
   MPC_ARCHIVE="http://ftpmirror.gnu.org/gnu/mpc/mpc-${MPC_VERSION}.tar.gz"
   ISL_ARCHIVE="http://gcc.gnu.org/pub/gcc/infrastructure/isl-${ISL_VERSION}.tar.bz2"
 fi
 
+WITH_LIBS=--with-{gmp,mpfr,mpc,isl}="${BASE}/build/tmpinst"
+
 # 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