all messages for Guix-related lists mirrored at yhetil.org
 help / color / mirror / code / Atom feed
From: Carl Dong <contact@carldong.me>
To: "35568@debbugs.gnu.org" <35568@debbugs.gnu.org>
Subject: [bug#35568] [PATCH v2 3/3] gnu: gcc@9: Fix limits.h include for cross builds.
Date: Sun, 05 May 2019 14:35:13 +0000	[thread overview]
Message-ID: <T6ZujeZMe3A1behhIecT_5ROBQcUOHZE9oFCccRPLYYBFFT8qf02ft7PaMgHeC5KMwSTkkSE7P1RmRQ-zLKcCNFm-a40x0BuMZKNz6A_5Yc=@carldong.me> (raw)
In-Reply-To: <Sp0n8et-tEc1rgjshnbTToUmZAlfyr9WboL2HT50MEzzphMgrXMbdT5QRm6pU38hY9s9jmqiQ8E2bHUgoW7C85s4btH3N3ieTpCca9Y0i8s=@carldong.me>

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

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 <sys/types.h>
+ #include <dlfcn.h>
+ #include <fcntl.h>
+-#include <limits.h>
++#include <linux/limits.h>
+ #include <pthread.h>
+ #include <stdio.h>
+ #include <unistd.h>
--
2.21.0

  parent reply	other threads:[~2019-05-05 14:36 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-05-04 22:02 [bug#35568] [PATCH] gnu: gcc: Add 9.1.0 Carl Dong
2019-05-05 14:32 ` [bug#35568] [PATCH v2 1/3] " Carl Dong
2019-05-05 14:33 ` [bug#35568] [PATCH v2 2/3] gnu: cross-base: Apply gcc 8 patch to gcc >= 8 Carl Dong
2019-05-05 14:35 ` Carl Dong [this message]
2019-05-06  9:13 ` bug#35568: [PATCH] gnu: gcc: Add 9.1.0 Ludovic Courtès

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to='T6ZujeZMe3A1behhIecT_5ROBQcUOHZE9oFCccRPLYYBFFT8qf02ft7PaMgHeC5KMwSTkkSE7P1RmRQ-zLKcCNFm-a40x0BuMZKNz6A_5Yc=@carldong.me' \
    --to=contact@carldong.me \
    --cc=35568@debbugs.gnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this external index

	https://git.savannah.gnu.org/cgit/guix.git

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.