diff --git a/build/bin/write-dockerfile.sh b/build/bin/write-dockerfile.sh index a7d23ba9689..854f0285967 100755 --- a/build/bin/write-dockerfile.sh +++ b/build/bin/write-dockerfile.sh @@ -53,6 +53,12 @@ EOF UPDATE="$SUDO apt-get update &&" INSTALL="$SUDO DEBIAN_FRONTEND=noninteractive apt-get install -qqq --no-install-recommends --yes" CLEAN="&& $SUDO apt-get clean" + if [ -n "$EXTRA_REPOSITORY" ]; then + cat < Resources -> Advanced. + All examples in this section were obtained using Docker Desktop for Mac; but the `command-line user interface `_ for the diff --git a/tox.ini b/tox.ini index da672524b8a..3deae3e6cb9 100644 --- a/tox.ini +++ b/tox.ini @@ -191,6 +191,7 @@ setenv = # ubuntu: SYSTEM=debian ubuntu: BASE_IMAGE=ubuntu + ubuntu-toolchain: EXTRA_REPOSITORY=ppa:ubuntu-toolchain-r/test ubuntu-trusty: BASE_TAG=trusty ubuntu-trusty: IGNORE_MISSING_SYSTEM_PACKAGES=yes ubuntu-xenial: BASE_TAG=xenial @@ -530,8 +531,13 @@ setenv = # gcc_spkg: CONFIG_CONFIGURE_ARGS_2=--without-system-gcc gcc_9: CONFIG_CONFIGURE_ARGS_2=--with-system-gcc=force CC=gcc-9 CXX=g++-9 FC=gfortran-9 + gcc_9: EXTRA_SAGE_PACKAGES_2=_gcc9 gcc_10: CONFIG_CONFIGURE_ARGS_2=--with-system-gcc=force CC=gcc-10 CXX=g++-10 FC=gfortran-10 + gcc_10: EXTRA_SAGE_PACKAGES_2=_gcc10 gcc_11: CONFIG_CONFIGURE_ARGS_2=--with-system-gcc=force CC=gcc-11 CXX=g++-11 FC=gfortran-11 + gcc_11: EXTRA_SAGE_PACKAGES_2=_gcc11 + gcc_12: CONFIG_CONFIGURE_ARGS_2=--with-system-gcc=force CC=gcc-12 CXX=g++-12 FC=gfortran-12 + gcc_12: EXTRA_SAGE_PACKAGES_2=_gcc12 llvm: CONFIG_CONFIGURE_ARGS_2=--with-system-gcc=force CC=clang CXX=clang++ llvm: EXTRA_SAGE_PACKAGES_2=llvm # LLVM is keg-only