summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorsevan <sevan@pkgsrc.org>2015-06-02 01:03:57 +0000
committersevan <sevan@pkgsrc.org>2015-06-02 01:03:57 +0000
commita18e730ee7eab37061605185383bfaf6289644e0 (patch)
treeca3e6e83b45fcd7e4540b0525fb585843ccdeb52
parent4e86db3321e1114c757881a60dcab99a3f71fd37 (diff)
downloadpkgsrc-a18e730ee7eab37061605185383bfaf6289644e0.tar.gz
When GCC version is 5.x, pass the -P flag to cpp, preventing the generation of line markers
in the output from cpp. Resolves build issue on DragonFlyBSD development snapshots which include GCC 5.1.1 GCC bug 60723 https://gcc.gnu.org/bugzilla/show_bug.cgi?id=60723
-rw-r--r--devel/ncurses/Makefile.common11
1 files changed, 9 insertions, 2 deletions
diff --git a/devel/ncurses/Makefile.common b/devel/ncurses/Makefile.common
index 321d80def14..c9d78d8501e 100644
--- a/devel/ncurses/Makefile.common
+++ b/devel/ncurses/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.26 2014/12/15 11:46:34 jperkin Exp $
+# $NetBSD: Makefile.common,v 1.27 2015/06/02 01:03:57 sevan Exp $
#
# used by devel/ncurses/Makefile
# used by devel/ncursesw/Makefile
@@ -61,9 +61,10 @@ CONFIGURE_ARGS+= --without-manpage-tbl
. endif
.endif
+.include "../../mk/compiler.mk"
+
.if ${OPSYS} == "SunOS"
USE_LANGUAGES+= c99
-.include "../../mk/compiler.mk"
. if !empty(CC_VERSION:Mgcc-4.*)
#This may yet need to be adapted for systems prior to Solaris 10
BUILDLINK_TRANSFORM+= opt:-D_XOPEN_SOURCE=500:-D_POSIX_C_SOURCE=200112L
@@ -75,6 +76,12 @@ TERMINFODIR= share/lib/terminfo
TERMINFODIR= share/terminfo
.endif
+.if !empty(CC_VERSION:Mgcc-5.*)
+# Inhibit generation of line markers in the output from the preprocessor
+# https://gcc.gnu.org/bugzilla/show_bug.cgi?id=60723
+CPPFLAGS+= -P
+.endif
+
# This prevents tic from writing into ~/.terminfo
INSTALLATION_DIRS+= ${TERMINFODIR}