From f3a816097761a15bff5b8ea804568262bb13c92d Mon Sep 17 00:00:00 2001 From: Arnaud Giersch Date: Fri, 13 Jan 2023 09:35:59 +0100 Subject: [PATCH] No need to install Java-related packages anymore. --- doc/doxygen/inside_tests.doc | 10 +++++----- tools/docker/Dockerfile.build-deps | 2 +- tools/docker/Dockerfile.stable | 2 +- tools/docker/Dockerfile.unstable | 2 +- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/doc/doxygen/inside_tests.doc b/doc/doxygen/inside_tests.doc index fe9bfa9af3..4bdbcf44d8 100644 --- a/doc/doxygen/inside_tests.doc +++ b/doc/doxygen/inside_tests.doc @@ -180,21 +180,21 @@ Just for the record, the slaves were created from the available template with the following commands: @verbatim #debian/ubuntu -apt-get install gcc g++ gfortran automake cmake libboost-dev openjdk-8-jdk openjdk-8-jre libxslt-dev libxml2-dev libevent-dev libunwind-dev libdw-dev htop git python3 xsltproc libboost-context-dev +apt-get install gcc g++ gfortran automake cmake libboost-dev libxslt-dev libxml2-dev libevent-dev libunwind-dev libdw-dev htop git python3 xsltproc libboost-context-dev #for dynamicanalysis: -apt-get install jacoco libjacoco-java libns3-dev pcregrep gcovr ant sloccount +apt-get install libns3-dev pcregrep gcovr sloccount #fedora -dnf install libboost-devel openjdk-8-jdk openjdk-8-jre libxslt-devel libxml2-devel xsltproc git python3 libdw-devel libevent-devel libunwind-devel htop +dnf install libboost-devel libxslt-devel libxml2-devel xsltproc git python3 libdw-devel libevent-devel libunwind-devel htop #netbsd -pkg_add cmake gcc7 boost boost-headers automake openjdk8 libxslt libxml2 libunwind git htop python36 +pkg_add cmake gcc7 boost boost-headers automake libxslt libxml2 libunwind git htop python36 #opensuse zypper install cmake automake clang boost-devel libxslt-devel libxml2-devel xsltproc git python3 libdw-devel libevent-devel libunwind-devel htop binutils ggc7-fortran #freebsd -pkg install boost-libs cmake openjdk8 automake libxslt libxml2 libunwind git htop python3 automake gcc6 flang elfutils libevent +pkg install boost-libs cmake automake libxslt libxml2 libunwind git htop python3 automake gcc6 flang elfutils libevent #+ clang-devel from ports #osx diff --git a/tools/docker/Dockerfile.build-deps b/tools/docker/Dockerfile.build-deps index 0979cc7f02..b5b814463d 100644 --- a/tools/docker/Dockerfile.build-deps +++ b/tools/docker/Dockerfile.build-deps @@ -8,7 +8,7 @@ RUN apt-get --allow-releaseinfo-change update && \ apt install -y \ bibclean emacs-nox org-mode elpa-ess elpa-htmlize wget unzip r-cran-ggplot2 r-cran-tidyr r-cran-dplyr libtext-bibtex-perl && \ apt install -y \ - g++ gcc gfortran default-jdk pybind11-dev \ + g++ gcc gfortran pybind11-dev \ git \ valgrind \ libboost-dev libboost-all-dev \ diff --git a/tools/docker/Dockerfile.stable b/tools/docker/Dockerfile.stable index 1f2d1c4f53..b8986110bd 100644 --- a/tools/docker/Dockerfile.stable +++ b/tools/docker/Dockerfile.stable @@ -17,6 +17,6 @@ RUN echo "DOWNLOAD_URL: ${DLURL}" && \ make -j4 && \ mkdir debian/ && touch debian/control && dpkg-shlibdeps --ignore-missing-info lib/*.so -llib/ -O/tmp/deps && \ make install && make clean && \ - apt remove -y g++ gcc git valgrind default-jdk gfortran libboost-dev libboost-all-dev libeigen3-dev cmake dpkg-dev wget python3-dev pybind11-dev && \ + apt remove -y g++ gcc git valgrind gfortran libboost-dev libboost-all-dev libeigen3-dev cmake dpkg-dev wget python3-dev pybind11-dev && \ apt install `sed -e 's/shlibs:Depends=//' -e 's/([^)]*)//g' -e 's/,//g' /tmp/deps` && \ apt autoremove -y && apt autoclean && apt clean diff --git a/tools/docker/Dockerfile.unstable b/tools/docker/Dockerfile.unstable index 2198d180d2..6ef5e42c40 100644 --- a/tools/docker/Dockerfile.unstable +++ b/tools/docker/Dockerfile.unstable @@ -12,6 +12,6 @@ RUN apt-get --allow-releaseinfo-change update && apt -y upgrade && \ make -j4 install && \ mkdir debian/ && touch debian/control && dpkg-shlibdeps --ignore-missing-info lib/*.so -llib/ -O/tmp/deps && \ git reset --hard master && git clean -dfx && \ - apt remove -y g++ gcc git valgrind default-jdk gfortran libboost-dev libboost-all-dev libeigen3-dev cmake dpkg-dev python3-dev pybind11-dev && \ + apt remove -y g++ gcc git valgrind gfortran libboost-dev libboost-all-dev libeigen3-dev cmake dpkg-dev python3-dev pybind11-dev && \ apt install `sed -e 's/shlibs:Depends=//' -e 's/([^)]*)//g' -e 's/,//g' /tmp/deps` && \ apt autoremove -y && apt autoclean && apt clean -- 2.20.1