public inbox for gcc-patches@gcc.gnu.org
 help / color / mirror / Atom feed
From: Eric Botcazou <ebotcazou@adacore.com>
To: gcc-patches@gcc.gnu.org
Cc: libstdc++@gcc.gnu.org
Subject: [patch] Remove superfluous /dev/null on grep line
Date: Wed, 06 Apr 2016 07:39:00 -0000	[thread overview]
Message-ID: <3554293.nIQqjdAT3l@polaris> (raw)

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

Hi,

we recently ran into build failures on Windows systems using a somewhat old 
grep, coming from a syntax error in the libstdc++-symbols.ver version file:

# Symbol versioning for shared libraries.
if ENABLE_SYMVERS
libstdc++-symbols.ver:  ${glibcxx_srcdir}/$(SYMVER_FILE) \
		$(port_specific_symbol_files)
	cp ${glibcxx_srcdir}/$(SYMVER_FILE) $@.tmp
	chmod +w $@.tmp
	if test "x$(port_specific_symbol_files)" != x; then \
	  if grep '^# Appended to version file.' \
	       $(port_specific_symbol_files) /dev/null > /dev/null 2>&1; then 
\
	    cat $(port_specific_symbol_files) >> $@.tmp; \
	  else \
	    sed -n '1,/DO NOT DELETE/p' $@.tmp > tmp.top; \
	    sed -n '/DO NOT DELETE/,$$p' $@.tmp > tmp.bottom; \
	    cat tmp.top $(port_specific_symbol_files) tmp.bottom > $@.tmp; \
	    rm tmp.top tmp.bottom; \
	  fi; \
	fi

Note the double /dev/null on the grep command line.  The first one causes the 
grep to fail when the command is invoked on these systems.  That's old code, 
but it is now invoked for config/abi/pre/float128.ver on the mainline and 5 
branch and this breaks the build on these systems (4.9 builds fine).

This first /dev/null doesn't serve any useful purpose and seems to be a typo, 
so the attached patch gets rid of it.

Tested on x86/Windows and x86-64/Linux, OK for mainline and 5 branch?


2016-04-06  Eric Botcazou <ebotcazou@adacore.com>

libstdc++-v3/
	* src/Makefile.am (libstdc++-symbols.ver): Remove useless /dev/null.
	* src/Makefile.in: Regenerate.

-- 
Eric Botcazou

[-- Attachment #2: p.diff --]
[-- Type: text/x-patch, Size: 600 bytes --]

Index: src/Makefile.am
===================================================================
--- src/Makefile.am	(revision 234695)
+++ src/Makefile.am	(working copy)
@@ -228,7 +228,7 @@ libstdc++-symbols.ver:  ${glibcxx_srcdir
 	chmod +w $@.tmp
 	if test "x$(port_specific_symbol_files)" != x; then \
 	  if grep '^# Appended to version file.' \
-	       $(port_specific_symbol_files) /dev/null > /dev/null 2>&1; then \
+	       $(port_specific_symbol_files) > /dev/null 2>&1; then \
 	    cat $(port_specific_symbol_files) >> $@.tmp; \
 	  else \
 	    sed -n '1,/DO NOT DELETE/p' $@.tmp > tmp.top; \

             reply	other threads:[~2016-04-06  7:39 UTC|newest]

Thread overview: 6+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-04-06  7:39 Eric Botcazou [this message]
2016-04-06  8:50 ` Jonathan Wakely
2016-04-06  9:01   ` Jakub Jelinek
2016-04-06  9:12     ` Jonathan Wakely
2016-04-06  9:17       ` Jakub Jelinek
2016-04-06 15:08       ` Eric Botcazou

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=3554293.nIQqjdAT3l@polaris \
    --to=ebotcazou@adacore.com \
    --cc=gcc-patches@gcc.gnu.org \
    --cc=libstdc++@gcc.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.
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).