From 18c61aa0360cc157fffd74c5a068ece3dac36c96 Mon Sep 17 00:00:00 2001
From: Stefan Eissing <stefan@eissing.org>
Date: Thu, 4 Jul 2024 16:39:20 +0200
Subject: [PATCH] GHA: configure OpenSSL's libdir as 'lib' only

Also mention in HTTP3.md

OpenSSL has a bug that messes the config `--libdir=path` to become the
wrong path in its pkgconfig files. If we just pass `--libdir=lib` it
should avoid this.

Ref: #14099
See also: https://github.com/openssl/openssl/issues/23569

Closes #14102
---
 .github/workflows/http3-linux.yml | 2 +-
 .github/workflows/linux.yml       | 4 ++--
 docs/HTTP3.md                     | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/http3-linux.yml b/.github/workflows/http3-linux.yml
index 4c77a6e799..32797c00ee 100644
--- a/.github/workflows/http3-linux.yml
+++ b/.github/workflows/http3-linux.yml
@@ -180,7 +180,7 @@ jobs:
           cd $HOME
           git clone --quiet --depth=1 -b openssl-${{ env.quictls-version }} https://github.com/quictls/openssl quictls
           cd quictls
-          ./config no-deprecated --prefix=$PWD/build --libdir=$PWD/build/lib
+          ./config no-deprecated --prefix=$PWD/build --libdir=lib
           make
           make -j1 install_sw
         name: 'build quictls'
diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml
index f81287737a..27eebcc048 100644
--- a/.github/workflows/linux.yml
+++ b/.github/workflows/linux.yml
@@ -297,7 +297,7 @@ jobs:
         run: |
           git clone --quiet --depth=1 -b ${{ env.openssl3-version }} https://github.com/openssl/openssl
           cd openssl
-          ./config --prefix=$HOME/openssl3 --libdir=$HOME/openssl3/lib
+          ./config --prefix=$HOME/openssl3 --libdir=lib
           make -j1 install_sw
 
       - name: cache quictls
@@ -315,7 +315,7 @@ jobs:
         run: |
           git clone --quiet --depth=1 -b openssl-${{ env.quictls-version }} https://github.com/quictls/openssl
           cd openssl
-          ./config --prefix=$HOME/quictls --libdir=$HOME/quictls/lib
+          ./config --prefix=$HOME/quictls --libdir=lib
           make -j1 install_sw
 
       - name: cache msh3
diff --git a/docs/HTTP3.md b/docs/HTTP3.md
index 9d24376fd2..e75a3e8d85 100644
--- a/docs/HTTP3.md
+++ b/docs/HTTP3.md
@@ -215,7 +215,7 @@ Build OpenSSL 3.3.1
      % cd ..
      % git clone -b openssl-3.3.1 https://github.com/openssl/openssl
      % cd openssl
-     % ./config enable-tls1_3 --prefix=<somewhere> --libdir=<somewhere>/lib
+     % ./config enable-tls1_3 --prefix=<somewhere> --libdir=lib
      % make
      % make install
 
-- 
2.47.3