Merge updates from master

This commit is contained in:
Repository QA checks
2015-10-02 09:50:00 -04:00
4 changed files with 37 additions and 0 deletions
@@ -0,0 +1,16 @@
https://bugs.gentoo.org/547950
http://www.zsh.org/mla/workers/2015/msg02660.html
fix building w/gcc-5
--- a/Src/Modules/system.mdd
+++ b/Src/Modules/system.mdd
@@ -15,7 +15,7 @@
touch errtmp.out; \
else \
$(AWK) -f $(sdir)/errnames1.awk @ERRNO_H@ >errtmp.c; \
- $(CPP) errtmp.c >errtmp.out; \
+ $(CPP) -P errtmp.c >errtmp.out; \
fi
$(AWK) -f $(sdir)/errnames2.awk errtmp.out > $@
rm -f errtmp.c errtmp.out
+1
View File
@@ -53,6 +53,7 @@ src_prepare() {
soelim Doc/zshall.1.soelim > Doc/zshall.1
epatch "${FILESDIR}"/${PN}-init.d-gentoo-r1.diff
epatch "${FILESDIR}"/${PN}-5.1.0-gcc-5.patch #547950
cp "${FILESDIR}"/zprofile-1 "${T}"/zprofile || die
eprefixify "${T}"/zprofile || die
@@ -0,0 +1,16 @@
https://bugs.gentoo.org/546742
https://bugs.freedesktop.org/show_bug.cgi?id=90615
fix building w/gcc-5
--- man/Makefile.in
+++ man/Makefile.in
@@ -9,7 +9,7 @@
AM_CPPFLAGS = -I$(top_builddir) -I$(top_srcdir)
filenames.sed: filenames.sed.c
- $(AM_V_GEN)$(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ $(AM_V_GEN)$(CPP) -P $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
$(AM_CPPFLAGS) $(CPPFLAGS) $(srcdir)/filenames.sed.c | \
$(SED) -n -e '/s|__/ p' -e '/^\/__/ p' > $@
+4
View File
@@ -13,3 +13,7 @@ IUSE=""
RDEPEND=""
DEPEND="${RDEPEND}
x11-proto/xproto"
PATCHES=(
"${FILESDIR}"/${PN}-1.1.0-gcc-5.patch #546742
)