Merge pull request #60 from rstudio/jc-ubuntu-20-blas
Including libopenblas fails to build on Ubuntu 20
This commit is contained in:
commit
1bedbc6ff6
2 changed files with 3 additions and 3 deletions
|
|
@ -6,7 +6,7 @@ RUN set -x \
|
|||
&& sed -i "s|# deb-src|deb-src|g" /etc/apt/sources.list \
|
||||
&& export DEBIAN_FRONTEND=noninteractive \
|
||||
&& apt-get update \
|
||||
&& apt-get install -y libcurl4-openssl-dev libicu-dev libopenblas-base libpcre2-dev wget python3-pip ruby ruby-dev \
|
||||
&& apt-get install -y libblas-dev libcurl4-openssl-dev libicu-dev liblapack-dev libpcre2-dev wget python3-pip ruby ruby-dev \
|
||||
&& apt-get build-dep -y r-base
|
||||
|
||||
RUN pip3 install awscli
|
||||
|
|
|
|||
|
|
@ -21,6 +21,7 @@ fpm \
|
|||
-d gcc \
|
||||
-d gfortran \
|
||||
-d libbz2-1.0 \
|
||||
-d libblas-dev \
|
||||
-d libc6 \
|
||||
-d libcairo2 \
|
||||
-d libcurl4 \
|
||||
|
|
@ -28,8 +29,8 @@ fpm \
|
|||
-d libgomp1 \
|
||||
-d libicu66 \
|
||||
-d libjpeg8 \
|
||||
-d liblapack-dev \
|
||||
-d liblzma5 \
|
||||
-d libopenblas-dev \
|
||||
-d libpango-1.0-0 \
|
||||
-d libpangocairo-1.0-0 \
|
||||
-d libpaper-utils \
|
||||
|
|
@ -51,4 +52,3 @@ fpm \
|
|||
|
||||
shopt -s extglob
|
||||
export PKG_FILE=$(ls /tmp/output/ubuntu-2004/[rR]-${R_VERSION}*.@(deb|rpm) | head -1)
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue