svn commit: r366655 - head/www/tokyopromenade

Adam Weinberger adamw at FreeBSD.org
Sat Aug 30 17:44:40 UTC 2014


Author: adamw
Date: Sat Aug 30 17:44:39 2014
New Revision: 366655
URL: http://svnweb.freebsd.org/changeset/ports/366655
QAT: https://qat.redports.org/buildarchive/r366655/

Log:
  Fix build with gcc. While here, stop clobbering CFLAGS.

Modified:
  head/www/tokyopromenade/Makefile

Modified: head/www/tokyopromenade/Makefile
==============================================================================
--- head/www/tokyopromenade/Makefile	Sat Aug 30 17:31:12 2014	(r366654)
+++ head/www/tokyopromenade/Makefile	Sat Aug 30 17:44:39 2014	(r366655)
@@ -19,8 +19,7 @@ OPTIONS_DEFINE=	LUA
 
 CONFIGURE_ARGS=	--enable-fcgi
 GNU_CONFIGURE=	yes
-USES=		gmake lua
-CFLAGS=		-Wno-incompatible-pointer-types-discards-qualifiers
+USES=		gmake lua compiler
 
 SUB_FILES=	pkg-message
 
@@ -28,7 +27,13 @@ LUA_CONFIGURE_ENABLE+=	lua
 LUA_LDFLAGS+=	-L${LUA_LIBDIR}
 LUA_CFLAGS+=	-I${LUA_INCDIR}
 
+.include <bsd.port.pre.mk>
+
+.if ${COMPILER_TYPE} == "clang"
+CFLAGS+=		-Wno-incompatible-pointer-types-discards-qualifiers
+.endif
+
 post-patch:
 	${REINPLACE_CMD} -e "s/llua/llua-${LUA_VER}/g" ${WRKSRC}/configure
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>


More information about the svn-ports-head mailing list