From patchwork Sun May 5 14:35:13 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Carl Dong X-Patchwork-Id: 13906 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 304FF16F99; Sun, 5 May 2019 15:36:17 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,T_DKIM_INVALID, URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTP id A682216F26 for ; Sun, 5 May 2019 15:36:16 +0100 (BST) Received: from localhost ([127.0.0.1]:41971 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hNIFU-0005zB-Am for patchwork@mira.cbaines.net; Sun, 05 May 2019 10:36:16 -0400 Received: from eggs.gnu.org ([209.51.188.92]:36155) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hNIFN-0005up-0v for guix-patches@gnu.org; Sun, 05 May 2019 10:36:10 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hNIFI-0007dE-MR for guix-patches@gnu.org; Sun, 05 May 2019 10:36:06 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:41082) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hNIFG-0007c2-Jb for guix-patches@gnu.org; Sun, 05 May 2019 10:36:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1hNIFG-0006Cq-Gl for guix-patches@gnu.org; Sun, 05 May 2019 10:36:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#35568] [PATCH v2 3/3] gnu: gcc@9: Fix limits.h include for cross builds. References: In-Reply-To: Resent-From: Carl Dong Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 05 May 2019 14:36:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 35568 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: "35568@debbugs.gnu.org" <35568@debbugs.gnu.org> Received: via spool by 35568-submit@debbugs.gnu.org id=B35568.155706692823805 (code B ref 35568); Sun, 05 May 2019 14:36:02 +0000 Received: (at 35568) by debbugs.gnu.org; 5 May 2019 14:35:28 +0000 Received: from localhost ([127.0.0.1]:54626 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hNIEi-0006Bs-4A for submit@debbugs.gnu.org; Sun, 05 May 2019 10:35:28 -0400 Received: from mail-40132.protonmail.ch ([185.70.40.132]:11229) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hNIEg-0006Bd-Q2 for 35568@debbugs.gnu.org; Sun, 05 May 2019 10:35:27 -0400 Date: Sun, 05 May 2019 14:35:13 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=carldong.me; s=protonmail; t=1557066920; bh=rzW8kpms9lkqgMf+W0BUJUT1jRea3Tn/CdMz0w880t8=; h=Date:To:From:Reply-To:Subject:Feedback-ID:From; b=W6O3m1e6XwocmuyNwwX3Pk7540Ml5qbTuoWXuVoY4Ho7K6GTgjj3su0+BHaIrUdT1 8qculGaPKbICNSjtp0NDj1Tqefge3LuCfIXOkUEc/klQ6aBKRKDNV0QS05qe4DzX0Z FlkZgha6SOsMBYgjAmsLbI/FVl3+i7ufDj2CmlZk= From: Carl Dong Message-ID: Feedback-ID: a8j8tDUaJ4AYuDVBywMTwsJebN4w8TVXadJLsJb8td3t3dZi9RdXFlPaQvoFKnI9KgXySsPXcRkajVyY0cGTcA==:Ext:ProtonMail MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.51.188.43 X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: Carl Dong Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches This allows us to supply gcc-9 as an optional argument to cross-gcc, successfully constructing gcc-9-based cross-compilers. * gnu/packages/gcc.scm (gcc-9)[source](patches): Add "gcc-9-asan-fix-limits-include.patch". * gnu/packages/patches/gcc-9-asan-fix-limits-include.patch: New file. * gnu/local.mk (dist_patch_DATA): Add the patch. --- gnu/local.mk | 1 + gnu/packages/gcc.scm | 1 + .../patches/gcc-9-asan-fix-limits-include.patch | 13 +++++++++++++ 3 files changed, 15 insertions(+) create mode 100644 gnu/packages/patches/gcc-9-asan-fix-limits-include.patch -- 2.21.0 diff --git a/gnu/local.mk b/gnu/local.mk index 847ebf677c..f2e10a4e24 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -815,6 +815,7 @@ dist_patch_DATA = \ %D%/packages/patches/gcc-6-source-date-epoch-2.patch \ %D%/packages/patches/gcc-8-cross-environment-variables.patch \ %D%/packages/patches/gcc-8-strmov-store-file-names.patch \ + %D%/packages/patches/gcc-9-asan-fix-limits-include.patch \ %D%/packages/patches/gcc-9-strmov-store-file-names.patch \ %D%/packages/patches/gd-CVE-2018-5711.patch \ %D%/packages/patches/gd-CVE-2018-1000222.patch \ diff --git a/gnu/packages/gcc.scm b/gnu/packages/gcc.scm index eefce2737b..50c58c1828 100644 --- a/gnu/packages/gcc.scm +++ b/gnu/packages/gcc.scm @@ -531,6 +531,7 @@ It also includes runtime support libraries for these languages."))) (base32 "1817nc2bqdc251k0lpc51cimna7v68xjrnvqzvc50q3ax4s6i9kr")) (patches (search-patches "gcc-9-strmov-store-file-names.patch" + "gcc-9-asan-fix-limits-include.patch" "gcc-5.0-libvtv-runpath.patch")))))) ;; Note: When changing the default gcc version, update diff --git a/gnu/packages/patches/gcc-9-asan-fix-limits-include.patch b/gnu/packages/patches/gcc-9-asan-fix-limits-include.patch new file mode 100644 index 0000000000..2f5ce7c697 --- /dev/null +++ b/gnu/packages/patches/gcc-9-asan-fix-limits-include.patch @@ -0,0 +1,13 @@ +diff --git a/libsanitizer/asan/asan_linux.cc b/libsanitizer/asan/asan_linux.cc +index d92d0596b7c..7926536a0c3 100644 +--- a/libsanitizer/asan/asan_linux.cc ++++ b/libsanitizer/asan/asan_linux.cc +@@ -30,7 +30,7 @@ + #include + #include + #include +-#include ++#include + #include + #include + #include