From mboxrd@z Thu Jan 1 00:00:00 1970 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 Subject: [bug#35568] [PATCH v2 3/3] gnu: gcc@9: Fix limits.h include for cross builds. References: In-Reply-To: Resent-Message-ID: Date: Sun, 05 May 2019 14:35:13 +0000 From: Carl Dong Message-ID: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: Carl Dong Errors-To: guix-patches-bounces+kyle=kyleam.com@gnu.org Sender: "Guix-patches" To: "35568@debbugs.gnu.org" <35568@debbugs.gnu.org> 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.patc= h 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 =3D=09=09=09=09=09=09\ %D%/packages/patches/gcc-6-source-date-epoch-2.patch=09=09\ %D%/packages/patches/gcc-8-cross-environment-variables.patch=09\ %D%/packages/patches/gcc-8-strmov-store-file-names.patch=09\ + %D%/packages/patches/gcc-9-asan-fix-limits-include.patch=09\ %D%/packages/patches/gcc-9-strmov-store-file-names.patch=09\ %D%/packages/patches/gd-CVE-2018-5711.patch=09=09=09\ %D%/packages/patches/gd-CVE-2018-1000222.patch=09=09\ 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 la= nguages."))) (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_linu= x.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 -- 2.21.0