Date: Fri, 21 Feb 2020 04:31:30 +0000 (UTC) From: Kyle Evans <kevans@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-11@freebsd.org Subject: svn commit: r358203 - in stable: 11/contrib/ncurses/ncurses/base 12/contrib/ncurses/ncurses/base Message-ID: <202002210431.01L4VULq067568@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: kevans Date: Fri Feb 21 04:31:30 2020 New Revision: 358203 URL: https://svnweb.freebsd.org/changeset/base/358203 Log: MFC r357903: ncurses: correct check for gcc >= 5.0 The hack in question is intended to workaround seemingly bogus #line markers in cpp output. As far as I can tell, llvm cpp doesn't do this by default, so there's no reason to add -P. In our /bin/sh, the main incantation should be placed in a sub-shell in order to properly pipe the output to fgrep. The main motivation for this change is admittedly to stop emitting the noise about clang not being gcc in make -s buildworld Modified: stable/11/contrib/ncurses/ncurses/base/MKlib_gen.sh Directory Properties: stable/11/ (props changed) Changes in other areas also in this revision: Modified: stable/12/contrib/ncurses/ncurses/base/MKlib_gen.sh Directory Properties: stable/12/ (props changed) Modified: stable/11/contrib/ncurses/ncurses/base/MKlib_gen.sh ============================================================================== --- stable/11/contrib/ncurses/ncurses/base/MKlib_gen.sh Fri Feb 21 04:30:21 2020 (r358202) +++ stable/11/contrib/ncurses/ncurses/base/MKlib_gen.sh Fri Feb 21 04:31:30 2020 (r358203) @@ -73,7 +73,7 @@ USE="$3" # determine if we are using gcc, and if so, what version because the proposed # solution uses a nonstandard option. PRG=`echo "$1" | $AWK '{ sub(/^[[:space:]]*/,""); sub(/[[:space:]].*$/, ""); print; }' || exit 0` -FSF=`"$PRG" --version 2>/dev/null || exit 0 | fgrep "Free Software Foundation" | head -n 1` +FSF=`("$PRG" --version 2>/dev/null || exit 0) | fgrep "Free Software Foundation" | head -n 1` ALL=`"$PRG" -dumpversion 2>/dev/null || exit 0` ONE=`echo "$ALL" | sed -e 's/\..*$//'` if test -n "$FSF" && test -n "$ALL" && test -n "$ONE" ; then
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202002210431.01L4VULq067568>