From patchwork Tue Nov 19 06:54:52 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Janneke Nieuwenhuizen X-Patchwork-Id: 33596 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 20FE127BBEC; Tue, 19 Nov 2024 07:01:40 +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=-7.6 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED, RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE, 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 D757027BBEA for ; Tue, 19 Nov 2024 07:01:39 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tDICz-00007E-At; Tue, 19 Nov 2024 01:59:33 -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 1tDICn-0008Rc-0x for guix-patches@gnu.org; Tue, 19 Nov 2024 01:59:21 -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 1tDICm-0004LT-NV for guix-patches@gnu.org; Tue, 19 Nov 2024 01:59:20 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:References:In-Reply-To:Date:From:To:Subject; bh=Tzx7sfpF6zPexd9qQ5YlxNXlGGlqiXkutTcT8A/yEyU=; b=ds9DMe8v+vG/z4KADtwP4vbGaEgpRydLs4HuIUfRPv65V/wQw1P9jXWFM1UXLbfpVU5iDWGeCm9pNMVy4kP83tq8Z/5pQZQzpN61V9m90/mYiqI9gKv5VG3nZT+kvnEvuifXtvGHbaykkcb2dF3kr4fDqUByvMtlWiTmVYuhbDEvvdnWcyhKVNg1Z8+Gga9W2BIRT95iJNYaU6FXYPy4rTfsLN4PQeqJfZHDKq0KsRhRXJuQCAkSdIvYnafL844YpQC940pdyWde5qppB+tV7ci6yTFG2iyzfBUkWoRbPyqYEYCd/scH5jkRNOaQQvxSpl2HHGGgS79dJ0ZG7GumUw==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tDICm-0005JH-Ie for guix-patches@gnu.org; Tue, 19 Nov 2024 01:59:20 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#74290] [PATCH v3 22/51] gnu: libssh: Fix [cross-]build with gcc-14 for 32bit. Resent-From: Janneke Nieuwenhuizen Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 19 Nov 2024 06:59:20 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 74290 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 74290@debbugs.gnu.org Received: via spool by 74290-submit@debbugs.gnu.org id=B74290.173199954620142 (code B ref 74290); Tue, 19 Nov 2024 06:59:20 +0000 Received: (at 74290) by debbugs.gnu.org; 19 Nov 2024 06:59:06 +0000 Received: from localhost ([127.0.0.1]:40564 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tDICX-0005Ea-Np for submit@debbugs.gnu.org; Tue, 19 Nov 2024 01:59:06 -0500 Received: from eggs.gnu.org ([209.51.188.92]:39366) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tDIBv-00057f-JM for 74290@debbugs.gnu.org; Tue, 19 Nov 2024 01:58:28 -0500 Received: from fencepost.gnu.org ([2001:470:142:3::e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1tDI9k-000403-0P; Tue, 19 Nov 2024 01:56:12 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:References:In-Reply-To:Date:Subject:To: From; bh=Tzx7sfpF6zPexd9qQ5YlxNXlGGlqiXkutTcT8A/yEyU=; b=L1YkvMmD9SMbNQp65lG9 vTCPWIVIxXYZudOjPvJncOwPjcNyOjYq12yB0jImyCF8DKkpf2hjlHlp/XMlHJ0Hgt6NxylRHbmYL TawAl1sMeglxpUlLA3swfANawotuo/zyUXTYHGzI2bJGsRkhCtw4tqCcTrgsLj0doz6Ra7hie7jZq zv3ic1fRQ+QfhC746y5Bj10qJtEX0F+sGZWY0fTQDl/qspq1QmeVeRWggQuwYJ9on5TKiEJbSCaAP Nt/Tf5dnRS1UdmkqkEcxLrQMw4ValZiaHZ69c5rkw1GwkE8RdHFuSmeHmtMD5kk9z0pMgkgcil/tz Xg1I7q4WlewV4Q==; From: Janneke Nieuwenhuizen Date: Tue, 19 Nov 2024 07:54:52 +0100 Message-ID: X-Mailer: git-send-email 2.46.0 In-Reply-To: References: MIME-Version: 1.0 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 (libssh)[arguments]: When cross-compiling to a 32bit host, add CFLAGS to #:configure-flags to disable a breaking warning. Change-Id: Ibab7332af162aed38158a50e9b4fc288b4286922 --- gnu/packages/ssh.scm | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/gnu/packages/ssh.scm b/gnu/packages/ssh.scm index a29a10e954..1f33259246 100644 --- a/gnu/packages/ssh.scm +++ b/gnu/packages/ssh.scm @@ -13,7 +13,7 @@ ;;; Copyright © 2018 Manuel Graf ;;; Copyright © 2019 Gábor Boskovits ;;; Copyright © 2019, 2020 Mathieu Othacehe -;;; Copyright © 2020, 2023 Janneke Nieuwenhuizen +;;; Copyright © 2020, 2023, 2024 Janneke Nieuwenhuizen ;;; Copyright © 2020 Oleg Pykhalov ;;; Copyright © 2020, 2021, 2022 Maxim Cournoyer ;;; Copyright © 2021 Brice Waegeneire @@ -156,7 +156,12 @@ (define-public libssh (build-system cmake-build-system) (outputs '("out" "debug")) (arguments - '(#:configure-flags '("-DWITH_GCRYPT=ON") + `(#:configure-flags '("-DWITH_GCRYPT=ON" + ,@(if (and (%current-target-system) (target-x86-32?)) + (list (string-append + "-DCMAKE_C_FLAGS=-g -O2" + " -Wno-incompatible-pointer-types")) + '())) ;; TODO: Add 'CMockery' and '-DWITH_TESTING=ON' for the test suite. #:tests? #f))