From 346091e3841ae6c9b65562d8838cc391cf30f3f4 Mon Sep 17 00:00:00 2001 From: Elvis Pranskevichus Date: Fri, 11 Oct 2024 15:05:05 -0700 Subject: [PATCH] Fixup for previous commit: set `openssldir` to `/etc/ssl` --- integration/linux/build/Dockerfile-linux.template | 2 +- integration/linux/build/linux-aarch64/Dockerfile | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/integration/linux/build/Dockerfile-linux.template b/integration/linux/build/Dockerfile-linux.template index ba78220..03442f3 100644 --- a/integration/linux/build/Dockerfile-linux.template +++ b/integration/linux/build/Dockerfile-linux.template @@ -155,7 +155,7 @@ RUN set -ex \ && cd /usr/src/openssl \ && ./config \ --prefix="/usr/local/openssl" \ - --openssldir="/usr/local/openssl/etc/ssl" \ + --openssldir="/etc/ssl" \ --libdir="/usr/local/openssl/lib" \ "no-ssl3" \ "shared" \ diff --git a/integration/linux/build/linux-aarch64/Dockerfile b/integration/linux/build/linux-aarch64/Dockerfile index d2596ce..4b081b6 100644 --- a/integration/linux/build/linux-aarch64/Dockerfile +++ b/integration/linux/build/linux-aarch64/Dockerfile @@ -162,13 +162,13 @@ RUN set -ex \ && rm pkgconf.tar.xz \ && cd /usr/src/openssl \ && ./config \ - --prefix="/usr/local/openssl3" \ - --openssldir="/usr/local/openssl3/etc/ssl" \ - --libdir="/usr/local/openssl3/lib" \ + --prefix="/usr/local/openssl" \ + --openssldir="/etc/ssl" \ + --libdir="/usr/local/openssl/lib" \ "no-ssl3" \ "shared" \ && make -j "$(nproc)" \ - && make install_sw \ + && make -j "$(nproc)" install_sw \ && rm -rf /usr/src/openssl \ && cd /usr/src/python \ \ @@ -180,8 +180,8 @@ RUN set -ex \ --with-system-expat \ --with-system-ffi \ --without-ensurepip \ - --with-openssl="/usr/local/openssl3" \ - --with-openssl-rpath="/usr/local/openssl3/lib" \ + --with-openssl="/usr/local/openssl" \ + --with-openssl-rpath="/usr/local/openssl/lib" \ && make -j "$(nproc)" \ && make install \ && ldconfig \