public inbox for libc-alpha@sourceware.org
 help / color / mirror / Atom feed
From: "H.J. Lu" <hjl.tools@gmail.com>
To: Andreas Schwab <schwab@suse.de>
Cc: GNU C Library <libc-alpha@sourceware.org>
Subject: Re: [PATCH] Make copy of <bits/std_abs.h> from GCC 7 [BZ #21573]
Date: Tue, 13 Jun 2017 11:54:00 -0000	[thread overview]
Message-ID: <CAMe9rOoXF7-40n-n7z8JdNeyc6CBPYk1AeK73KT_pmBvDdxAcQ@mail.gmail.com> (raw)
In-Reply-To: <mvmzidcjekn.fsf@suse.de>

[-- Attachment #1: Type: text/plain, Size: 542 bytes --]

On Tue, Jun 13, 2017 at 4:46 AM, Andreas Schwab <schwab@suse.de> wrote:
> On Jun 13 2017, "H.J. Lu" <hjl.tools@gmail.com> wrote:
>
>> The first / in "/$1:/{s/:\$//;p}" is a command:
>
> It's not a command, it's an address.
>
>> [hjl@gnu-tools-1 glibc-test]$ echo "#include <bits/std_abs.h>" |
>> /usr/gcc-7.1.1-x32/bin/c++ -M -MP -x c++ - | sed -n
>> ",/bits/std_abs.h:,{s/:\$//;p}"
>> sed: -e expression #1, char 1: unknown command: `,'
>>
>> What options do I have?
>
> \,$1,

Here is the updated patch.  OK for master?

Thanks.


-- 
H.J.

[-- Attachment #2: 0001-Make-copy-of-bits-std_abs.h-from-GCC-7-BZ-21573.patch --]
[-- Type: text/x-patch, Size: 2154 bytes --]

From 5b55c60163f4c99301c4c8fe2504a195620d828a Mon Sep 17 00:00:00 2001
From: "H.J. Lu" <hjl.tools@gmail.com>
Date: Tue, 13 Jun 2017 04:30:26 -0700
Subject: [PATCH] Make copy of <bits/std_abs.h> from GCC 7 [BZ #21573]

<bits/std_abs.h> from GCC 7 will include /usr/include/stdlib.h from
"#include_next" (instead of stdlib/stdlib.h in the glibc source
directory), and this turns up as a make dependency.  Also make a copy
of <bits/std_abs.h> to prevent it from including /usr/include/stdlib.h.

	[BZ #21573]
	* configure.ac (find_cxx_header): Use "\,$1," with sed.
	(CXX_CSTDLIB_HEADER): Also make a copy of <bits/std_abs.h>.
	* configure: Regenerated.
---
 configure    | 5 ++++-
 configure.ac | 5 ++++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/configure b/configure
index 422482f..524a8bc 100755
--- a/configure
+++ b/configure
@@ -5336,9 +5336,12 @@ fi
 # copy of those headers in Makerules.
 if test -n "$CXX"; then
   find_cxx_header () {
-    echo "#include <$1>" | $CXX -M -MP -x c++ - | sed -n "/$1:/{s/:\$//;p}"
+    echo "#include <$1>" | $CXX -M -MP -x c++ - | sed -n "\,$1:,{s/:\$//;p}"
   }
   CXX_CSTDLIB_HEADER="$(find_cxx_header cstdlib)"
+  # Also make a copy of <bits/std_abs.h> from GCC 7 to prevent it from
+  # including /usr/include/stdlib.h.
+  CXX_CSTDLIB_HEADER="$CXX_CSTDLIB_HEADER $(find_cxx_header bits/std_abs.h)"
   CXX_CMATH_HEADER="$(find_cxx_header cmath)"
 fi
 
diff --git a/configure.ac b/configure.ac
index 7f43042..213a436 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1187,9 +1187,12 @@ AC_SUBST(CXX_SYSINCLUDES)
 # copy of those headers in Makerules.
 if test -n "$CXX"; then
   find_cxx_header () {
-    echo "#include <$1>" | $CXX -M -MP -x c++ - | sed -n "/$1:/{s/:\$//;p}"
+    echo "#include <$1>" | $CXX -M -MP -x c++ - | sed -n "\,$1:,{s/:\$//;p}"
   }
   CXX_CSTDLIB_HEADER="$(find_cxx_header cstdlib)"
+  # Also make a copy of <bits/std_abs.h> from GCC 7 to prevent it from
+  # including /usr/include/stdlib.h.
+  CXX_CSTDLIB_HEADER="$CXX_CSTDLIB_HEADER $(find_cxx_header bits/std_abs.h)"
   CXX_CMATH_HEADER="$(find_cxx_header cmath)"
 fi
 AC_SUBST(CXX_CSTDLIB_HEADER)
-- 
2.9.4


  reply	other threads:[~2017-06-13 11:54 UTC|newest]

Thread overview: 11+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-06-13 11:38 H.J. Lu
2017-06-13 11:40 ` Andreas Schwab
2017-06-13 11:44   ` H.J. Lu
2017-06-13 11:46     ` Andreas Schwab
2017-06-13 11:54       ` H.J. Lu [this message]
2017-06-13 15:32         ` H.J. Lu
2017-06-13 18:13           ` H.J. Lu
2017-06-13 20:13         ` Florian Weimer
2017-06-13 20:21           ` H.J. Lu
2017-09-07 17:29             ` H.J. Lu
2017-09-11 15:53               ` H.J. Lu

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=CAMe9rOoXF7-40n-n7z8JdNeyc6CBPYk1AeK73KT_pmBvDdxAcQ@mail.gmail.com \
    --to=hjl.tools@gmail.com \
    --cc=libc-alpha@sourceware.org \
    --cc=schwab@suse.de \
    /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.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).