From patchwork Mon Mar 20 22:26:36 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Josselin Poiret X-Patchwork-Id: 48474 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 728A616F2D; Mon, 20 Mar 2023 22:27:16 +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=0.2 required=5.0 tests=DKIM_INVALID,DKIM_SIGNED, FROM_SUSPICIOUS_NTLD,MAILING_LIST_MULTI,PDS_OTHER_BAD_TLD, RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,URIBL_BLOCKED autolearn=no 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 07F8016F0B for ; Mon, 20 Mar 2023 22:27:16 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1peNy4-0000Xv-Vg; Mon, 20 Mar 2023 18:27:04 -0400 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 1peNy2-0000XZ-1r for guix-patches@gnu.org; Mon, 20 Mar 2023 18:27:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1peNy1-0000WV-Pz for guix-patches@gnu.org; Mon, 20 Mar 2023 18:27:01 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1peNy1-0007r6-Lo for guix-patches@gnu.org; Mon, 20 Mar 2023 18:27:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#62309] [PATCH core-updates 1/2] opensbi: Build with default gcc, with microarch rv64g Resent-From: Josselin Poiret Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 20 Mar 2023 22:27:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 62309 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Josselin Poiret , 62309@debbugs.gnu.org Received: via spool by 62309-submit@debbugs.gnu.org id=B62309.167935120330159 (code B ref 62309); Mon, 20 Mar 2023 22:27:01 +0000 Received: (at 62309) by debbugs.gnu.org; 20 Mar 2023 22:26:43 +0000 Received: from localhost ([127.0.0.1]:57087 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1peNxj-0007qM-FD for submit@debbugs.gnu.org; Mon, 20 Mar 2023 18:26:43 -0400 Received: from jpoiret.xyz ([206.189.101.64]:49018) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1peNxh-0007qC-CV for 62309@debbugs.gnu.org; Mon, 20 Mar 2023 18:26:41 -0400 Received: from authenticated-user (jpoiret.xyz [206.189.101.64]) by jpoiret.xyz (Postfix) with ESMTPA id 3528D184D6B; Mon, 20 Mar 2023 22:26:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=jpoiret.xyz; s=dkim; t=1679351200; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=FDFUe6AlDIhtAsRF6tTl2Oy2tO67gdOdiuF/f0a043E=; b=s+fU8K6s+wdfJnNeulE2Tbh2aqc7qVaRBN/UfVTWuJ0HjnKHnxRHNgJW6nKb5ADfUDgGFh RgDehrO0hPweLZrXqHiYFhRiG6+KMVwdmu3oytUwzDsMOuaZ5KJPmTClbLhgir6dKGKHkh oZ/3qw09FDC0WHHtcIfLtFY81b4QzWODc6S4fDa4jKdnJtLYdI03vvJFMXJeRMSC3KCdef 4oJ7EGur+o9UcB3d3U/sX3DHrpC1PzZlLEt4gg7k3alKxe+Dx9+O+XhTE4f08LQoC8rq6/ n3PcayTXICXLZ29pHgg42uo1ODwd+NVXSgAyLK3fcvIC9LLLSBfE7NFlqLh8CQ== Date: Mon, 20 Mar 2023 23:26:36 +0100 Message-Id: In-Reply-To: References: MIME-Version: 1.0 Authentication-Results: jpoiret.xyz; auth=pass smtp.auth=jpoiret@jpoiret.xyz smtp.mailfrom=dev@jpoiret.xyz X-Spamd-Bar: / 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: Josselin Poiret X-ACL-Warn: , Josselin Poiret via Guix-patches X-Patchwork-Original-From: Josselin Poiret via Guix-patches via From: Josselin Poiret 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/firmware.scm (make-opensbi-package): Do it. --- gnu/packages/firmware.scm | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/gnu/packages/firmware.scm b/gnu/packages/firmware.scm index 956ece5d6d..9b9443effe 100644 --- a/gnu/packages/firmware.scm +++ b/gnu/packages/firmware.scm @@ -486,7 +486,7 @@ (define* (make-opensbi-package platform name #:optional (arch "riscv64")) (native-inputs `(,@(if (and (not (string-prefix? "riscv64" (%current-system))) (string-prefix? "riscv64" arch)) - `(("cross-gcc" ,(cross-gcc "riscv64-linux-gnu" #:xgcc gcc-7)) + `(("cross-gcc" ,(cross-gcc "riscv64-linux-gnu")) ("cross-binutils" ,(cross-binutils "riscv64-linux-gnu"))) '()))) (arguments @@ -499,6 +499,8 @@ (define* (make-opensbi-package platform name #:optional (arch "riscv64")) `("CC=gcc")) "FW_PAYLOAD=n" "V=1") + ;; fence.i instructions are used, so we need a non-default micro arch + #:configure-flags (list "-march=rv64g") #:phases (modify-phases %standard-phases (delete 'configure) From patchwork Mon Mar 20 22:26:37 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Josselin Poiret X-Patchwork-Id: 48475 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 A3EF016F2D; Mon, 20 Mar 2023 22:27:18 +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=0.2 required=5.0 tests=DKIM_INVALID,DKIM_SIGNED, FROM_SUSPICIOUS_NTLD,MAILING_LIST_MULTI,PDS_OTHER_BAD_TLD, RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,URIBL_BLOCKED autolearn=no 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 E7BC216F13 for ; Mon, 20 Mar 2023 22:27:17 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1peNy4-0000Xz-W2; Mon, 20 Mar 2023 18:27:05 -0400 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 1peNy2-0000Xa-FR for guix-patches@gnu.org; Mon, 20 Mar 2023 18:27:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1peNy2-0000Wd-4o for guix-patches@gnu.org; Mon, 20 Mar 2023 18:27:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1peNy2-0007rE-0p for guix-patches@gnu.org; Mon, 20 Mar 2023 18:27:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#62309] [PATCH core-updates 2/2] u-boot: Fix build under Python 3.10. Resent-From: Josselin Poiret Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 20 Mar 2023 22:27:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 62309 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Josselin Poiret , 62309@debbugs.gnu.org Received: via spool by 62309-submit@debbugs.gnu.org id=B62309.167935120830177 (code B ref 62309); Mon, 20 Mar 2023 22:27:01 +0000 Received: (at 62309) by debbugs.gnu.org; 20 Mar 2023 22:26:48 +0000 Received: from localhost ([127.0.0.1]:57089 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1peNxn-0007qf-Pe for submit@debbugs.gnu.org; Mon, 20 Mar 2023 18:26:48 -0400 Received: from jpoiret.xyz ([206.189.101.64]:49088) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1peNxi-0007qK-UM for 62309@debbugs.gnu.org; Mon, 20 Mar 2023 18:26:46 -0400 Received: from authenticated-user (jpoiret.xyz [206.189.101.64]) by jpoiret.xyz (Postfix) with ESMTPA id 1E325185317; Mon, 20 Mar 2023 22:26:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=jpoiret.xyz; s=dkim; t=1679351201; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=4L9q0bG/iJL8EYBgRaHWW3os0DvdWFOZNPR1mLop+Qg=; b=OXXQDTLYPnBwEkLmWwjChmTxqoz2tQ7Qz96hiYeXDISCICGMPTScwYvz0LSCkHpERuaxqk +ndxVjgo+egFxfsoMoj84rpSbgpe5+SQbrFZi1EB+3x4SALYsSmMdRsS1V+ObJvOGpbZOs an36esWD1+MQzdo6kKog3J872VziLQl1oXV54C85n/xU+VnHE9FRzXJC/xRVWm9WVf9yxU /0Pglt59Y9aRJ1SbNSZwzwbp6x29/W8gwDE9oipay9QenmAv8h4o7jnqFQdM0+8q8558XS zPy4oUGhO1LZRJ/Wm2dw9mBolBtAWC5d4Xfgn/GzUp9b1gPTIiU3NSCejhjc4w== Date: Mon, 20 Mar 2023 23:26:37 +0100 Message-Id: <63a067a83bcb04fae466b42c818abef4859dfffc.1679350685.git.dev@jpoiret.xyz> In-Reply-To: References: MIME-Version: 1.0 Authentication-Results: jpoiret.xyz; auth=pass smtp.auth=jpoiret@jpoiret.xyz smtp.mailfrom=dev@jpoiret.xyz X-Spamd-Bar: / 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: Josselin Poiret X-ACL-Warn: , Josselin Poiret via Guix-patches X-Patchwork-Original-From: Josselin Poiret via Guix-patches via From: Josselin Poiret 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/patches/u-boot-fix-build-python-3.10.patch: New file. * gnu/local.mk (dist_patch_DATA): Register it. * gnu/packages/bootloaders.scm (u-boot): Apply patch. --- gnu/local.mk | 1 + gnu/packages/bootloaders.scm | 3 ++ .../u-boot-fix-build-python-3.10.patch | 35 +++++++++++++++++++ 3 files changed, 39 insertions(+) create mode 100644 gnu/packages/patches/u-boot-fix-build-python-3.10.patch diff --git a/gnu/local.mk b/gnu/local.mk index 058b23c683..20bf2bea77 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1936,6 +1936,7 @@ dist_patch_DATA = \ %D%/packages/patches/tuxpaint-stamps-path.patch \ %D%/packages/patches/twinkle-bcg729.patch \ %D%/packages/patches/u-boot-allow-disabling-openssl.patch \ + %D%/packages/patches/u-boot-fix-build-python-3.10.patch \ %D%/packages/patches/u-boot-infodocs-target.patch \ %D%/packages/patches/u-boot-patman-guix-integration.patch \ %D%/packages/patches/u-boot-nintendo-nes-serial.patch \ diff --git a/gnu/packages/bootloaders.scm b/gnu/packages/bootloaders.scm index ac269807be..457f3b3994 100644 --- a/gnu/packages/bootloaders.scm +++ b/gnu/packages/bootloaders.scm @@ -655,6 +655,9 @@ (define u-boot %u-boot-allow-disabling-openssl-patch %u-boot-sifive-prevent-relocating-initrd-fdt %u-boot-rk3399-enable-emmc-phy-patch + ;; FIXME The following patch is backported from 2023.01, + ;; remove when updating. + (search-patch "u-boot-fix-build-python-3.10.patch") (search-patch "u-boot-infodocs-target.patch") (search-patch "u-boot-patman-guix-integration.patch"))) (method url-fetch) diff --git a/gnu/packages/patches/u-boot-fix-build-python-3.10.patch b/gnu/packages/patches/u-boot-fix-build-python-3.10.patch new file mode 100644 index 0000000000..27c03f92f4 --- /dev/null +++ b/gnu/packages/patches/u-boot-fix-build-python-3.10.patch @@ -0,0 +1,35 @@ +From 7d01bb1c5a1daef0187c9ea276bde19a8d0e7fde Mon Sep 17 00:00:00 2001 +From: Michal Suchanek +Date: Thu, 13 Oct 2022 22:43:41 +0200 +Subject: [PATCH] libfdt: Fix build with python 3.10 + +Python 3.10 requires defining PY_SSIZE_T_CLEAN. This will be fixed in +swig 4.10 but it is not clear when it will be released. There was a +warning since python 3.8. + +Link: https://github.com/swig/swig/pull/2277 + +Signed-off-by: Michal Suchanek +Reviewed-by: Simon Glass +--- + scripts/dtc/pylibfdt/libfdt.i_shipped | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/scripts/dtc/pylibfdt/libfdt.i_shipped b/scripts/dtc/pylibfdt/libfdt.i_shipped +index 27c29ea260..56cc5d48f4 100644 +--- a/scripts/dtc/pylibfdt/libfdt.i_shipped ++++ b/scripts/dtc/pylibfdt/libfdt.i_shipped +@@ -7,6 +7,10 @@ + + %module libfdt + ++%begin %{ ++#define PY_SSIZE_T_CLEAN ++%} ++ + %include + + %{ +-- +GitLab +