From patchwork Tue Jan 2 07:27:36 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Efraim Flashner X-Patchwork-Id: 58307 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 AC7D027BBE9; Tue, 2 Jan 2024 07:29:20 +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 autolearn=unavailable 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 BE02B27BBE2 for ; Tue, 2 Jan 2024 07:29:19 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rKZD0-0008I6-Kk; Tue, 02 Jan 2024 02:29:06 -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 1rKZCy-0008Ht-W3 for guix-patches@gnu.org; Tue, 02 Jan 2024 02:29:05 -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 1rKZCy-0004rT-BC for guix-patches@gnu.org; Tue, 02 Jan 2024 02:29:04 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rKZCx-0006cq-HW for guix-patches@gnu.org; Tue, 02 Jan 2024 02:29:03 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#68202] [PATCH 5/5] gnu: libsigsegv: Fix building for x86_64-linux-gnux32. Resent-From: Efraim Flashner Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 02 Jan 2024 07:29:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 68202 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 68202@debbugs.gnu.org Cc: Efraim Flashner Received: via spool by 68202-submit@debbugs.gnu.org id=B68202.170418049025373 (code B ref 68202); Tue, 02 Jan 2024 07:29:03 +0000 Received: (at 68202) by debbugs.gnu.org; 2 Jan 2024 07:28:10 +0000 Received: from localhost ([127.0.0.1]:49278 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rKZC6-0006bA-0M for submit@debbugs.gnu.org; Tue, 02 Jan 2024 02:28:10 -0500 Received: from mail-wm1-x332.google.com ([2a00:1450:4864:20::332]:50466) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rKZC3-0006aC-BQ for 68202@debbugs.gnu.org; Tue, 02 Jan 2024 02:28:07 -0500 Received: by mail-wm1-x332.google.com with SMTP id 5b1f17b1804b1-40d4a7f0c4dso85662525e9.1 for <68202@debbugs.gnu.org>; Mon, 01 Jan 2024 23:28:04 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1704180479; x=1704785279; darn=debbugs.gnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:sender:from:to:cc:subject:date :message-id:reply-to; bh=wxkjBP8WfLeADifBNOadxct/qRoIXpva/KA0ohr/5jw=; b=jPsgxRD4haD/+gvn5/dHi8iyH1hlO7rsQVei3kbA3jxEs5hARBj4oFWtBsRCm1JWId 1hNFGbLOQOCk66opYvHkasG0EINU6V9E0sWzj1jKjw5c/IEcdStyZIWS2DPlClhS0izf qE9kY6rnGUazfqMWTFQaaq136KodnIdUSNo1t5OtiPl/OCeKi974TgsTTw66jb9LaYt0 1/7nZH4iVHtmitfsX1cc/1g/9CKIpS+wjK3+0bMxgZS8+6JxZEPqH2s4iqIgCZdXvBQW stiuDKfYvKHQU3Rc3ONDJh9RQCR871C5kstqXv3UCTRepEqPDKuPR5kvt2bQV/Z2Ifo/ +DYA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1704180479; x=1704785279; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:sender:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=wxkjBP8WfLeADifBNOadxct/qRoIXpva/KA0ohr/5jw=; b=ETtcn6muOxpiK/bhB10s2LQ4C+6piBIhAWlfoky2PXap1r0C+3W2gpBqykJ//8JkSH YzUHOCNUrVvb+ODoziP+Pb71HKDMj1uKZVle5iDlAeo71bsq5BJzUsEhVWEUXD6mQTo1 yxH1RJ0fiRT/WgR9vmsmLzu0MkspbYciFcmsHhS9u2rUdv9MVS+Z8PsGD2at44VAUjne dvzhcugp7eG/onQKriM/CqfjUCKsbbCsbKtLnyOfIvW73U+xI8F7fcrdjlSQKCk1XAaK CnnjmiFeF2cR8nnqPgaSk3awgdup5Sexld5J+uVkhYV+SueYyrBnNhOdwbL8aWwsfIQP mOGg== X-Gm-Message-State: AOJu0YyMco7A1DV96SRo2QZD0WbED/YUbaETbYjFtSSQtTRyRT6ipJHs rhQFSiUNIPTklHgQdlcRR66xOmtRxnBYQA== X-Google-Smtp-Source: AGHT+IHIoNZXP5AmR0lIfphjaWQBPXvd3LVj4jmMVS+tK4oaaExA+0b2qOC/gD64UDJzOzTypq7z8w== X-Received: by 2002:a05:600c:3506:b0:40d:87e8:fbc5 with SMTP id h6-20020a05600c350600b0040d87e8fbc5mr1426472wmq.48.1704180479160; Mon, 01 Jan 2024 23:27:59 -0800 (PST) Received: from localhost ([141.226.15.142]) by smtp.gmail.com with ESMTPSA id bi18-20020a05600c3d9200b0040d88a69dccsm6252254wmb.16.2024.01.01.23.27.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 01 Jan 2024 23:27:58 -0800 (PST) From: Efraim Flashner Date: Tue, 2 Jan 2024 09:27:36 +0200 Message-ID: <8e2a3ae4b8c3088d7c6d857e88b3dd394afb57c6.1704179455.git.efraim@flashner.co.il> X-Mailer: git-send-email 2.41.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/libsigsegv.scm (libsigsegv)[arguments]: When building for x86_64-linux-gnux32 add a phase to not include extra headers. Change-Id: Ie2d23fd037ed533dacf08acf52771b7ab1d446ac --- gnu/packages/libsigsegv.scm | 33 +++++++++++++++++---------------- 1 file changed, 17 insertions(+), 16 deletions(-) diff --git a/gnu/packages/libsigsegv.scm b/gnu/packages/libsigsegv.scm index ebbdd2ad90..9f4b0dd88d 100644 --- a/gnu/packages/libsigsegv.scm +++ b/gnu/packages/libsigsegv.scm @@ -1,6 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2012, 2013, 2018 Ludovic Courtès -;;; Copyright © 2017 Efraim Flashner +;;; Copyright © 2017, 2024 Efraim Flashner ;;; ;;; This file is part of GNU Guix. ;;; @@ -21,6 +21,7 @@ (define-module (gnu packages libsigsegv) #:use-module (guix licenses) #:use-module (guix packages) #:use-module (guix download) + #:use-module (guix utils) #:use-module (guix build-system gnu)) (define-public libsigsegv @@ -40,21 +41,21 @@ (define-public libsigsegv (arguments `(;; The shared library isn't built by default but some packages need it. #:configure-flags '("--enable-shared") - - ;; On MIPS, work around this error: - ;; - ;; In file included from fault-linux-mips-old.h:18:0, - ;; [...] - ;; linux-libre-headers-cross-mips64el-linux-gnu-3.3.8/include/asm/sigcontext.h:57:8: error: redefinition of 'struct sigcontext' - ,@(if (string-contains (or (%current-target-system) (%current-system)) - "mips64el") - `(#:phases (modify-phases %standard-phases - (add-before 'configure 'patch-mips-old-h - (lambda _ - (substitute* "src/fault-linux-mips-old.h" - (("#include ") "")) - #t)))) - '()))) + ;; On some architectures 'struct sigcontext' gets redefined from + ;; %linux-libre-headers/include/asm/sigcontext.h + ,@(cond ((target-mips64el?) + `(#:phases (modify-phases %standard-phases + (add-before 'configure 'patch-mips-old-h + (lambda _ + (substitute* "src/fault-linux-mips-old.h" + (("#include ") ""))))))) + ((target-x32?) + `(#:phases (modify-phases %standard-phases + (add-before 'configure 'patch-linux-x86_64-old-h + (lambda _ + (substitute* "src/fault-linux-x86_64-old.h" + (("#include ") ""))))))) + (else '())))) (description "GNU libsigsegv is a library to handle page faults, which occur when a program tries to access an unavailable region of memory, in user mode. By