From 792aa64e76a9a6be079ffd8ae8091637fa6db4bf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Villemot?= Date: Fri, 28 Apr 2023 12:00:25 +0200 Subject: [PATCH] Update dependency list under Debian [skip ci] --- README.md | 9 +++++---- windows/install-packages.sh | 9 +++++---- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/README.md b/README.md index f103b7452..9753ddd62 100644 --- a/README.md +++ b/README.md @@ -196,9 +196,11 @@ in the `tests` folder to delete files that were created by the run of the testsu All the prerequisites are packaged: -- `build-essential` (for gcc, g++ and make) +- `gcc` +- `g++` - `gfortran` -- `liboctave-dev` +- `make` +- `octave-dev` (or `liboctave-dev` on older Debian/Ubuntu releases) - `libboost-graph-dev` - `libgsl-dev` - `libmatio-dev` @@ -212,7 +214,6 @@ All the prerequisites are packaged: - `texlive-publishers` (for Econometrica bibliographic style) - `texlive-latex-extra` (for fullpage.sty) - `texlive-fonts-extra` (for ccicons) -- `texlive-latex-recommended` - `texlive-science` (for amstex) - `texlive-plain-generic` - `lmodern` (for macroprocessor PDF) @@ -225,7 +226,7 @@ All the prerequisites are packaged: You can install them all at once with: ```sh -apt install build-essential gfortran liboctave-dev libboost-graph-dev libgsl-dev libmatio-dev libslicot-dev libslicot-pic libsuitesparse-dev flex libfl-dev bison autoconf automake texlive texlive-publishers texlive-latex-extra texlive-fonts-extra texlive-latex-recommended texlive-science texlive-plain-generic lmodern python3-sphinx tex-gyre latexmk libjs-mathjax doxygen x13as +apt install gcc g++ gfortran make octave-dev libboost-graph-dev libgsl-dev libmatio-dev libslicot-dev libslicot-pic libsuitesparse-dev flex libfl-dev bison autoconf automake texlive texlive-publishers texlive-latex-extra texlive-fonts-extra texlive-science texlive-plain-generic lmodern python3-sphinx tex-gyre latexmk libjs-mathjax doxygen x13as ``` If you use MATLAB, we strongly advise to also `apt install matlab-support` and confirm to rename the GCC libraries shipped with MATLAB to avoid possible conflicts with GCC libraries shipped by your distribution. diff --git a/windows/install-packages.sh b/windows/install-packages.sh index ae80543f0..1eab1e6e8 100755 --- a/windows/install-packages.sh +++ b/windows/install-packages.sh @@ -3,7 +3,7 @@ # On a Debian system, install the packages needed for Windows # cross-compilation, and also setup the cross-compiler alternatives. -# Copyright © 2017-2022 Dynare Team +# Copyright © 2017-2023 Dynare Team # # This file is part of Dynare. # @@ -22,15 +22,16 @@ [[ $(id -u) == 0 ]] || { echo "You must be root" >&2; exit 1; } -PACKAGES=(make xz-utils p7zip bzip2 zip zstd patch wget autoconf automake - libtool mingw-w64 gfortran-mingw-w64 parallel flex libfl-dev bison texlive +PACKAGES=(make p7zip zip zstd wget autoconf automake + gcc-mingw-w64-x86-64-posix g++-mingw-w64-x86-64-posix + gfortran-mingw-w64-x86-64-posix parallel flex libfl-dev bison texlive texlive-publishers texlive-latex-extra texlive-science texlive-fonts-extra lmodern python3-sphinx latexmk nsis) apt install "${PACKAGES[@]}" # Configure MinGW to use the POSIX threading model (needed for C++11 threads in -# Dynare++, see /usr/share/doc/gcc-mingw-w64-base/README.Debian) +# libkorder, see /usr/share/doc/gcc-mingw-w64-base/README.Debian) update-alternatives --set x86_64-w64-mingw32-gfortran /usr/bin/x86_64-w64-mingw32-gfortran-posix update-alternatives --set x86_64-w64-mingw32-gcc /usr/bin/x86_64-w64-mingw32-gcc-posix update-alternatives --set x86_64-w64-mingw32-g++ /usr/bin/x86_64-w64-mingw32-g++-posix