From 1649b9a91b92c85ce2fc80edc8389b3e9f065b10 Mon Sep 17 00:00:00 2001 From: Greg Lin Date: Thu, 21 Apr 2022 17:28:08 -0500 Subject: [PATCH] Switch back to using OpenBLAS for Ubuntu 22 Ubuntu 20 builds were switched to the default reference BLAS because of a bug with the OpenBLAS package. That bug does not seem to affect Ubuntu 22, so switch back to using OpenBLAS for Ubuntu 22, for consistency with all other R builds. --- builder/Dockerfile.ubuntu-2204 | 2 +- builder/package.ubuntu-2204 | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/builder/Dockerfile.ubuntu-2204 b/builder/Dockerfile.ubuntu-2204 index ec29de4..4416aec 100644 --- a/builder/Dockerfile.ubuntu-2204 +++ b/builder/Dockerfile.ubuntu-2204 @@ -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 libblas-dev libcurl4-openssl-dev libicu-dev liblapack-dev libpcre2-dev wget python3-pip ruby ruby-dev \ + && apt-get install -y libcurl4-openssl-dev libicu-dev libopenblas-base libpcre2-dev wget python3-pip ruby ruby-dev \ && apt-get build-dep -y r-base RUN pip3 install awscli diff --git a/builder/package.ubuntu-2204 b/builder/package.ubuntu-2204 index 0276ea1..b7df72d 100644 --- a/builder/package.ubuntu-2204 +++ b/builder/package.ubuntu-2204 @@ -27,7 +27,6 @@ fpm \ -d gcc \ -d gfortran \ -d libbz2-dev \ - -d libblas-dev \ -d libc6 \ -d libcairo2 \ -d libcurl4 \ @@ -35,8 +34,8 @@ fpm \ -d libgomp1 \ -d libicu-dev \ -d libjpeg8 \ - -d liblapack-dev \ -d liblzma-dev \ + -d libopenblas-dev \ -d libpango-1.0-0 \ -d libpangocairo-1.0-0 \ -d libpaper-utils \