Date: Thu, 27 Aug 2015 14:00:20 +0000 (UTC) From: Alexander Kabaev <kan@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r287205 - head/contrib/ncurses/ncurses/base Message-ID: <201508271400.t7RE0KNC071346@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: kan Date: Thu Aug 27 14:00:20 2015 New Revision: 287205 URL: https://svnweb.freebsd.org/changeset/base/287205 Log: Make ncurses build with GCC 5.0 and up Merge the end result of two upstream changes: Original fix from 20141206: + modify MKlib_gen.sh to work around change in development version of gcc introduced here: https://gcc.gnu.org/ml/gcc-patches/2014-06/msg02185.html https://gcc.gnu.org/ml/gcc-patches/2014-07/msg00236.html (reports by Marcus Shawcroft, Maohui Lei). Later fixed in different manner in 20150725: + use alternate workaround for gcc 5.x feature (adapted from patch by Mikhail Peselnik). Modified: head/contrib/ncurses/ncurses/base/MKlib_gen.sh Modified: head/contrib/ncurses/ncurses/base/MKlib_gen.sh ============================================================================== --- head/contrib/ncurses/ncurses/base/MKlib_gen.sh Thu Aug 27 14:00:16 2015 (r287204) +++ head/contrib/ncurses/ncurses/base/MKlib_gen.sh Thu Aug 27 14:00:20 2015 (r287205) @@ -2,10 +2,10 @@ # # MKlib_gen.sh -- generate sources from curses.h macro definitions # -# ($Id: MKlib_gen.sh,v 1.46 2011/06/04 19:14:08 tom Exp $) +# ($Id: MKlib_gen.sh,v 1.50 2015/08/07 00:48:24 tom Exp $) # ############################################################################## -# Copyright (c) 1998-2010,2011 Free Software Foundation, Inc. # +# Copyright (c) 1998-2014,2015 Free Software Foundation, Inc. # # # # Permission is hereby granted, free of charge, to any person obtaining a # # copy of this software and associated documentation files (the "Software"), # @@ -66,6 +66,23 @@ preprocessor="$1 -DNCURSES_INTERNALS -I. AWK="$2" USE="$3" +# A patch discussed here: +# https://gcc.gnu.org/ml/gcc-patches/2014-06/msg02185.html +# introduces spurious #line markers into the preprocessor output. The result +# appears in gcc 5.0 and (with modification) in 5.1, making it necessary to +# 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` +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 + if test $ONE -ge 5 ; then + echo ".. adding -P option to work around $PRG $ALL" >&2 + preprocessor="$preprocessor -P" + fi +fi + PID=$$ ED1=sed1_${PID}.sed ED2=sed2_${PID}.sed
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201508271400.t7RE0KNC071346>