Date: Sun, 26 Apr 2015 14:29:35 +0000 (UTC) From: John Marino <marino@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r384799 - head/shells/zsh/files Message-ID: <201504261429.t3QETZBW062608@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: marino Date: Sun Apr 26 14:29:35 2015 New Revision: 384799 URL: https://svnweb.freebsd.org/changeset/ports/384799 Log: shells/zsh: Fix runtime error when built by gcc-5 with upstream patch ZSH was misbuilt on gcc-5 due to an intentional change in behavior of gcc5's cpp. This patch to execute cpp with the -P switch comes from upstream. No revbump necessary as GCC5 isn't used by default on FreeBSD. Reported by: DragonFly ZSH users Approved by: maintainer (bapt, IRC) Added: head/shells/zsh/files/patch-Src_zsh.mdd (contents, props changed) Added: head/shells/zsh/files/patch-Src_zsh.mdd ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/shells/zsh/files/patch-Src_zsh.mdd Sun Apr 26 14:29:35 2015 (r384799) @@ -0,0 +1,22 @@ +--- Src/zsh.mdd.orig 2014-09-20 19:01:46 UTC ++++ Src/zsh.mdd +@@ -21,9 +21,18 @@ hdrdeps="zshcurses.h zshterm.h" + :<<\Make + @CONFIG_MK@ + ++# If we're using gcc as the preprocessor, get rid of the additional ++# lines generated by the preprocessor as they can confuse the script. ++# We don't need these in other cases either, but can't necessarily rely ++# on the option to remove them being the same. + signames.c: signames1.awk signames2.awk ../config.h @SIGNAL_H@ + $(AWK) -f $(sdir)/signames1.awk @SIGNAL_H@ >sigtmp.c +- $(CPP) sigtmp.c >sigtmp.out ++ case "$(CPP)" in \ ++ gcc*) \ ++ $(CPP) -P sigtmp.c >sigtmp.out;; \ ++ *) \ ++ $(CPP) sigtmp.c >sigtmp.out;; \ ++ esac + $(AWK) -f $(sdir)/signames2.awk sigtmp.out > $@ + rm -f sigtmp.c sigtmp.out +
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201504261429.t3QETZBW062608>