From 9bc7dbce3ee8cd6e8e19b7a6c331bfa03cb1bbcc Mon Sep 17 00:00:00 2001
From: Mathieu Benoit <mathben@technolibre.ca>
Date: Sun, 16 Aug 2026 22:50:01 -0400
Subject: [PATCH] [FIX] openssl: s390x needs the 64-bit Configure target
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The PKGBUILD composes its target as "linux-$CARCH", giving
linux-s390x. That IS a valid OpenSSL target -- it is the 31-bit one.
The 64-bit target is linux64-s390x.

This one hid well. The log ends on

  Configuring OpenSSL version 3.6.3 for target linux-s390x

and then fails, with the failure appearing to come from nowhere: the
target name is right there, it looks correct, and nothing says the
build is 31-bit on a 64-bit system. Four rounds of keyword grepping
found nothing, because the answer was not in the log at all -- it was
in the PKGBUILD, one line above the command that printed it.

The PKGBUILD already special-cases exactly this for riscv64, so s390x
joins that case rather than getting a mechanism of its own.

filesystem now builds: the gid 11 the host was missing was the whole
of it.

--- FR ---

Le PKGBUILD compose sa cible en « linux-$CARCH », ce qui donne
linux-s390x. C EST une cible OpenSSL valide -- celle du 31 bits. La
cible 64 bits s appelle linux64-s390x.

Celle-la se cachait bien. Le journal s acheve sur

  Configuring OpenSSL version 3.6.3 for target linux-s390x

puis echoue, et l echec semble venir de nulle part : le nom de la cible
est la, il a l air juste, et rien ne dit qu on batit du 31 bits sur un
systeme 64 bits. Quatre tours de recherche par mots-cles n ont rien
trouve, parce que la reponse n etait pas dans le journal -- elle etait
dans le PKGBUILD, une ligne au-dessus de la commande qui l imprimait.

Le PKGBUILD traite deja exactement ce cas pour riscv64 ; s390x rejoint
donc cette branche plutot que d obtenir un mecanisme a lui.

filesystem se construit desormais : le gid 11 absent de l hote etait
tout le probleme.

Assisted-by: Claude Opus 5
---
 patches/pkgbuild/openssl.sh | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)
 create mode 100755 patches/pkgbuild/openssl.sh

diff --git a/patches/pkgbuild/openssl.sh b/patches/pkgbuild/openssl.sh
new file mode 100755
index 0000000..21e9291
--- /dev/null
+++ b/patches/pkgbuild/openssl.sh
@@ -0,0 +1,25 @@
+#!/usr/bin/env bash
+# openssl: s390x needs the 64-bit Configure target.
+#
+# The PKGBUILD composes its target as "linux-$CARCH", which gives
+# linux-s390x. That IS a valid OpenSSL target -- it is the 31-bit one. The
+# 64-bit target is linux64-s390x, and building 31-bit objects on a 64-bit
+# system fails without ever saying so plainly: the log ends on
+#
+#   Configuring OpenSSL version 3.6.3 for target linux-s390x
+#
+# and the failure looks like it came from nowhere.
+#
+# The PKGBUILD already special-cases exactly this for riscv64, so the fix is
+# to join that case rather than invent a mechanism.
+set -euo pipefail
+python3 - <<'PY'
+import io
+s = io.open("PKGBUILD", encoding="utf-8").read()
+old = '\t"riscv64")\n'
+assert old in s, "riscv64 case not found"
+s = s.replace(old, '\t"s390x" | "riscv64")\n', 1)
+io.open("PKGBUILD", "w", encoding="utf-8").write(s)
+PY
+grep -q '"s390x" | "riscv64")' PKGBUILD || { echo "openssl: case not extended" >&2; exit 1; }
+echo "openssl: Configure target set to linux64-s390x (linux-s390x is 31-bit)"