From patchwork Sat Dec 16 22:57:28 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Leo_Nikkil=C3=A4?= X-Patchwork-Id: 57655 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 315C127BBEA; Sat, 16 Dec 2023 22:59:21 +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.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,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 EFC0727BBE9 for ; Sat, 16 Dec 2023 22:59:18 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rEdcd-00034x-Jj; Sat, 16 Dec 2023 17:59:03 -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 1rEdcb-00034Y-FW for guix-patches@gnu.org; Sat, 16 Dec 2023 17:59: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 1rEdcb-0000fm-73 for guix-patches@gnu.org; Sat, 16 Dec 2023 17:59:01 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rEdcc-0002Ka-07 for guix-patches@gnu.org; Sat, 16 Dec 2023 17:59:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#67859] [PATCH] gnu: libsigsegv: Fix x86_64 cross-compilation. Resent-From: Leo =?utf-8?q?Nikkil=C3=A4?= Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 16 Dec 2023 22:59:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 67859 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 67859@debbugs.gnu.org Cc: Leo =?utf-8?q?Nikkil=C3=A4?= X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.17027675348945 (code B ref -1); Sat, 16 Dec 2023 22:59:01 +0000 Received: (at submit) by debbugs.gnu.org; 16 Dec 2023 22:58:54 +0000 Received: from localhost ([127.0.0.1]:56301 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rEdcU-0002KC-4l for submit@debbugs.gnu.org; Sat, 16 Dec 2023 17:58:54 -0500 Received: from lists.gnu.org ([2001:470:142::17]:48874) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rEdcO-0002Jw-Vt for submit@debbugs.gnu.org; Sat, 16 Dec 2023 17:58:52 -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 1rEdcG-0002kV-9S for guix-patches@gnu.org; Sat, 16 Dec 2023 17:58:40 -0500 Received: from out1-smtp.messagingengine.com ([66.111.4.25]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rEdcE-0000aC-HU for guix-patches@gnu.org; Sat, 16 Dec 2023 17:58:40 -0500 Received: from compute2.internal (compute2.nyi.internal [10.202.2.46]) by mailout.nyi.internal (Postfix) with ESMTP id 77EC55C00C8; Sat, 16 Dec 2023 17:58:36 -0500 (EST) Received: from mailfrontend2 ([10.202.2.163]) by compute2.internal (MEProxy); Sat, 16 Dec 2023 17:58:36 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=lnikki.la; h=cc :cc:content-transfer-encoding:content-type:content-type:date :date:from:from:in-reply-to:message-id:mime-version:reply-to :subject:subject:to:to; s=fm3; t=1702767516; x=1702853916; bh=XB onQKdunab5TBG+8ZYOpsPIrIK6TJvs7oRh/3+bi1Y=; b=h1xbG/pGb60UqKvjpU c6agpWCjkraGXDvSZzGTOUywZaIAt1lEfn+FbWjdzoEmC/8GzN6YcOqhT4poeCLo 1NqM8FGgdx8K/9V/mIgxzDDoTgdAPUJ9O3LHtNl9I+P3uWK+Inqwwt4kWqg90meO eSJ/sxanIHztqCoAucQwnEMoc/H852X3wj9kJYUufku9Hf4uccvMtwX/FGhgbUM5 uUth+JYYpzQU/dO3Nga5pXmFEpxZdUD40iToqCKiKYTLkJCES2k9BOCk1aK//fNS JQ4aDxo9n9dwWli0rAiYLgt4WC4hcOvvxW/O42Ql+PjuHRevt0T1dg0AATs7O2dO gpgA== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-transfer-encoding :content-type:content-type:date:date:feedback-id:feedback-id :from:from:in-reply-to:message-id:mime-version:reply-to:subject :subject:to:to:x-me-proxy:x-me-proxy:x-me-sender:x-me-sender :x-sasl-enc; s=fm2; t=1702767516; x=1702853916; bh=XBonQKdunab5T BG+8ZYOpsPIrIK6TJvs7oRh/3+bi1Y=; b=MQ9Syeks/Ie3CzNpG/dy0xN0+G/Jv hyPH0FEvj+H5fSLFB16j8BTiwCb+SFaX8/wSQZtZgHPmAycXiPvNxFU4ko9OmauD Bf/Y+YDkSrRW6iU1TxOzZ64wBkRmphlM08+CL87AlUwWbQZ/4lWCcAOnW6RnA2m9 C1CZvb3krO2i9o2GNEEeB5w4ZBC2buIY5DQ1V7ERSSOQ3ciFvMvV2qVvhJPKyZpS kzKdWr4BzXe+0WvDtyAdN/1H9kdJnDC0L0kpiuYgQG2YVEDuCwz12Bq59impABEv 3yPO+698xzla3dkYdmuKhRktO5+PBqJifJwqP9qHS3aDejtN+3fYr02pw== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvkedrvddthedgtdeiucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucenucfjughrpefhvfevufffkffogggtgfesthekre dtredtjeenucfhrhhomhepnfgvohcupfhikhhkihhlmocuoehhvghllhhosehlnhhikhhk ihdrlhgrqeenucggtffrrghtthgvrhhnpedtffduheelveejtdevgffhieehhfeuudegie ehjeeghefgvdffgeejfedvtedvgeenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgr mhepmhgrihhlfhhrohhmpehhvghllhhosehlnhhikhhkihdrlhgr X-ME-Proxy: Feedback-ID: i41f146a7:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Sat, 16 Dec 2023 17:58:35 -0500 (EST) Date: Sun, 17 Dec 2023 00:57:28 +0200 Message-ID: <20231216225802.17298-1-hello@lnikki.la> X-Mailer: git-send-email 2.41.0 MIME-Version: 1.0 Received-SPF: pass client-ip=66.111.4.25; envelope-from=hello@lnikki.la; helo=out1-smtp.messagingengine.com X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_PASS=-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: , Reply-to: Leo =?utf-8?q?Nikkil=C3=A4?= X-ACL-Warn: , =?utf-8?q?Leo_Nikkil=C3=A4_via_Guix-patches?= X-Patchwork-Original-From: =?utf-8?q?Leo_Nikkil=C3=A4_via_Guix-patches?= via From: =?utf-8?q?Leo_Nikkil=C3=A4?= 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/libsigsegv.scm (libsigsegv): Set `#:phases' for x86_64. --- gnu/packages/libsigsegv.scm | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) diff --git a/gnu/packages/libsigsegv.scm b/gnu/packages/libsigsegv.scm index ebbdd2ad90..39c76cd462 100644 --- a/gnu/packages/libsigsegv.scm +++ b/gnu/packages/libsigsegv.scm @@ -1,6 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2012, 2013, 2018 Ludovic Courtès ;;; Copyright © 2017 Efraim Flashner +;;; Copyright © 2023 Leo Nikkilä ;;; ;;; This file is part of GNU Guix. ;;; @@ -41,6 +42,21 @@ (define-public libsigsegv `(;; The shared library isn't built by default but some packages need it. #:configure-flags '("--enable-shared") + ;; When cross-compiling for x86_64, work around this error: + ;; + ;; In file included from fault-linux-x86_64-old.h:17, + ;; [...] + ;; linux-libre-headers-cross-x86_64-linux-gnu-5.15.49/include/asm/sigcontext.h:317:8: error: redefinition of ‘struct sigcontext’ + ,@(if (string-contains (or (%current-target-system) + (%current-system)) + "x86_64") + `(#:phases (modify-phases %standard-phases + (add-before 'configure 'patch-x86_64-old-h + (lambda _ + (substitute* "src/fault-linux-x86_64-old.h" + (("#include ") "")))))) + '()) + ;; On MIPS, work around this error: ;; ;; In file included from fault-linux-mips-old.h:18:0, @@ -52,8 +68,7 @@ (define-public libsigsegv (add-before 'configure 'patch-mips-old-h (lambda _ (substitute* "src/fault-linux-mips-old.h" - (("#include ") "")) - #t)))) + (("#include ") "")))))) '()))) (description "GNU libsigsegv is a library to handle page faults, which occur when a