Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 21 Sep 2019 18:14:05 +0000 (UTC)
From:      Mark Linimon <linimon@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r512529 - head/astro/routino
Message-ID:  <201909211814.x8LIE5nc054615@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: linimon
Date: Sat Sep 21 18:14:05 2019
New Revision: 512529
URL: https://svnweb.freebsd.org/changeset/ports/512529

Log:
  Fix build on GCC-based installations:
  
    xmlparse.c:1244: error: #pragma GCC diagnostic not allowed inside functions
  
  Approved by:	portmgr (tier-2 blanket)

Modified:
  head/astro/routino/Makefile

Modified: head/astro/routino/Makefile
==============================================================================
--- head/astro/routino/Makefile	Sat Sep 21 18:13:31 2019	(r512528)
+++ head/astro/routino/Makefile	Sat Sep 21 18:14:05 2019	(r512529)
@@ -12,14 +12,19 @@ COMMENT=	Router for OpenStreetMap Data
 LICENSE=	AGPLv3
 
 OPTIONS_DEFINE=	DOCS
-USES=		gmake perl5 tar:tgz
+USES=		compiler gmake perl5 tar:tgz
 USE_LDCONFIG=	yes
 
+.include <bsd.port.pre.mk>
+
 post-patch:
 	${REINPLACE_CMD} 's|doc/routino|share/doc/routino|' \
 		${WRKSRC}/Makefile.conf
 	${REINPLACE_CMD} 's|gcc|${CC}|' \
 		${WRKSRC}/Makefile.conf
+.if ${CHOSEN_COMPILER_TYPE} == gcc && ${COMPILER_VERSION} <= 42
+	${REINPLACE_CMD} -e '/pragma/d' ${WRKSRC}/src/xmlparse.c
+.endif
 
 post-install:
 	${MKDIR} ${STAGEDIR}${WWWDIR}
@@ -35,4 +40,4 @@ post-install:
 	${LN} -sf lib${f:R:R} ${STAGEDIR}${PREFIX}/lib/lib${f:R:R:R}
 .endfor
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201909211814.x8LIE5nc054615>