diff --git a/builder/Dockerfile.centos-6 b/builder/Dockerfile.centos-6 index c59d9ab..e49d4c1 100644 --- a/builder/Dockerfile.centos-6 +++ b/builder/Dockerfile.centos-6 @@ -4,8 +4,6 @@ ENV OS_IDENTIFIER centos-6 RUN yum -y update \ && yum -y install \ - atlas-devel \ - blas-devel \ bzip2-devel \ cairo-devel \ gcc-c++ \ @@ -16,7 +14,6 @@ RUN yum -y update \ java-1.8.0-openjdk-devel \ krb5-devel \ krb5-libs \ - lapack-devel \ libICE-devel \ libSM-devel \ libX11-devel \ @@ -184,7 +181,6 @@ ENV CONFIGURE_OPTIONS="\ --with-system-valgrind-headers \ --with-tcl-config=/usr/lib64/tclConfig.sh \ --with-tk-config=/usr/lib64/tkConfig.sh \ - --enable-BLAS-shlib \ --enable-prebuilt-html" # RHEL 6 doesn't have texi2any, so use makeinfo. diff --git a/builder/Dockerfile.centos-7 b/builder/Dockerfile.centos-7 index 3644d9c..8bae7a8 100644 --- a/builder/Dockerfile.centos-7 +++ b/builder/Dockerfile.centos-7 @@ -4,10 +4,8 @@ ENV OS_IDENTIFIER centos-7 RUN yum -y update \ && yum -y install \ - atlas-devel \ autoconf \ automake \ - blas-devel \ bzip2-devel \ cairo-devel \ gcc-c++ \ @@ -15,7 +13,6 @@ RUN yum -y update \ gcc-objc \ java-1.8.0-openjdk-devel \ java-1.8.0-openjdk-headless \ - lapack-devel \ libICE-devel \ libSM-devel \ libX11-devel \ @@ -64,7 +61,6 @@ ENV CONFIGURE_OPTIONS="\ --with-system-valgrind-headers \ --with-tcl-config=/usr/lib64/tclConfig.sh \ --with-tk-config=/usr/lib64/tkConfig.sh \ - --enable-BLAS-shlib \ --enable-prebuilt-html" # RHEL 7 doesn't have the inconsolata font, so override the defaults. diff --git a/builder/Dockerfile.opensuse-15 b/builder/Dockerfile.opensuse-15 index ed96447..b9ee03b 100644 --- a/builder/Dockerfile.opensuse-15 +++ b/builder/Dockerfile.opensuse-15 @@ -8,8 +8,6 @@ ENV OS_IDENTIFIER opensuse-15 RUN zypper --non-interactive update RUN zypper --non-interactive --gpg-auto-import-keys -n install \ - atlascpp-devel \ - blas-devel \ bzip2 \ cairo-devel \ fdupes \ @@ -20,7 +18,6 @@ RUN zypper --non-interactive --gpg-auto-import-keys -n install \ glibc-locale \ help2man \ java-1_8_0-openjdk-devel \ - lapack-devel \ libX11-devel \ libXScrnSaver-devel \ libXmu-devel \ @@ -70,8 +67,6 @@ RUN chmod 0777 /opt # Configure flags for SUSE that don't use the defaults in build.sh ENV CONFIGURE_OPTIONS="\ --enable-R-shlib \ - --with-blas \ - --with-lapack \ --with-tcltk \ --with-x \ --enable-memory-profiling \ diff --git a/builder/Dockerfile.opensuse-42 b/builder/Dockerfile.opensuse-42 index fdcf86a..9ca95c3 100644 --- a/builder/Dockerfile.opensuse-42 +++ b/builder/Dockerfile.opensuse-42 @@ -8,8 +8,6 @@ ENV OS_IDENTIFIER opensuse-42 RUN zypper --non-interactive update RUN zypper --non-interactive --gpg-auto-import-keys -n install \ - atlascpp-devel \ - blas-devel \ bzip2 \ cairo-devel \ fdupes \ @@ -20,7 +18,6 @@ RUN zypper --non-interactive --gpg-auto-import-keys -n install \ glibc-locale \ help2man \ java-1_8_0-openjdk-devel \ - lapack-devel \ libX11-devel \ libXScrnSaver-devel \ libXmu-devel \ @@ -73,8 +70,6 @@ ENV MAKEINFO=makeinfo # Configure flags for SUSE that don't use the defaults in build.sh ENV CONFIGURE_OPTIONS="\ --enable-R-shlib \ - --with-blas \ - --with-lapack \ --with-tcltk \ --with-x \ --enable-memory-profiling \