From patchwork Tue Jan 2 16:53:28 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Jack Hill X-Patchwork-Id: 58324 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id C3C0327BBEA; Tue, 2 Jan 2024 16:54:09 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.9 required=5.0 tests=BAYES_00,MAILING_LIST_MULTI, SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 9DD4F27BBE2 for ; Tue, 2 Jan 2024 16:54:08 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rKi1i-0000jq-DL; Tue, 02 Jan 2024 11:54:02 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rKi1h-0000iZ-Hb for guix-patches@gnu.org; Tue, 02 Jan 2024 11:54:01 -0500 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rKi1h-0002BZ-96 for guix-patches@gnu.org; Tue, 02 Jan 2024 11:54:01 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rKi1h-0002hp-Rq; Tue, 02 Jan 2024 11:54:01 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#68212] [PATCH] gnu: openssh: fix build one ppc64le. Resent-From: Jack Hill Original-Sender: "Debbugs-submit" Resent-CC: marcel@van-der-boom.nl, john.kehayias@protonmail.com, efraim@flashner.co.il, guix-patches@gnu.org Resent-Date: Tue, 02 Jan 2024 16:54:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 68212 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 68212@debbugs.gnu.org Cc: Marcel van der Boom , John Kehayias , Efraim Flashner X-Debbugs-Original-To: guix-patches@gnu.org X-Debbugs-Original-Xcc: Marcel van der Boom , John Kehayias , Efraim Flashner Received: via spool by submit@debbugs.gnu.org id=B.170421443710388 (code B ref -1); Tue, 02 Jan 2024 16:54:01 +0000 Received: (at submit) by debbugs.gnu.org; 2 Jan 2024 16:53:57 +0000 Received: from localhost ([127.0.0.1]:51115 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rKi1c-0002hQ-E9 for submit@debbugs.gnu.org; Tue, 02 Jan 2024 11:53:57 -0500 Received: from lists.gnu.org ([2001:470:142::17]:38636) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rKi1Y-0002h7-Dh for submit@debbugs.gnu.org; Tue, 02 Jan 2024 11:53:56 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rKi1P-0000Vt-RB for guix-patches@gnu.org; Tue, 02 Jan 2024 11:53:43 -0500 Received: from minsky.hcoop.net ([104.248.1.95]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rKi1N-00029h-S1 for guix-patches@gnu.org; Tue, 02 Jan 2024 11:53:43 -0500 Received: from lib-its13.lib.duke.edu ([152.3.118.151] helo=localhost.localdomain) by minsky.hcoop.net with esmtpsa (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1rKi1M-0002K3-CY for guix-patches@gnu.org; Tue, 02 Jan 2024 11:53:40 -0500 From: Jack Hill Date: Tue, 2 Jan 2024 11:53:28 -0500 Message-ID: <0d64ed54ae7b8a0984e10b1be2f98257fe95377f.1704214408.git.jackhill@jackhill.us> X-Mailer: git-send-email 2.41.0 MIME-Version: 1.0 Received-SPF: pass client-ip=104.248.1.95; envelope-from=jackhill@jackhill.us; helo=minsky.hcoop.net X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/ssh.scm (openssh)[source]: Use 'openssh-gcc-13-ppc64le-fzero-call-used-regs.patch'. * gnu/packages/patches/openssh-gcc-13-ppc64le-fzero-call-used-regs.patch: New file. * gnu/local.mk (dist_patch_DATA): Add it. Reported by Marcel van der Boom . Change-Id: I41b1350b2cdd1487a8fd69b13b64f63c0dc166c9 --- gnu/local.mk | 1 + ...-gcc-13-ppc64le-fzero-call-used-regs.patch | 61 +++++++++++++++++++ gnu/packages/ssh.scm | 5 +- 3 files changed, 66 insertions(+), 1 deletion(-) create mode 100644 gnu/packages/patches/openssh-gcc-13-ppc64le-fzero-call-used-regs.patch base-commit: 8f03c69b428923dc4d51cda23b10aa7fa7d89f05 diff --git a/gnu/local.mk b/gnu/local.mk index 4b2393bfdd..b52134e34e 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1735,6 +1735,7 @@ dist_patch_DATA = \ %D%/packages/patches/openjdk-15-xcursor-no-dynamic.patch \ %D%/packages/patches/openjdk-21-fix-rpath.patch \ %D%/packages/patches/openmpi-mtl-priorities.patch \ + %D%/packages/patches/openssh-gcc-13-ppc64le-fzero-call-used-regs.patch \ %D%/packages/patches/openssh-trust-guix-store-directory.patch \ %D%/packages/patches/openresolv-restartcmd-guix.patch \ %D%/packages/patches/openrgb-unbundle-hueplusplus.patch \ diff --git a/gnu/packages/patches/openssh-gcc-13-ppc64le-fzero-call-used-regs.patch b/gnu/packages/patches/openssh-gcc-13-ppc64le-fzero-call-used-regs.patch new file mode 100644 index 0000000000..1af9868b9a --- /dev/null +++ b/gnu/packages/patches/openssh-gcc-13-ppc64le-fzero-call-used-regs.patch @@ -0,0 +1,61 @@ +From 1036d77b34a5fa15e56f516b81b9928006848cbd Mon Sep 17 00:00:00 2001 +From: Damien Miller +Date: Fri, 22 Dec 2023 17:56:26 +1100 +Subject: [PATCH] better detection of broken -fzero-call-used-regs +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +gcc 13.2.0 on ppc64le refuses to compile some function, including +cipher.c:compression_alg_list() with an error: + +> sorry, unimplemented: argument ‘used’ is not supportedcw +> for ‘-fzero-call-used-regs’ on this target + +This extends the autoconf will-it-work test with a similarly- +structured function that seems to catch this. + +Spotted/tested by Colin Watson; bz3645 +--- + +Taken from upsteam, and for Guix by jackhill@jackhill.us +Thanks Marcel van der Boom for noticing: https://issues.guix.gnu.org/67948#2 + +m4/openssh.m4 | 12 +++++++++--- + 1 file changed, 9 insertions(+), 3 deletions(-) + +diff --git a/m4/openssh.m4 b/m4/openssh.m4 +index 5d4c56280..033df501c 100644 +--- a/m4/openssh.m4 ++++ b/m4/openssh.m4 +@@ -20,18 +20,24 @@ char *f2(char *s, ...) { + va_end(args); + return strdup(ret); + } ++const char *f3(int s) { ++ return s ? "good" : "gooder"; ++} + int main(int argc, char **argv) { +- (void)argv; + char b[256], *cp; ++ const char *s; + /* Some math to catch -ftrapv problems in the toolchain */ + int i = 123 * argc, j = 456 + argc, k = 789 - argc; + float l = i * 2.1; + double m = l / 0.5; + long long int n = argc * 12345LL, o = 12345LL * (long long int)argc; ++ (void)argv; + f(1); +- snprintf(b, sizeof b, "%d %d %d %f %f %lld %lld\n", i,j,k,l,m,n,o); ++ s = f3(f(2)); ++ snprintf(b, sizeof b, "%d %d %d %f %f %lld %lld %s\n", i,j,k,l,m,n,o,s); + if (write(1, b, 0) == -1) exit(0); +- cp = f2("%d %d %d %f %f %lld %lld\n", i,j,k,l,m,n,o); ++ cp = f2("%d %d %d %f %f %lld %lld %s\n", i,j,k,l,m,n,o,s); ++ if (write(1, cp, 0) == -1) exit(0); + free(cp); + /* + * Test fallthrough behaviour. clang 10's -Wimplicit-fallthrough does +-- +2.41.0 + diff --git a/gnu/packages/ssh.scm b/gnu/packages/ssh.scm index 0b364bbe90..e33a18f408 100644 --- a/gnu/packages/ssh.scm +++ b/gnu/packages/ssh.scm @@ -204,7 +204,10 @@ (define-public openssh (method url-fetch) (uri (string-append "mirror://openbsd/OpenSSH/portable/" "openssh-" version ".tar.gz")) - (patches (search-patches "openssh-trust-guix-store-directory.patch")) + (patches (search-patches "openssh-trust-guix-store-directory.patch" + ;; Can be removed with next openssh update + ;; https://issues.guix.gnu.org/67948#2 + "openssh-gcc-13-ppc64le-fzero-call-used-regs.patch")) (sha256 (base32 "0z3pgam8b4z05lvdb78iv06p204qwl7b94a3cnnwba2mfb0120li")))) (build-system gnu-build-system)