From 8fea025d4ff58d423e2273493ea1abc9afd3de3d Mon Sep 17 00:00:00 2001
From: Weihang Lo <me@weihanglo.tw>
Date: Sun, 17 Dec 2023 10:39:22 -0500
Subject: [PATCH 1/4] ci: install perl-core for building OpenSSL v3

`perl-core` is required on yum-based Linux distributions.
This is required as Cargo starts depending on OpenSSL v3.2.

See https://github.com/openssl/openssl/blob/openssl-3.2.0/NOTES-PERL.md
---
 src/ci/docker/host-x86_64/dist-i686-linux/Dockerfile   | 1 +
 src/ci/docker/host-x86_64/dist-x86_64-linux/Dockerfile | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/ci/docker/host-x86_64/dist-i686-linux/Dockerfile b/src/ci/docker/host-x86_64/dist-i686-linux/Dockerfile
index f5274104d60ac..1704bef1e4ed0 100644
--- a/src/ci/docker/host-x86_64/dist-i686-linux/Dockerfile
+++ b/src/ci/docker/host-x86_64/dist-i686-linux/Dockerfile
@@ -25,6 +25,7 @@ RUN yum upgrade -y && \
       openssl-devel \
       patch \
       perl \
+      perl-core \
       pkgconfig \
       python3 \
       unzip \
diff --git a/src/ci/docker/host-x86_64/dist-x86_64-linux/Dockerfile b/src/ci/docker/host-x86_64/dist-x86_64-linux/Dockerfile
index 9a2fcb0ce0a1a..958378c2ded64 100644
--- a/src/ci/docker/host-x86_64/dist-x86_64-linux/Dockerfile
+++ b/src/ci/docker/host-x86_64/dist-x86_64-linux/Dockerfile
@@ -24,7 +24,7 @@ RUN yum upgrade -y && \
       ncurses-devel \
       openssl-devel \
       patch \
-      perl \
+      perl-core \
       pkgconfig \
       python3 \
       unzip \

From bce4e93ecd577a6245021c66a246f27bf21aebad Mon Sep 17 00:00:00 2001
From: Weihang Lo <me@weihanglo.tw>
Date: Fri, 15 Dec 2023 21:38:45 -0500
Subject: [PATCH 2/4] Update cargo

---
 src/tools/cargo | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/tools/cargo b/src/tools/cargo
index 1aa9df1a5be20..37bc5f0232a0b 160000
--- a/src/tools/cargo
+++ b/src/tools/cargo
@@ -1 +1 @@
-Subproject commit 1aa9df1a5be205cce621f0bc0ea6062a5e22a98c
+Subproject commit 37bc5f0232a0bb72dedd2c14149614fd8cdae649

From 886c4c55d73b81af52fb537f8a9f814ff6b954f4 Mon Sep 17 00:00:00 2001
From: Weihang Lo <me@weihanglo.tw>
Date: Sun, 17 Dec 2023 10:50:44 -0500
Subject: [PATCH 3/4] [TRY] DO NOT MERGE

---
 src/ci/github-actions/ci.yml | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/ci/github-actions/ci.yml b/src/ci/github-actions/ci.yml
index 800d8920951bc..a2a1396e5455a 100644
--- a/src/ci/github-actions/ci.yml
+++ b/src/ci/github-actions/ci.yml
@@ -732,6 +732,11 @@ jobs:
             env:
               CODEGEN_BACKENDS: llvm,cranelift
             <<: *job-linux-16c
+          - &dist-i686-linux
+            name: dist-i686-linux
+            env:
+              CODEGEN_BACKENDS: llvm,cranelift
+            <<: *job-linux-16c
 
 
   master:

From 43970b1890aad8fb5c551b4f142923e76e3936d1 Mon Sep 17 00:00:00 2001
From: Weihang Lo <me@weihanglo.tw>
Date: Sun, 17 Dec 2023 10:52:21 -0500
Subject: [PATCH 4/4] [DONT MERGE] try perl-core with centos 7 for builiding
 OpenSSLv3

---
 .github/workflows/ci.yml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 4cf603519b104..73eaa21c19305 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -582,6 +582,10 @@ jobs:
             env:
               CODEGEN_BACKENDS: "llvm,cranelift"
             os: ubuntu-20.04-16core-64gb
+          - name: dist-i686-linux
+            env:
+              CODEGEN_BACKENDS: "llvm,cranelift"
+            os: ubuntu-20.04-16core-64gb
     timeout-minutes: 600
     runs-on: "${{ matrix.os }}"
     steps: