From patchwork Fri Apr 12 10:53:01 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jean-Pierre De Jesus Diaz X-Patchwork-Id: 62940 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 6681327BBE9; Fri, 12 Apr 2024 11:54:19 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-1.7 required=5.0 tests=BAYES_00,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 656C127BBE2 for ; Fri, 12 Apr 2024 11:54:18 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rvEXk-0002ff-0W; Fri, 12 Apr 2024 06:54: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 1rvEXb-0002dy-Tt for guix-patches@gnu.org; Fri, 12 Apr 2024 06:53:57 -0400 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 1rvEXa-0002C8-Uo; Fri, 12 Apr 2024 06:53:55 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rvEXk-0000nN-Mo; Fri, 12 Apr 2024 06:54:04 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#70351] [PATCH 2/3] gnu: cross-gcc: Add patch for GCC 13. Resent-From: Jean-Pierre De Jesus DIAZ Original-Sender: "Debbugs-submit" Resent-CC: ludo@gnu.org, guix-patches@gnu.org Resent-Date: Fri, 12 Apr 2024 10:54:04 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 70351 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 70351@debbugs.gnu.org Cc: Jean-Pierre De Jesus DIAZ , Ludovic =?utf-8?q?Court?= =?utf-8?q?=C3=A8s?= X-Debbugs-Original-Xcc: Ludovic =?utf-8?q?Court=C3=A8s?= Received: via spool by 70351-submit@debbugs.gnu.org id=B70351.17129192112725 (code B ref 70351); Fri, 12 Apr 2024 10:54:04 +0000 Received: (at 70351) by debbugs.gnu.org; 12 Apr 2024 10:53:31 +0000 Received: from localhost ([127.0.0.1]:57966 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rvEX9-0000h9-2R for submit@debbugs.gnu.org; Fri, 12 Apr 2024 06:53:30 -0400 Received: from mail-wm1-x329.google.com ([2a00:1450:4864:20::329]:48448) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rvEX4-0000fJ-BJ for 70351@debbugs.gnu.org; Fri, 12 Apr 2024 06:53:24 -0400 Received: by mail-wm1-x329.google.com with SMTP id 5b1f17b1804b1-417c339d261so5797655e9.1 for <70351@debbugs.gnu.org>; Fri, 12 Apr 2024 03:53:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=foundation.xyz; s=google; t=1712919186; x=1713523986; darn=debbugs.gnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=yZIBsXfM9O7W5Mq+hl0E215Df2ULy6kWa96Fmw1IhE8=; b=XoM0rPb+G+bpmtWzuvF+pZJ0MQw+hCzM5eMKzDzyYBhsM9P+uzRcqvOwT/z1EnGxWS MH7dpF7u7ackwa9exvmSD28aUsa6cLMr2QC8XvfB5sKqrCcLi/BOf6qXGOy38Jtz+4// KjPaWi2FnEzUVi+vGa4Q502o2F5FWVVBpe/L6wROQN4EgTMGzfr/fpUTC9IFkQZO9Lmo CsK8ewcmUwCdJCDhQuBGZ2Rcv0NH+dw8+1vlw24+vO58CgsrMrY86WuIE2ziUq7lO+b9 0pRGH3q+5zyHkQacV4xF81v8OwM/KHEebDa4AbClJMNO0+65H4mm9oD44cSj9IsBcWGf /0Ng== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1712919186; x=1713523986; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=yZIBsXfM9O7W5Mq+hl0E215Df2ULy6kWa96Fmw1IhE8=; b=pw7lwA9Y9J8e55LInSbJ3u+8/vmur293g46e7NVkZaf+CMN96xveB/GNCl1B30SC8x v/VHjfgpsSJAqguZKKzWcHG8Z91700AcBHfo5k7DPiKuU+GQpJbNPPg2kNUcrKcjiHhx hzFbG+3AzIKiq6t//QlWtMhx/g8xHO8Rno6HIxktR+jGS4/EkfCkD9OFyqkYoeteyQaG flOl1OS7PmhcRK50FXvm7Veg0Z59pV7bGp4yHixfOI+7+j3vK1nkj+yHxRISndvpS7wd Qygvgjefx4r/m/Xy9zajCHBVYzFkI2ykIVD6/S7Cr+TkotfAPI6m61SrXHpWHvKemnC1 Mxjg== X-Gm-Message-State: AOJu0YwfBRYLZSkTv+tqcxlbY66PelIThYfxFi3aFeg6vC8LEZDispjw IeoxvO5c3geuGxiarHpLUjJsTNBeovbUk8eEQCctfxB1PAN3cc3RT2KEwsKMo31olcA/tk9v7og T X-Google-Smtp-Source: AGHT+IHW5j7o7NIO9cDM9zwq5TC3s+0sgzsni4O01RbkWfsLwi+2eM/l2B39qpb1iWjxvtOSZeIBEA== X-Received: by 2002:a05:600c:3493:b0:415:613b:6dc4 with SMTP id a19-20020a05600c349300b00415613b6dc4mr1367562wmq.28.1712919186416; Fri, 12 Apr 2024 03:53:06 -0700 (PDT) Received: from jeandudey.home ([89.131.29.87]) by smtp.gmail.com with ESMTPSA id u7-20020adfeb47000000b0033ec9ddc638sm3987225wrn.31.2024.04.12.03.53.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 12 Apr 2024 03:53:06 -0700 (PDT) From: Jean-Pierre De Jesus DIAZ Date: Fri, 12 Apr 2024 12:53:01 +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 * gnu/local.mk (dist_patch_DATA): Add gcc-13-cross-system-header-dir.patch. * gnu/packages/cross-base.scm (cross-gcc) : Add patch for GCC 13. * gnu/packages/patches/gcc-13-cross-system-header-dir.patch: New patch. Change-Id: Ib4771ff78222fb7b7df58891d25938d338bd5df8 --- gnu/local.mk | 1 + gnu/packages/cross-base.scm | 4 +++ .../gcc-13-cross-system-header-dir.patch | 32 +++++++++++++++++++ 3 files changed, 37 insertions(+) create mode 100644 gnu/packages/patches/gcc-13-cross-system-header-dir.patch diff --git a/gnu/local.mk b/gnu/local.mk index 1169604891..bdaa57a40e 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1297,6 +1297,7 @@ dist_patch_DATA = \ %D%/packages/patches/gcc-12-cross-environment-variables.patch \ %D%/packages/patches/gcc-10-tree-sra-union-handling.patch \ %D%/packages/patches/gcc-11-libstdc++-powerpc.patch \ + %D%/packages/patches/gcc-13-cross-system-header-dir.patch \ %D%/packages/patches/gcolor3-update-libportal-usage.patch \ %D%/packages/patches/gd-fix-tests-on-i686.patch \ %D%/packages/patches/gd-brect-bounds.patch \ diff --git a/gnu/packages/cross-base.scm b/gnu/packages/cross-base.scm index e62402a09e..36307698a8 100644 --- a/gnu/packages/cross-base.scm +++ b/gnu/packages/cross-base.scm @@ -321,6 +321,10 @@ (define* (cross-gcc target (append (origin-patches (package-source xgcc)) (append (cond + ((version>=? (package-version xgcc) "13.0") + (search-patches "gcc-13-cross-system-header-dir.patch" + "gcc-12-cross-environment-variables.patch" + "gcc-cross-gxx-include-dir.patch")) ((version>=? (package-version xgcc) "12.0") (search-patches "gcc-12-cross-environment-variables.patch" "gcc-cross-gxx-include-dir.patch")) diff --git a/gnu/packages/patches/gcc-13-cross-system-header-dir.patch b/gnu/packages/patches/gcc-13-cross-system-header-dir.patch new file mode 100644 index 0000000000..75f80ea9d2 --- /dev/null +++ b/gnu/packages/patches/gcc-13-cross-system-header-dir.patch @@ -0,0 +1,32 @@ +From 8b001f38cc713190642194b55e02a56346f51494 Mon Sep 17 00:00:00 2001 +From: Jean-Pierre De Jesus DIAZ +Date: Fri, 12 Apr 2024 12:18:24 +0200 +Subject: [PATCH] Fix CROSS_SYSTEM_HEADER_DIR value for Guix. + +* gcc/Makefile.in (CROSS_SYSTEM_HEADER_DIR): Always use default value. +--- + gcc/Makefile.in | 6 +----- + 1 file changed, 1 insertion(+), 5 deletions(-) + +diff --git a/gcc/Makefile.in b/gcc/Makefile.in +index 775aaa1b3c4..06d192fa9ed 100644 +--- a/gcc/Makefile.in ++++ b/gcc/Makefile.in +@@ -532,11 +532,7 @@ LINKER_PLUGIN_API_H = $(srcdir)/../include/plugin-api.h + # Default native SYSTEM_HEADER_DIR, to be overridden by targets. + NATIVE_SYSTEM_HEADER_DIR = @NATIVE_SYSTEM_HEADER_DIR@ + # Default cross SYSTEM_HEADER_DIR, to be overridden by targets. +-ifeq (@includedir@,$(prefix)/include) +- CROSS_SYSTEM_HEADER_DIR = @CROSS_SYSTEM_HEADER_DIR@ +-else +- CROSS_SYSTEM_HEADER_DIR = @includedir@ +-endif ++CROSS_SYSTEM_HEADER_DIR = @CROSS_SYSTEM_HEADER_DIR@ + + # autoconf sets SYSTEM_HEADER_DIR to one of the above. + # Purge it of unnecessary internal relative paths + +base-commit: c891d8dc23e1a46ad9f3e757d09e57b500d40044 +-- +2.41.0 +