force openssl to use lib dir to simplify pyenv build

Chia-Network · Jan 8, 2025 · 950d111 · 950d111
1 parent f802a9a
commit 950d111
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 11 deletions.
diff --git a/rocky8/Dockerfile b/rocky8/Dockerfile
@@ -32,7 +32,7 @@ yum -y install perl-IPC-Cmd perl-Pod-Html && \
 wget -q https://github.com/openssl/openssl/releases/download/openssl-3.0.15/openssl-3.0.15.tar.gz && \
 tar -xzf openssl-3.0.15.tar.gz && \
 cd openssl-3.0.15 && \
-./config --prefix=/usr/local/ssl --openssldir=/usr/local/ssl shared zlib && \
+./config --prefix=/usr/local/ssl --openssldir=/usr/local/ssl --libdir=lib shared zlib && \
 make && \
 make install && \
 cd ~ && \
@@ -42,8 +42,7 @@ rm -rf ~/openssl-3.0.15*
 RUN yum -y install zlib-devel bzip2 bzip2-devel readline-devel tk-devel libffi-devel xz-devel && \
     cd ~ && \
     # Set up pyenv \
-    export LDFLAGS="-L/usr/local/ssl/lib64" && \
-    export PYTHON_CONFIGURE_OPTS="--with-openssl=/usr/local/ssl --with-openssl-rpath=/usr/local/ssl/lib64 --enable-shared --enable-optimizations" && \
+    export PYTHON_CONFIGURE_OPTS="--with-openssl=/usr/local/ssl --with-openssl-rpath=auto --enable-shared --enable-optimizations" && \
     git clone https://github.com/pyenv/pyenv.git ~/.pyenv && \
     pyenv install 3.11 --verbose && \
     pyenv global 3.11 && \

diff --git a/ubuntu-20.04/Dockerfile b/ubuntu-20.04/Dockerfile
@@ -62,21 +62,15 @@ RUN cd ~ && \
 wget -q https://github.com/openssl/openssl/releases/download/openssl-3.0.15/openssl-3.0.15.tar.gz && \
 tar -xzf openssl-3.0.15.tar.gz && \
 cd openssl-3.0.15 && \
-./config --prefix=/usr/local/ssl --openssldir=/usr/local/ssl shared zlib && \
+./config --prefix=/usr/local/ssl --openssldir=/usr/local/ssl --libdir=lib shared zlib && \
 make && \
 make install && \
 cd ~ && \
 rm -rf ~/openssl-3.0.15*
 
 # Set up pyenv \
 RUN git clone https://github.com/pyenv/pyenv.git ~/.pyenv && \
-    if [ -d '/usr/local/ssl/lib64' ]; then \
-    export LDFLAGS="-L/usr/local/ssl/lib64" && \
-    export PYTHON_CONFIGURE_OPTS="--with-openssl=/usr/local/ssl --with-openssl-rpath=/usr/local/ssl/lib64 --enable-shared --enable-optimizations"; \
-    else \
-    export LDFLAGS="-L/usr/local/ssl/lib" && \
-    export PYTHON_CONFIGURE_OPTS="--with-openssl=/usr/local/ssl --with-openssl-rpath=auto --enable-shared --enable-optimizations"; \
-    fi && \
+    export PYTHON_CONFIGURE_OPTS="--with-openssl=/usr/local/ssl --with-openssl-rpath=auto --enable-shared --enable-optimizations" && \
     pyenv install 3.11 --verbose && \
     pyenv global 3.11 && \
     pip install --upgrade pip && \