Merge pull request #715 from r-lib/feature/linux-deps-update

Linux: update dependencies in static build
r-lib · Nov 18, 2024 · a817332 · a817332
2 parents e7d2086 + 14f47fe
commit a817332
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 14 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 b/tools/build/linux/Dockerfile-libs
@@ -12,7 +12,7 @@ RUN apk add linux-headers bash gcc musl-dev g++ pkgconf make
 
 # zlib --------------------------------------------------------------------
 
-RUN wget https://downloads.sourceforge.net/project/libpng/zlib/1.2.11/zlib-1.2.11.tar.gz
+RUN wget https://zlib.net/zlib-1.3.1.tar.gz
 RUN tar xzf zlib-*.tar.gz && rm zlib-*.tar.gz
 RUN cd zlib-* &&                                                     \
     CFLAGS=-fPIC ./configure --static &&                             \
@@ -21,23 +21,24 @@ RUN cd zlib-* &&                                                     \
 
 # openssl -----------------------------------------------------------------
 
-RUN wget https://www.openssl.org/source/openssl-1.1.1m.tar.gz
+RUN wget https://github.com/openssl/openssl/releases/download/openssl-3.4.0/openssl-3.4.0.tar.gz
 RUN tar xzf openssl-*.tar.gz && rm openssl-*.tar.gz
 RUN apk add perl linux-headers
 RUN cd openssl-* &&                                                  \
-    CFLAGS="-fPIC -static -U__GNUC__" ./config -fPIC no-shared &&    \
+    ./config -fPIC no-shared &&                                      \
     make &&                                                          \
     make install_sw &&                                               \
     rm -rf /usr/local/bin/openssl                                    \
        /usr/local/share/{man/doc}
 
 # libcurl now -------------------------------------------------------------
 
-RUN wget https://curl.haxx.se/download/curl-7.68.0.tar.gz
+RUN wget https://curl.haxx.se/download/curl-8.11.0.tar.gz
 RUN tar xzf curl-*.tar.gz && rm curl-*.tar.gz
 RUN apk add pkgconfig
 RUN cd curl-* && \
-    ./configure --enable-static --disable-shared;                    \
+    ./configure --enable-static --disable-shared --with-openssl      \
+                --without-libpsl;				     \
     make &&                                                          \
     make install &&                                                  \
     rm -rf /usr/local/bin/curl                                       \

diff --git a/tools/build/linux/Dockerfile-libs-aarch64 b/tools/build/linux/Dockerfile-libs-aarch64
@@ -56,7 +56,7 @@ RUN apk add --arch aarch64 --root $AARCH64_ROOT \
 
 # zlib --------------------------------------------------------------------
 
-RUN wget https://downloads.sourceforge.net/project/libpng/zlib/1.2.11/zlib-1.2.11.tar.gz
+RUN wget https://zlib.net/zlib-1.3.1.tar.gz
 RUN tar xzf zlib-*.tar.gz && rm zlib-*.tar.gz
 RUN cd zlib-* &&                                                     \
     CFLAGS=-fPIC CC=aarch64-alpine-linux-musl-gcc                    \
@@ -70,10 +70,9 @@ RUN cd zlib-* &&                                                     \
 # aarch64 libs in qemu on x86_64, the built libs were buggy on real
 # aarch64 hardware later without it.
 
-RUN wget https://www.openssl.org/source/openssl-1.1.1m.tar.gz
+RUN wget https://github.com/openssl/openssl/releases/download/openssl-3.4.0/openssl-3.4.0.tar.gz
 RUN tar xzf openssl-*.tar.gz && rm openssl-*.tar.gz
 RUN cd openssl-* &&                                                  \
-    CFLAGS="-fPIC -static -U__GNUC__"                                \
     ./Configure linux-aarch64 -fPIC no-shared                        \
         --cross-compile-prefix=aarch64-alpine-linux-musl- &&         \
     make &&                                                          \
@@ -87,12 +86,13 @@ RUN cd openssl-* &&                                                  \
 # aarch64 libs in qemu on x86_64, the built libs were buggy on real
 # aarch64 hardware later without it.
 
-RUN wget https://curl.haxx.se/download/curl-7.68.0.tar.gz
+RUN wget https://curl.haxx.se/download/curl-8.11.0.tar.gz
 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 --enable-debug;             \
+        --enable-static --disable-shared --with-openssl              \
+        --without-libpsl; 		 			     \
     make &&                                                          \
     make install &&                                                  \
     rm -rf /usr/local/bin/curl                                       \

diff --git a/tools/build/linux/Makefile b/tools/build/linux/Makefile
@@ -12,7 +12,7 @@
 
 # ------------------------------------------------------------------------
 
-RVERSIONS ?= 3.5 3.6 4.0 4.1 4.2 4.3 4.4
+RVERSIONS ?= 3.5 3.6 4.0 4.1 4.2 4.3 4.4 4.5
 PAKVERSION=$(shell grep "^Version:" ../../../DESCRIPTION | tr -cd '0-9.')
 DONE=$(patsubst %,R-%.done,$(RVERSIONS))
 DONE_AARCH64=$(patsubst %,R-%-aarch64.done,$(RVERSIONS))
@@ -31,8 +31,8 @@ R-%-aarch64.done: libs-aarch64.done pak_$(PAKVERSION).tar.gz
 
 R-%.done: libs.done pak_$(PAKVERSION).tar.gz
 	rm -f $@
-	docker build -f Dockerfile --build-arg R_MAJOR=$* \
-		--build-arg TOKEN="${GHCR_TOKEN}" .
+	docker build --platform linux/amd64 -f Dockerfile --build-arg R_MAJOR=$* \
+		--build-arg TOKEN="${GHCR_TOKEN}" --progress plain .
 	touch $@
 
 # ------------------------------------------------------------------------
@@ -42,7 +42,7 @@ cross-aarch64:
 		-f Dockerfile-cross-aarch64 .
 
 libs:
-	docker build -t ghcr.io/r-lib/pak-libs:latest \
+	docker build --platform linux/amd64 -t ghcr.io/r-lib/pak-libs:latest \
 		-f Dockerfile-libs .
 
 libs.done: