More Linux build tweaks

r-lib · Nov 18, 2024 · 14f47fe · 14f47fe
1 parent 65d3b3f
commit 14f47fe
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 2 deletions.
diff --git 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
@@ -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
@@ -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 $@
 
 # ------------------------------------------------------------------------