diff --git a/tools/build/linux/Dockerfile b/tools/build/linux/Dockerfile index b194da0de..933a84b82 100644 --- a/tools/build/linux/Dockerfile +++ b/tools/build/linux/Dockerfile @@ -5,6 +5,8 @@ ARG R_MAJOR=4.1 FROM ghcr.io/r-lib/pak-libs:latest AS libs FROM ghcr.io/r-hub/r-minimal/r-minimal:${R_MAJOR} COPY --from=libs /usr/local /usr/local +ENV PKG_CONFIG_PATH=/usr/local/lib64/pkgconfig + USER root WORKDIR /root diff --git a/tools/build/linux/Dockerfile-libs-aarch64 b/tools/build/linux/Dockerfile-libs-aarch64 index 7069ef0c4..0c48eb1b8 100644 --- a/tools/build/linux/Dockerfile-libs-aarch64 +++ b/tools/build/linux/Dockerfile-libs-aarch64 @@ -91,7 +91,7 @@ RUN tar xzf curl-*.tar.gz && rm curl-*.tar.gz RUN cd curl-* && \ CC=aarch64-alpine-linux-musl-gcc AR=aarch64-alpine-linux-musl-ar \ ./configure --host=aarch64-alpine-linux-musl \ - --enable-static --disable-shared --with-opennssl \ + --enable-static --disable-shared --with-openssl \ --without-libpsl; \ make && \ make install && \ diff --git a/tools/build/linux/Makefile b/tools/build/linux/Makefile index 40efb38d1..139d7600b 100644 --- a/tools/build/linux/Makefile +++ b/tools/build/linux/Makefile @@ -32,7 +32,7 @@ R-%-aarch64.done: libs-aarch64.done pak_$(PAKVERSION).tar.gz R-%.done: libs.done pak_$(PAKVERSION).tar.gz rm -f $@ docker build --platform linux/amd64 -f Dockerfile --build-arg R_MAJOR=$* \ - --build-arg TOKEN="${GHCR_TOKEN}" . + --build-arg TOKEN="${GHCR_TOKEN}" --progress plain . touch $@ # ------------------------------------------------------------------------