Use shared BLAS on CentOS and openSUSE

Note: --enable-BLAS-shlib is already used by default
This commit is contained in:
Greg Lin 2019-06-13 16:06:33 -05:00
commit 04abda3bfd
4 changed files with 0 additions and 18 deletions

View file

@ -4,8 +4,6 @@ ENV OS_IDENTIFIER centos-6
RUN yum -y update \ RUN yum -y update \
&& yum -y install \ && yum -y install \
atlas-devel \
blas-devel \
bzip2-devel \ bzip2-devel \
cairo-devel \ cairo-devel \
gcc-c++ \ gcc-c++ \
@ -16,7 +14,6 @@ RUN yum -y update \
java-1.8.0-openjdk-devel \ java-1.8.0-openjdk-devel \
krb5-devel \ krb5-devel \
krb5-libs \ krb5-libs \
lapack-devel \
libICE-devel \ libICE-devel \
libSM-devel \ libSM-devel \
libX11-devel \ libX11-devel \
@ -184,7 +181,6 @@ ENV CONFIGURE_OPTIONS="\
--with-system-valgrind-headers \ --with-system-valgrind-headers \
--with-tcl-config=/usr/lib64/tclConfig.sh \ --with-tcl-config=/usr/lib64/tclConfig.sh \
--with-tk-config=/usr/lib64/tkConfig.sh \ --with-tk-config=/usr/lib64/tkConfig.sh \
--enable-BLAS-shlib \
--enable-prebuilt-html" --enable-prebuilt-html"
# RHEL 6 doesn't have texi2any, so use makeinfo. # RHEL 6 doesn't have texi2any, so use makeinfo.

View file

@ -4,10 +4,8 @@ ENV OS_IDENTIFIER centos-7
RUN yum -y update \ RUN yum -y update \
&& yum -y install \ && yum -y install \
atlas-devel \
autoconf \ autoconf \
automake \ automake \
blas-devel \
bzip2-devel \ bzip2-devel \
cairo-devel \ cairo-devel \
gcc-c++ \ gcc-c++ \
@ -15,7 +13,6 @@ RUN yum -y update \
gcc-objc \ gcc-objc \
java-1.8.0-openjdk-devel \ java-1.8.0-openjdk-devel \
java-1.8.0-openjdk-headless \ java-1.8.0-openjdk-headless \
lapack-devel \
libICE-devel \ libICE-devel \
libSM-devel \ libSM-devel \
libX11-devel \ libX11-devel \
@ -64,7 +61,6 @@ ENV CONFIGURE_OPTIONS="\
--with-system-valgrind-headers \ --with-system-valgrind-headers \
--with-tcl-config=/usr/lib64/tclConfig.sh \ --with-tcl-config=/usr/lib64/tclConfig.sh \
--with-tk-config=/usr/lib64/tkConfig.sh \ --with-tk-config=/usr/lib64/tkConfig.sh \
--enable-BLAS-shlib \
--enable-prebuilt-html" --enable-prebuilt-html"
# RHEL 7 doesn't have the inconsolata font, so override the defaults. # RHEL 7 doesn't have the inconsolata font, so override the defaults.

View file

@ -8,8 +8,6 @@ ENV OS_IDENTIFIER opensuse-15
RUN zypper --non-interactive update RUN zypper --non-interactive update
RUN zypper --non-interactive --gpg-auto-import-keys -n install \ RUN zypper --non-interactive --gpg-auto-import-keys -n install \
atlascpp-devel \
blas-devel \
bzip2 \ bzip2 \
cairo-devel \ cairo-devel \
fdupes \ fdupes \
@ -20,7 +18,6 @@ RUN zypper --non-interactive --gpg-auto-import-keys -n install \
glibc-locale \ glibc-locale \
help2man \ help2man \
java-1_8_0-openjdk-devel \ java-1_8_0-openjdk-devel \
lapack-devel \
libX11-devel \ libX11-devel \
libXScrnSaver-devel \ libXScrnSaver-devel \
libXmu-devel \ libXmu-devel \
@ -70,8 +67,6 @@ RUN chmod 0777 /opt
# Configure flags for SUSE that don't use the defaults in build.sh # Configure flags for SUSE that don't use the defaults in build.sh
ENV CONFIGURE_OPTIONS="\ ENV CONFIGURE_OPTIONS="\
--enable-R-shlib \ --enable-R-shlib \
--with-blas \
--with-lapack \
--with-tcltk \ --with-tcltk \
--with-x \ --with-x \
--enable-memory-profiling \ --enable-memory-profiling \

View file

@ -8,8 +8,6 @@ ENV OS_IDENTIFIER opensuse-42
RUN zypper --non-interactive update RUN zypper --non-interactive update
RUN zypper --non-interactive --gpg-auto-import-keys -n install \ RUN zypper --non-interactive --gpg-auto-import-keys -n install \
atlascpp-devel \
blas-devel \
bzip2 \ bzip2 \
cairo-devel \ cairo-devel \
fdupes \ fdupes \
@ -20,7 +18,6 @@ RUN zypper --non-interactive --gpg-auto-import-keys -n install \
glibc-locale \ glibc-locale \
help2man \ help2man \
java-1_8_0-openjdk-devel \ java-1_8_0-openjdk-devel \
lapack-devel \
libX11-devel \ libX11-devel \
libXScrnSaver-devel \ libXScrnSaver-devel \
libXmu-devel \ libXmu-devel \
@ -73,8 +70,6 @@ ENV MAKEINFO=makeinfo
# Configure flags for SUSE that don't use the defaults in build.sh # Configure flags for SUSE that don't use the defaults in build.sh
ENV CONFIGURE_OPTIONS="\ ENV CONFIGURE_OPTIONS="\
--enable-R-shlib \ --enable-R-shlib \
--with-blas \
--with-lapack \
--with-tcltk \ --with-tcltk \
--with-x \ --with-x \
--enable-memory-profiling \ --enable-memory-profiling \