diff options
Diffstat (limited to 'reproduce')
-rw-r--r-- | reproduce/software/config/installation/texlive.conf | 12 | ||||
-rw-r--r-- | reproduce/software/config/installation/versions.mk | 208 | ||||
-rw-r--r-- | reproduce/software/make/basic.mk | 53 |
3 files changed, 137 insertions, 136 deletions
diff --git a/reproduce/software/config/installation/texlive.conf b/reproduce/software/config/installation/texlive.conf index 53054e1..6c3a74d 100644 --- a/reproduce/software/config/installation/texlive.conf +++ b/reproduce/software/config/installation/texlive.conf @@ -9,19 +9,19 @@ # this notice are preserved. This file is offered as-is, without any # warranty. selected_scheme scheme-basic -TEXDIR @installdir@/texlive/2018 -TEXMFCONFIG @installdir@/texlive2018/texmf-config +TEXDIR @installdir@/texlive/2019 +TEXMFCONFIG @installdir@/texlive2019/texmf-config TEXMFLOCAL @installdir@/texlive/texmf-local -TEXMFSYSCONFIG @installdir@/texlive/2018/texmf-config -TEXMFSYSVAR @installdir@/texlive/2018/texmf-var -TEXMFVAR @installdir@/texlive2018/texmf-var +TEXMFSYSCONFIG @installdir@/texlive/2019/texmf-config +TEXMFSYSVAR @installdir@/texlive/2019/texmf-var +TEXMFVAR @installdir@/texlive2019/texmf-var instopt_adjustpath 0 instopt_adjustrepo 1 instopt_letter 0 instopt_portable 0 instopt_write18_restricted 1 tlpdbopt_autobackup 1 -tlpdbopt_backupdir @installdir@/texlive/2018/backups +tlpdbopt_backupdir @installdir@/texlive/2019/backups tlpdbopt_create_formats 1 tlpdbopt_desktop_integration 1 tlpdbopt_file_assocs 1 diff --git a/reproduce/software/config/installation/versions.mk b/reproduce/software/config/installation/versions.mk index 5c7743d..caeae5a 100644 --- a/reproduce/software/config/installation/versions.mk +++ b/reproduce/software/config/installation/versions.mk @@ -22,40 +22,40 @@ # Basic/low-level programs and libraires (installed in any case) # -------------------------------------------------------------- -bash-version = 5.0.7 -binutils-version = 2.32 -coreutils-version = 8.31 -curl-version = 7.63.0 -diffutils-version = 3.7 -file-version = 5.36 -findutils-version = 4.6.0.199-e3fc -gawk-version = 5.0.0 -gcc-version = 8.3.0 -git-version = 2.21.0 -gmp-version = 6.1.2 -grep-version = 3.3 -gzip-version = 1.10 -isl-version = 0.18 -libbsd-version = 0.9.1 -lzip-version = 1.20 -m4-version = 1.4.18 -make-version = 4.2.90 -metastore-version = 1.1.2-23-fa9170b -mpfr-version = 4.0.2 -mpc-version = 1.1.0 -ncurses-version = 6.1 -openssl-version = 1.1.1a -patchelf-version = 0.9 -pkgconfig-version = 0.29.2 -readline-version = 8.0 -sed-version = 4.7 -tar-version = 1.32 -unzip-version = 6.0 -wget-version = 1.20.3 -which-version = 2.21 -xz-version = 5.2.4 -zip-version = 3.0 -zlib-version = 1.2.11 +bash-version = 5.0.7 +binutils-version = 2.32 +coreutils-version = 8.31 +curl-version = 7.63.0 +diffutils-version = 3.7 +file-version = 5.36 +findutils-version = 4.6.0.199-e3fc +gawk-version = 5.0.0 +gcc-version = 9.1.0 +git-version = 2.21.0 +gmp-version = 6.1.2 +grep-version = 3.3 +gzip-version = 1.10 +isl-version = 0.18 +libbsd-version = 0.9.1 +lzip-version= 1.20 +m4-version = 1.4.18 +make-version = 4.2.90 +metastore-version = 1.1.2-23-fa9170b +mpfr-version = 4.0.2 +mpc-version = 1.1.0 +ncurses-version = 6.1 +openssl-version = 1.1.1a +patchelf-version = 0.9 +pkgconfig-version = 0.29.2 +readline-version = 8.0 +sed-version = 4.7 +tar-version = 1.32 +unzip-version = 6.0 +wget-version = 1.20.3 +which-version = 2.21 +xz-version = 5.2.4 +zip-version = 3.0 +zlib-version = 1.2.11 @@ -68,33 +68,33 @@ zlib-version = 1.2.11 # `reproduce/software/config/installation/TARGETS.mk' will be built as part # of a project. To specify a software there, just remove the `-version' # suffix from the list below. -astrometrynet-version = 0.77 -atlas-version = 3.10.3 -cairo-version = 1.16.0 -cdsclient-version = 3.84 -cfitsio-version = 3.45 -cmake-version = 3.14.2 -fftw-version = 3.3.8 -flock-version = 0.2.3 -freetype-version = 2.9 -ghostscript-version = 9.26 -gnuastro-version = 0.9 -gsl-version = 2.5 -hdf5-version = 1.10.5 -libffi-version = 3.2.1 -libjpeg-version = v9b -libpng-version = 1.6.37 -libtiff-version = 4.0.10 -libtool-version = 2.4.6 -libxml2-version = 2.9.9 -openblas-version = 0.3.5 -openmpi-version = 4.0.1 -pixman-version = 0.38.0 -python-version = 3.7.3 -scamp-version = 2.6.7 -sextractor-version = 2.25.0 -swarp-version = 2.38.0 -swig-version = 3.0.12 +astrometrynet-version = 0.77 +atlas-version = 3.10.3 +cairo-version = 1.16.0 +cdsclient-version = 3.84 +cfitsio-version = 3.45 +cmake-version = 3.14.2 +fftw-version = 3.3.8 +flock-version = 0.2.3 +freetype-version = 2.9 +ghostscript-version = 9.26 +gnuastro-version = 0.9 +gsl-version = 2.5 +hdf5-version = 1.10.5 +libffi-version = 3.2.1 +libjpeg-version = v9b +libpng-version = 1.6.37 +libtiff-version = 4.0.10 +libtool-version = 2.4.6 +libxml2-version = 2.9.9 +openblas-version = 0.3.5 +openmpi-version = 4.0.1 +pixman-version = 0.38.0 +python-version = 3.7.3 +scamp-version = 2.6.7 +sextractor-version = 2.25.0 +swarp-version = 2.38.0 +swig-version = 3.0.12 @@ -108,44 +108,44 @@ swig-version = 3.0.12 # IMPORTANT: If you intend to change the version of any of the Python # modules/libraries below, please fix the hash strings of the respective # URL in `reproduce/software/make/python.mk'. -asn1crypto-version = 0.24.0 -astroquery-version = 0.3.9 -astropy-version = 3.1.1 -beautifulsoup4-version = 4.7.1 -certifi-version = 2018.11.29 -cffi-version = 1.12.2 -chardet-version = 3.0.4 -cryptography-version = 2.6.1 -cycler-version = 0.10.0 -cython-version = 0.29.6 -entrypoints-version = 0.3 -h5py-version = 2.9.0 -html5lib-version = 1.0.1 -idna-version = 2.8 -jeepney-version = 0.4 -kiwisolver-version = 1.0.1 -keyring-version = 18.0.0 -matplotlib-version = 3.0.2 -mpi4py-version = 3.0.1 -mpmath-version = 1.1.0 -numpy-version = 1.16.2 -pip-version = 19.0.2 -pycparser-version = 2.19 -pyparsing-version = 2.3.1 -pypkgconfig-version = 1.5.1 -python-dateutil-version = 2.8.0 -requests-version = 2.21.0 -scipy-version = 1.2.1 -secretstorage-version = 3.1.1 -setuptools-version = 40.8.0 -setuptools_scm-version = 3.2.0 -sip_tpv-version = 1.1 -six-version = 1.12.0 -soupsieve-version = 1.8 -sympy-version = 1.4 -urllib3-version = 1.24.1 -virtualenv-version = 16.4.0 -webencodings-version = 0.5.1 +asn1crypto-version = 0.24.0 +astroquery-version = 0.3.9 +astropy-version = 3.1.1 +beautifulsoup4-version = 4.7.1 +certifi-version = 2018.11.29 +cffi-version = 1.12.2 +chardet-version = 3.0.4 +cryptography-version = 2.6.1 +cycler-version = 0.10.0 +cython-version = 0.29.6 +entrypoints-version = 0.3 +h5py-version = 2.9.0 +html5lib-version = 1.0.1 +idna-version = 2.8 +jeepney-version = 0.4 +kiwisolver-version = 1.0.1 +keyring-version = 18.0.0 +matplotlib-version = 3.0.2 +mpi4py-version = 3.0.1 +mpmath-version = 1.1.0 +numpy-version = 1.16.2 +pip-version = 19.0.2 +pycparser-version = 2.19 +pyparsing-version = 2.3.1 +pypkgconfig-version = 1.5.1 +python-dateutil-version = 2.8.0 +requests-version = 2.21.0 +scipy-version = 1.2.1 +secretstorage-version = 3.1.1 +setuptools-version = 40.8.0 +setuptools_scm-version = 3.2.0 +sip_tpv-version = 1.1 +six-version = 1.12.0 +soupsieve-version = 1.8 +sympy-version = 1.4 +urllib3-version = 1.24.1 +virtualenv-version = 16.4.0 +webencodings-version = 0.5.1 @@ -163,10 +163,10 @@ webencodings-version = 0.5.1 # or new versions. # Basic/low-level -bzip2-version = 1.0.6 +bzip2-version = 1.0.6 # Optional/high-level -lapack-version = 3.8.0 -libgit2-version = 0.26.0 -netpbm-version = 10.86.99 -wcslib-version = 6.2 +lapack-version = 3.8.0 +libgit2-version = 0.26.0 +netpbm-version = 10.86.99 +wcslib-version = 6.2 diff --git a/reproduce/software/make/basic.mk b/reproduce/software/make/basic.mk index db779a1..cd41221 100644 --- a/reproduce/software/make/basic.mk +++ b/reproduce/software/make/basic.mk @@ -1067,34 +1067,35 @@ $(ibidir)/gcc: $(gcc-prerequisites) \ ln -fs $(ildir) $(idir)/lib64; \ \ cd $(ddir); \ - rm -rf gcc-build gcc-$(gcc-version); \ + rm -rf gcc-$(gcc-version); \ tar xf $< \ - && mkdir $(ddir)/gcc-build \ - && cd $(ddir)/gcc-build \ - && ../gcc-$(gcc-version)/configure SHELL=$(ibdir)/bash \ - --prefix=$(idir) \ - --with-mpc=$(idir) \ - --with-mpfr=$(idir) \ - --with-gmp=$(idir) \ - --with-isl=$(idir) \ - --with-build-time-tools=$(idir) \ - --enable-shared \ - --disable-multilib \ - --disable-multiarch \ - --enable-threads=posix \ - --with-local-prefix=$(idir) \ - --enable-languages=c,c++,fortran,objc,obj-c++ \ - --disable-libada \ - --disable-nls \ - --enable-default-pie \ - --enable-default-ssp \ - --enable-cet=auto \ - --enable-decimal-float \ - && make SHELL=$(ibdir)/bash -j$$(nproc) \ + && cd gcc-$(gcc-version) \ + && mkdir build \ + && cd build \ + && ../configure SHELL=$(ibdir)/bash \ + --prefix=$(idir) \ + --with-mpc=$(idir) \ + --with-mpfr=$(idir) \ + --with-gmp=$(idir) \ + --with-isl=$(idir) \ + --with-build-time-tools=$(idir) \ + --enable-shared \ + --enable-lto \ + --disable-multilib \ + --disable-multiarch \ + --enable-threads=posix \ + --with-local-prefix=$(idir) \ + --enable-languages=c,c++,fortran,objc,obj-c++ \ + --disable-libada \ + --disable-nls \ + --enable-default-pie \ + --enable-default-ssp \ + --enable-cet=auto \ + --enable-decimal-float \ + && make SHELL=$(ibdir)/bash -j$(numthreads) \ && make SHELL=$(ibdir)/bash install \ - && cd .. \ - && rm -rf gcc-build gcc-$(gcc-version) \ - \ + && cd ../.. \ + && rm -rf gcc-$(gcc-version) \ && if [ "x$(on_mac_os)" != xyes ]; then \ for f in $$(find $(idir)/libexec/gcc); do \ if ldd $$f &> /dev/null; then \ |