From patchwork Tue Jan 2 07:27:32 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Efraim Flashner X-Patchwork-Id: 58310 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 3D16A27BBE9; Tue, 2 Jan 2024 07:29:49 +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=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 0624927BBE2 for ; Tue, 2 Jan 2024 07:29:48 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rKZD3-0008Iv-Fm; Tue, 02 Jan 2024 02:29:09 -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-0008Hg-Bw for guix-patches@gnu.org; Tue, 02 Jan 2024 02:29:04 -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 1rKZCv-0004rP-V3; Tue, 02 Jan 2024 02:29:01 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rKZCv-0006cK-VF; Tue, 02 Jan 2024 02:29:01 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#68202] [PATCH 1/5] gnu: Add support for x86_64-linux-gnux32. Resent-From: Efraim Flashner Original-Sender: "Debbugs-submit" Resent-CC: guix@cbaines.net, dev@jpoiret.xyz, ludo@gnu.org, othacehe@gnu.org, rekado@elephly.net, zimon.toutoune@gmail.com, me@tobias.gr, guix-patches@gnu.org Resent-Date: Tue, 02 Jan 2024 07:29:01 +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 , Christopher Baines , Josselin Poiret , Ludovic =?utf-8?q?Court=C3=A8s?= , Mathieu Othacehe , Ricardo Wurmus , Simon Tournier , Tobias Geerinckx-Rice X-Debbugs-Original-Xcc: Christopher Baines , Josselin Poiret , Ludovic =?utf-8?q?Court=C3=A8s?= , Mathieu Othacehe , Ricardo Wurmus , Simon Tournier , Tobias Geerinckx-Rice Received: via spool by 68202-submit@debbugs.gnu.org id=B68202.170418048425320 (code B ref 68202); Tue, 02 Jan 2024 07:29:01 +0000 Received: (at 68202) by debbugs.gnu.org; 2 Jan 2024 07:28:04 +0000 Received: from localhost ([127.0.0.1]:49267 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rKZBz-0006aF-H7 for submit@debbugs.gnu.org; Tue, 02 Jan 2024 02:28:04 -0500 Received: from mail-wr1-x433.google.com ([2a00:1450:4864:20::433]:53558) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rKZBw-0006Zb-IK for 68202@debbugs.gnu.org; Tue, 02 Jan 2024 02:28:01 -0500 Received: by mail-wr1-x433.google.com with SMTP id ffacd0b85a97d-33686649b72so9315351f8f.3 for <68202@debbugs.gnu.org>; Mon, 01 Jan 2024 23:27:58 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1704180472; x=1704785272; 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=75rljB82Z0AUYQBx5Lesz+PrwTDAJtLE1WtBImkb+4g=; b=eMMxSgEP1RMo6jatkCzsn/2bK5bYpmXjbZ4rxr3ywiDFbqEYd3lHaRn5z9mrYQgjWr J3xeBBDSygDI2J5BL76tlWwNGjV7nUpuRq9FwIM0LA4YFzlw1ul8wfakmp7xkKtscCya eny6X0hIkSTjMftaqDKZ0xaSATrK1auckCwSjIGHTcVpbuj9Ilag2yU906faiMNYoOY1 GP3uh7K/vVklLcyunFK0JlkHnfEk0Rvij+8VA7Ye8x0EAgQB4yV8nv/GgDltogpIYtph LgJIwJrFaB868CAZpfaSCuDa4hxQmhFoshykOE1EKkxeC+h4hHqztuh9ex8iTyjeL+69 5IOA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1704180472; x=1704785272; 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=75rljB82Z0AUYQBx5Lesz+PrwTDAJtLE1WtBImkb+4g=; b=ZJjeOceMUoVhVhhD/3MZdiG/BvnQ2PYkO7gxN2TDhgKhuMS/OgtsH3VCuK6ycNeY0R vr7SHI8h9mkDSYGiiS1Lrmsas6eZzDNd78yE7aj6iSFP6gaZwgWZFrHMe1VtEOUJijwm e+XUJMfKpHYNvfrHYws6KTxHS9hac4uW5LovGUv/ukrXzgYlD5N8XIPPLMiPIbLj8kiM LUqmFZxdWOSVc9rnmto+FWWheOrrc+VdzV54NnM1gaXISnjOtMVmwFSqleRBF1M6XJcu dTRJlfuelPlT8QBwwzkQP+J193bqa91ilhO0gFV8g9XiEzqt1TeLIa1p+VblhGbx6H38 UZIw== X-Gm-Message-State: AOJu0Ywd2Mns4Ts7wAsaWYJapYF4bprrNAFazaqhd6wYMSdJcZbi7CIe 5e9Ha737PJmZWGbFm1+VxQQAs/1FJ/+B9g== X-Google-Smtp-Source: AGHT+IHmpSQg+a/AEjRBXEvuNMqwlemICzYNXZkzxZS+tlUNkPgAPjOQXEZu4DckYeN04gOZWGKvhQ== X-Received: by 2002:a5d:4481:0:b0:336:6293:9c0b with SMTP id j1-20020a5d4481000000b0033662939c0bmr8369085wrq.104.1704180472188; Mon, 01 Jan 2024 23:27:52 -0800 (PST) Received: from localhost ([141.226.15.142]) by smtp.gmail.com with ESMTPSA id r10-20020adfce8a000000b00336781490dcsm27626042wrn.69.2024.01.01.23.27.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 01 Jan 2024 23:27:51 -0800 (PST) From: Efraim Flashner Date: Tue, 2 Jan 2024 09:27:32 +0200 Message-ID: <626cb5a810638e59f9d3f2b7ca8b5664e91c3a36.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/bootstrap.scm (glibc-dynamic-linker): Add entry for x86_64-linux-gnux32. * gnu/packages/gcc.scm (gcc-configure-flags-for-triplet): Add configure-flag for x86_64-linux-gnux32. * guix/platforms/x86.scm (x86_64-linux-gnux32): New variable. * guix/utils.scm (gnu-triplet->nix-system): Force x86_64-linux-gnux32 to output a different nix-system than x86_64-linux-gnu. Change-Id: I519fea2f8357e4b9895ede05fe8a5e373e9b034a --- gnu/packages/bootstrap.scm | 5 ++++- gnu/packages/gcc.scm | 5 ++++- guix/platforms/x86.scm | 10 ++++++++++ guix/utils.scm | 4 +++- 4 files changed, 21 insertions(+), 3 deletions(-) diff --git a/gnu/packages/bootstrap.scm b/gnu/packages/bootstrap.scm index 602d8f26c5..a36bb289cd 100644 --- a/gnu/packages/bootstrap.scm +++ b/gnu/packages/bootstrap.scm @@ -1,7 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020 Ludovic Courtès ;;; Copyright © 2014, 2015, 2018, 2019 Mark H Weaver -;;; Copyright © 2017, 2020 Efraim Flashner +;;; Copyright © 2017, 2020, 2024 Efraim Flashner ;;; Copyright © 2018, 2020, 2022 Jan (janneke) Nieuwenhuizen ;;; Copyright © 2019 Carl Dong ;;; Copyright © 2019 Léo Le Bouter @@ -323,6 +323,9 @@ (define* (glibc-dynamic-linker ((string=? system "powerpc64-linux") "/lib/ld64.so.1") ((string=? system "alpha-linux") "/lib/ld-linux.so.2") + ;; TODO: Differentiate between x86_64-linux-gnu and x86_64-linux-gnux32. + ((string=? system "x86_64-linux-gnux32") "/lib/ld-linux-x32.so.2") + ;; XXX: This one is used bare-bones, without a libc, so add a case ;; here just so we can keep going. ((string=? system "arm-eabi") "no-ld.so") diff --git a/gnu/packages/gcc.scm b/gnu/packages/gcc.scm index a8b74a3632..5590cd3d7e 100644 --- a/gnu/packages/gcc.scm +++ b/gnu/packages/gcc.scm @@ -3,7 +3,7 @@ ;;; Copyright © 2014, 2015, 2018 Mark H Weaver ;;; Copyright © 2014, 2015, 2016, 2017, 2019, 2021 Ricardo Wurmus ;;; Copyright © 2015, 2023 Andreas Enge -;;; Copyright © 2015-2018, 2020-2023 Efraim Flashner +;;; Copyright © 2015-2018, 2020-2024 Efraim Flashner ;;; Copyright © 2016 Carlos Sánchez de La Lama ;;; Copyright © 2018 Tobias Geerinckx-Rice ;;; Copyright © 2018, 2020, 2022 Marius Bakke @@ -75,6 +75,9 @@ (define (gcc-configure-flags-for-triplet target) "--with-mode=thumb" "--with-fpu=neon")) + ((string-match "x86_64-linux-gnux32" target) + '("--with-abi=mx32")) + ((and (string-suffix? "-gnu" target) (not (string-contains target "-linux"))) ;; Cross-compilation of libcilkrts in GCC 5.5.0 to GNU/Hurd fails diff --git a/guix/platforms/x86.scm b/guix/platforms/x86.scm index 4ed5638c14..0c8fc7296c 100644 --- a/guix/platforms/x86.scm +++ b/guix/platforms/x86.scm @@ -1,5 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2022 Mathieu Othacehe +;;; Copyright © 2023, 2024 Efraim Flashner ;;; ;;; This file is part of GNU Guix. ;;; @@ -21,6 +22,7 @@ (define-module (guix platforms x86) #:use-module (guix records) #:export (i686-linux x86_64-linux + x86_64-linux-x32 i686-mingw x86_64-mingw i586-gnu)) @@ -41,6 +43,14 @@ (define x86_64-linux (rust-target "x86_64-unknown-linux-gnu") (glibc-dynamic-linker "/lib/ld-linux-x86-64.so.2"))) +(define x86_64-linux-x32 + (platform + (target "x86_64-linux-gnux32") + (system #f) + (linux-architecture "x86_64") + (rust-target "x86_64-unknown-linux-gnux32") + (glibc-dynamic-linker "/lib/ld-linux-x32.so.2"))) + (define i686-mingw (platform (target "i686-w64-mingw32") diff --git a/guix/utils.scm b/guix/utils.scm index 8e71f97e1c..f4bf965e9a 100644 --- a/guix/utils.scm +++ b/guix/utils.scm @@ -7,7 +7,7 @@ ;;; Copyright © 2015 David Thompson ;;; Copyright © 2017 Mathieu Othacehe ;;; Copyright © 2018, 2020 Marius Bakke -;;; Copyright © 2020, 2021 Efraim Flashner +;;; Copyright © 2020, 2021, 2024 Efraim Flashner ;;; Copyright © 2020, 2021, 2022 Maxim Cournoyer ;;; Copyright © 2021 Simon Tournier ;;; Copyright © 2021 Chris Marusich @@ -634,6 +634,8 @@ (define (gnu-triplet->nix-system triplet) (else triplet)))) (cond ((string-match "^arm[^-]*-([^-]+-)?linux-gnueabihf" triplet) "armhf-linux") + ;; Otherwise it will show up as x86_64-linux... which isn't wrong. + ((string-match "x86_64-linux-gnux32" triplet) "x86_64-linux-gnux32") ((string-match "^([^-]+)-([^-]+-)?linux-gnu.*" triplet) => (lambda (m) From patchwork Tue Jan 2 07:27:33 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Efraim Flashner X-Patchwork-Id: 58308 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 D93B227BBE9; Tue, 2 Jan 2024 07:29:35 +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 5635927BBE2 for ; Tue, 2 Jan 2024 07:29:35 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rKZD1-0008IN-1u; Tue, 02 Jan 2024 02:29:08 -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-0008Hf-5o for guix-patches@gnu.org; Tue, 02 Jan 2024 02:29:04 -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 1rKZCw-0004rU-QA; Tue, 02 Jan 2024 02:29:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rKZCw-0006cS-Bu; Tue, 02 Jan 2024 02:29:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#68202] [PATCH 2/5] gnu: Add target-x32?. Resent-From: Efraim Flashner Original-Sender: "Debbugs-submit" Resent-CC: guix@cbaines.net, dev@jpoiret.xyz, ludo@gnu.org, othacehe@gnu.org, rekado@elephly.net, zimon.toutoune@gmail.com, me@tobias.gr, guix-patches@gnu.org Resent-Date: Tue, 02 Jan 2024 07:29:02 +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 , Christopher Baines , Josselin Poiret , Ludovic =?utf-8?q?Court=C3=A8s?= , Mathieu Othacehe , Ricardo Wurmus , Simon Tournier , Tobias Geerinckx-Rice X-Debbugs-Original-Xcc: Christopher Baines , Josselin Poiret , Ludovic =?utf-8?q?Court=C3=A8s?= , Mathieu Othacehe , Ricardo Wurmus , Simon Tournier , Tobias Geerinckx-Rice Received: via spool by 68202-submit@debbugs.gnu.org id=B68202.170418048525337 (code B ref 68202); Tue, 02 Jan 2024 07:29:02 +0000 Received: (at 68202) by debbugs.gnu.org; 2 Jan 2024 07:28:05 +0000 Received: from localhost ([127.0.0.1]:49270 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rKZC1-0006aZ-8O for submit@debbugs.gnu.org; Tue, 02 Jan 2024 02:28:05 -0500 Received: from mail-wm1-x32c.google.com ([2a00:1450:4864:20::32c]:48476) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rKZBy-0006Ze-8P for 68202@debbugs.gnu.org; Tue, 02 Jan 2024 02:28:03 -0500 Received: by mail-wm1-x32c.google.com with SMTP id 5b1f17b1804b1-40d5d8a6730so47681155e9.1 for <68202@debbugs.gnu.org>; Mon, 01 Jan 2024 23:27:59 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1704180474; x=1704785274; 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=Rwyb1DfVv7gLOv61sbN/dAuOpvjz8VGxdoCIWX80qRg=; b=azQJYpqBe4T8eDCdoSQdswF4l4AVYBluHbvUmCyusbb/LgyGuA5tbLlau7NT31ZyZ0 DAAau6/96dAnJXxW55v+m05zS8M44RaZA3PoZaVI+/rfwrGE3lNxkPHsi7JARqVqYayN VEOThq4V62suW3C1CbhVAeGF0bdmQ2H8LayZyy7GndfS0/wghn+knyS9/uPmkVTkIH9L zEejDKMo8r5w9OTdQjEfpdLpVRtWgEFRHTbM5M8Z5IlNI+vQP+cUwSixiezooD2CwYiI AGMxQWZVWCP9+9vwI7ur3DqkZSeZ8fQkqB4GyE+qpE/jfKrEC+iKSBJHuQ3cLmGdEx40 LDsA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1704180474; x=1704785274; 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=Rwyb1DfVv7gLOv61sbN/dAuOpvjz8VGxdoCIWX80qRg=; b=HndmNRz52jd5J4mY3rWYi+cGFrQbhhx0WTzwE5gve+o6KYBOI3LqjD4Fu+fRNmq6PO 5J5ETm9O3JlHqv/J1aG70PDQ3F5TJxiw52dOC2SHCFztY0jRKkHeQZ2VE9npuZj8xCIS /YQ6csoGzhpxt4fYL82twqEN79m11fwcWgFZNJ6TY3GV0BEdlDBwFoNxI0XBUUSHqXXl HTFItSFEwD9gS24F2caTYHAbWkUEkyV+b61obuR6auZl9uYr6SvuqNfT6cAFRhRs65FG P6Wi+B4jZTBwSHTWkKspbUiV+1c+b1DH3DxRiul0Tc2URW+L1KMNZIcaPO0v0En12pxB VCrA== X-Gm-Message-State: AOJu0YyZu7U870FcKwe401ndY0KXd2SVxjvOsxUTWFimZk6UK7mmLSiw 5fxopQYrQk2PCmNV75264w01UICPS5esiw== X-Google-Smtp-Source: AGHT+IHNJ+/aNZhp5IRUTk2TXpY0xmtsC6NQA8EiyStwEGEJvegmzfyJv26+gDqLQ04VgkmgXWUo9w== X-Received: by 2002:a05:600c:2203:b0:40d:33eb:d46a with SMTP id z3-20020a05600c220300b0040d33ebd46amr8861082wml.141.1704180473979; Mon, 01 Jan 2024 23:27:53 -0800 (PST) Received: from localhost ([141.226.15.142]) by smtp.gmail.com with ESMTPSA id w10-20020a05600c474a00b0040d725a9967sm15648218wmo.11.2024.01.01.23.27.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 01 Jan 2024 23:27:53 -0800 (PST) From: Efraim Flashner Date: Tue, 2 Jan 2024 09:27:33 +0200 Message-ID: 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 * guix/utils.scm (target-x32?): New procedure. Change-Id: Ia16c7edce64de01d5ccb126c7bd9a6736f327b5f --- guix/utils.scm | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/guix/utils.scm b/guix/utils.scm index f4bf965e9a..e4e9d922e7 100644 --- a/guix/utils.scm +++ b/guix/utils.scm @@ -97,6 +97,7 @@ (define-module (guix utils) target-x86-32? target-x86-64? target-x86? + target-x32? target-arm32? target-aarch64? target-arm? @@ -712,6 +713,13 @@ (define* (target-x86-64? #:optional (target (or (%current-target-system) architecture (x86_64)?" (string-prefix? "x86_64-" target)) +(define* (target-x32? #:optional (target (or (%current-target-system) + (%current-system)))) + "Is the architecture of TARGET a variant of Intel/AMD's 64-bit +architecture (x86_64) using 32-bit data types?" + (and (target-x86-64? target) + (string-suffix? "gnux32" target))) + (define* (target-x86? #:optional (target (or (%current-target-system) (%current-system)))) (or (target-x86-32? target) (target-x86-64? target))) From patchwork Tue Jan 2 07:27:34 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Efraim Flashner X-Patchwork-Id: 58309 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 868BC27BBEA; Tue, 2 Jan 2024 07:29:39 +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=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 0F42127BBE2 for ; Tue, 2 Jan 2024 07:29:39 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rKZCz-0008HX-1D; Tue, 02 Jan 2024 02:29:05 -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 1rKZCu-0008H3-Ro for guix-patches@gnu.org; Tue, 02 Jan 2024 02:29:00 -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 1rKZCu-0004rA-KD for guix-patches@gnu.org; Tue, 02 Jan 2024 02:29:00 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rKZCw-0006cb-Qh for guix-patches@gnu.org; Tue, 02 Jan 2024 02:29:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#68202] [PATCH 3/5] gnu: openssl: Fix building on 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:02 +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.170418048625344 (code B ref 68202); Tue, 02 Jan 2024 07:29:02 +0000 Received: (at 68202) by debbugs.gnu.org; 2 Jan 2024 07:28:06 +0000 Received: from localhost ([127.0.0.1]:49273 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rKZC1-0006ab-Jh for submit@debbugs.gnu.org; Tue, 02 Jan 2024 02:28:06 -0500 Received: from mail-wr1-x42c.google.com ([2a00:1450:4864:20::42c]:55452) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rKZBz-0006Zg-KC for 68202@debbugs.gnu.org; Tue, 02 Jan 2024 02:28:04 -0500 Received: by mail-wr1-x42c.google.com with SMTP id ffacd0b85a97d-336c9acec03so5240947f8f.2 for <68202@debbugs.gnu.org>; Mon, 01 Jan 2024 23:28:01 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1704180475; x=1704785275; 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=qXU7r1/ExCUGyOilkyONTuVdzToYMurReSWND745Phg=; b=k9J5mErcemhuHLWQLCkHym8WbKHjKbRCKwhf+r+YPjjEKHA4zBpWpxnISSR0JyLojP a2XAYruGT+UKb1UKRrwCDVJD1iKhh7KRs1+wxNHuBApchz5/DlkWv2FjmVZNk5W/ta4n wdYQlP5hqHYaDswzXSRFN5C52wYXG9thAkKgtRqCSLSwuP4mtrsPrM2tTf/985ZtOTiB rBLMnyvthBCzc4/O+aTrCjooq7X23ac4XyiCHv3gJ9z3yePOod01QcEiw3B1YM3KpopP GDBG/+Z6HR1pWFw8oPCBbp9LgEUb1wPr0cxgAXo8swClRsRcI2q1E5AwfgMxxzA+/Rzn IWGQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1704180475; x=1704785275; 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=qXU7r1/ExCUGyOilkyONTuVdzToYMurReSWND745Phg=; b=hI74nJaKbqmAZpAiksGRdvGF9QbLKh3RBBkc/OGw2Ek3h0a+dlk0Wef/eQIlwNzppf wiyza7C7TScQ3Lw8g0q/YFSFkrucyTuiaEe/ZBb/0oEJ2sbIgNn66Q6Sj32RIO8AZ+1K CLXysOLIu7gpuurbIPjgGVkW9+iNPyKLRyD2jHDQ8aYI6dFmIrovngIrwPBnva6H+xgy EZFvTVNcdwS7m25My7EeCOZrCVptfDww44tcpdV3pnsh93wvIBqGlMEEq4qsIIvya0rv 0OpHdOJX23jqvPJWSnybIAvnppov6iq3K2VH6MY+wzHODAqIY7Aee1ZNvAsQ35HBaS7C ZqMA== X-Gm-Message-State: AOJu0YwcHAv73i7L2EAhjq+T+FbwBHW4krZjSibA42Z59zYRyIvB5Ej5 wsTf1yxaRGkvjHnxGgkk0TpiNP6KfyJ/zg== X-Google-Smtp-Source: AGHT+IGdJvU3qIXGBHubscon1b/3eT767d+i83/jAsqGwDs+TsRzOSDr/od8vCF1Tl5k/GSTn++EMQ== X-Received: by 2002:a05:600c:1c0a:b0:40d:5b7c:13e0 with SMTP id j10-20020a05600c1c0a00b0040d5b7c13e0mr5548071wms.39.1704180475634; Mon, 01 Jan 2024 23:27:55 -0800 (PST) Received: from localhost ([141.226.15.142]) by smtp.gmail.com with ESMTPSA id q17-20020a05600c46d100b0040d802a7619sm12729147wmo.38.2024.01.01.23.27.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 01 Jan 2024 23:27:55 -0800 (PST) From: Efraim Flashner Date: Tue, 2 Jan 2024 09:27:34 +0200 Message-ID: <1252b9d0117ae10a018a304a54ab1fad9ef27326.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/tls.scm (target->openssl-target): Add entry for x86_64-linux-gnux32. Change-Id: Icbbdb76134da0811b8493c55ca2d3acdb77c5883 --- gnu/packages/tls.scm | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/gnu/packages/tls.scm b/gnu/packages/tls.scm index 75e6370c72..208a7ff640 100644 --- a/gnu/packages/tls.scm +++ b/gnu/packages/tls.scm @@ -5,7 +5,7 @@ ;;; Copyright © 2013, 2015 Andreas Enge ;;; Copyright © 2015 David Thompson ;;; Copyright © 2015, 2016, 2017, 2018, 2019, 2020, 2021 Leo Famulari -;;; Copyright © 2016, 2017, 2019, 2021-2023 Efraim Flashner +;;; Copyright © 2016, 2017, 2019, 2021-2024 Efraim Flashner ;;; Copyright © 2016, 2017, 2018 Nikita ;;; Copyright © 2016 Hartmut Goebel ;;; Copyright © 2017 Ricardo Wurmus @@ -429,6 +429,8 @@ (define (target->openssl-target target) (cond ((target-x86-32? target) "x86") + ((target-x32? target) + "x32") ((target-x86-64? target) "x86_64") ((target-mips64el? target) From patchwork Tue Jan 2 07:27:35 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Efraim Flashner X-Patchwork-Id: 58306 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 EC83927BBE2; Tue, 2 Jan 2024 07:29:10 +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 5A10627BBE9 for ; Tue, 2 Jan 2024 07:29:10 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rKZD0-0008I4-At; Tue, 02 Jan 2024 02:29:07 -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 1rKZCv-0008HA-6S for guix-patches@gnu.org; Tue, 02 Jan 2024 02:29: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 1rKZCu-0004rG-Uz for guix-patches@gnu.org; Tue, 02 Jan 2024 02:29:00 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rKZCx-0006ci-6D for guix-patches@gnu.org; Tue, 02 Jan 2024 02:29:03 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#68202] [PATCH 4/5] gnu: gmp: Fix building on 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.170418048825359 (code B ref 68202); Tue, 02 Jan 2024 07:29:03 +0000 Received: (at 68202) by debbugs.gnu.org; 2 Jan 2024 07:28:08 +0000 Received: from localhost ([127.0.0.1]:49275 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rKZC3-0006av-8x for submit@debbugs.gnu.org; Tue, 02 Jan 2024 02:28:07 -0500 Received: from mail-wm1-x32f.google.com ([2a00:1450:4864:20::32f]:48372) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rKZC1-0006Zm-FN for 68202@debbugs.gnu.org; Tue, 02 Jan 2024 02:28:06 -0500 Received: by mail-wm1-x32f.google.com with SMTP id 5b1f17b1804b1-40d89105365so10208145e9.0 for <68202@debbugs.gnu.org>; Mon, 01 Jan 2024 23:28:03 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1704180477; x=1704785277; 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=1aJSDkFr4x/TdFWMELFaRugt1BnPHryKdHzWJZQmvgE=; b=nTQ4SZWO+0We3Lc8hnFp9IaLjpO8Upwk3isJGgE5HDcNNZLYC7gIYylf11lztnQ/iO vb/2GgNxoeGMGPvo2tHilWbrSbx8HF2panpOEKwCXmrNslFzoNIHGEzSaa1ZA4WV1Trz DsA5+pFh0cEFvQ64a/C+oa2AwrRZDdO/B8ZmgyKHdwYVQ0KxiJhKw3CFegLSkquR0TSO j7clPOhju+jHT5Rn7ZcUZD8UfIrMJVTiGC3b4wuIC7CbQWEFJu4bmnv8aUV7gMJGd/mc NBR8SnAaQe/UEX2BEF7jj0cOMFph4iMFE/j/Kg3cJX9DTVkrMAlsfTBQ8ZwFSHxni4Sk J89Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1704180477; x=1704785277; 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=1aJSDkFr4x/TdFWMELFaRugt1BnPHryKdHzWJZQmvgE=; b=f6I7seHLOmcUjR/ih2ZbWpVWqeGWfHSiIG8bf4TiR6JQPKkwbzjvCaTg2eLO229aVD 9VqEQpKaUpec3ZTCVANSL/qQwzToAo6o3xBttTfrS6fBqo2cvWO3B9QF2YDaRHSGfIPf yLch/qDhhWlaIJleNn/j8Mc2keD/yfvsuahoZlkJuMPe9/Q/tLQKjD4+j9SUoTweVeMa gHA9mmc++th9ry3Mw4USmBpC4v/NMWey5qyoIIR+AGjsjtr5t6KCqjsstdfWhAYaupn9 Y00wzChvNFuoabJsRo12oUYzH1ARDad9XqKDilblBzGfkaI10KdtdynIMwVcTt9n37jl VEjg== X-Gm-Message-State: AOJu0Yzwd5kuE/LSRqreicwlRIZtlMCdduObjF3NY+9awHWbWULFDoHI XH9eDWMGmb/wE3RBsY8V+a39EvpmKvDpNQ== X-Google-Smtp-Source: AGHT+IF7HZMRt8ZwWgSAzWEo7tfG5Kbo4sOjitzJAgm2WcoX/DaIt+trNpBfbSf6Vj56NyHOXZ9QaQ== X-Received: by 2002:a05:600c:3659:b0:40d:5c7d:20f3 with SMTP id y25-20020a05600c365900b0040d5c7d20f3mr4912468wmq.48.1704180477417; Mon, 01 Jan 2024 23:27:57 -0800 (PST) Received: from localhost ([141.226.15.142]) by smtp.gmail.com with ESMTPSA id hn34-20020a05600ca3a200b0040d1bd0e716sm42789438wmb.9.2024.01.01.23.27.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 01 Jan 2024 23:27:57 -0800 (PST) From: Efraim Flashner Date: Tue, 2 Jan 2024 09:27:35 +0200 Message-ID: <48df4e925f2950352c1f84856720ed84d711aa07.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/multiprecision.scm (gmp)[arguments]: When building for x86_64-linux-gnux32 add a configure-flag to use the x32 ABI. Change-Id: I321c707b3f7df5eeb338f03dacf08b29181ecf53 --- gnu/packages/multiprecision.scm | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/gnu/packages/multiprecision.scm b/gnu/packages/multiprecision.scm index 0c6255c129..591170b508 100644 --- a/gnu/packages/multiprecision.scm +++ b/gnu/packages/multiprecision.scm @@ -6,7 +6,7 @@ ;;; Copyright © 2016, 2020 Jan (janneke) Nieuwenhuizen ;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice ;;; Copyright © 2018 Eric Bavier -;;; Copyright © 2018, 2019, 2021, 2023 Efraim Flashner +;;; Copyright © 2018, 2019, 2021, 2023, 2024 Efraim Flashner ;;; Copyright © 2021 Vinicius Monego ;;; Copyright © 2022 Maxim Cournoyer ;;; Copyright © 2023 Janneke Nieuwenhuizen @@ -71,6 +71,8 @@ (define-public gmp ;; they produce different headers. We need shared. `("--disable-static" "--enable-shared")) + ((target-x32?) + `("ABI=x32")) (else '()))) ;; Remove after core-updates merge. ;; Workaround for gcc-7 transition breakage, -system and cross-build, 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