svn commit: r556476 - head/deskutils/xneur

Piotr Kubaj pkubaj at FreeBSD.org
Sat Nov 28 03:48:07 UTC 2020


Author: pkubaj
Date: Sat Nov 28 03:48:06 2020
New Revision: 556476
URL: https://svnweb.freebsd.org/changeset/ports/556476

Log:
  deskutils/xneur: only add -fnested-functions when using base GCC
  
  This fixes build on powerpc64 elfv2, probably also other architectures that recently switched to clang.

Modified:
  head/deskutils/xneur/Makefile

Modified: head/deskutils/xneur/Makefile
==============================================================================
--- head/deskutils/xneur/Makefile	Sat Nov 28 03:23:18 2020	(r556475)
+++ head/deskutils/xneur/Makefile	Sat Nov 28 03:48:06 2020	(r556476)
@@ -27,12 +27,6 @@ USE_XORG=	xtst
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--disable-static --libdir=${PREFIX}/lib/xneur --with-gtk=gtk2
-CFLAGS_mips=	-fnested-functions
-CFLAGS_mips64=	-fnested-functions
-CFLAGS_powerpc=	-fnested-functions
-CFLAGS_powerpcspe=	-fnested-functions
-CFLAGS_powerpc64=	-fnested-functions
-CFLAGS_sparc64=	-fnested-functions
 
 USE_LDCONFIG=	${PREFIX}/lib/xneur ${PREFIX}/lib/xneur/xneur
 INSTALLS_ICONS=	yes
@@ -61,8 +55,14 @@ SOUND_USES=	openal:al,alut
 SOUND_CONFIGURE_ON=	--with-sound=openal
 SOUND_CONFIGURE_OFF=	--with-sound=no
 
+.include <bsd.port.pre.mk>
+
+.if ${COMPILER_VERSION} == 42
+CFLAGS+=	-fnested-functions
+.endif
+
 post-patch:
 	@${REINPLACE_CMD} -e 's,-Werror,,g; s,-ldl,,g' ${WRKSRC}/configure
 	@${MV} ${WRKSRC}/etc/xneurrc ${WRKSRC}/etc/xneurrc.sample
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>


More information about the svn-ports-head mailing list