Date: Fri, 12 Jul 2019 01:57:57 +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: r506430 - in head: deskutils/growl-for-linux devel/tigcc multimedia/kissdx net-mgmt/chillispot Message-ID: <201907120157.x6C1vv2q013200@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: linimon Date: Fri Jul 12 01:57:57 2019 New Revision: 506430 URL: https://svnweb.freebsd.org/changeset/ports/506430 Log: Prepare for powerpc-on-clang by deleting hard-coded tests for libstdc++.so as a stand-in for "are we running on gcc". These 4 cases are outliers because they set compiler:nestedfct which currently hardwires gcc. So the real test for including -fnested-functions into CFLAGS is "are we on the ancient base gcc". Approved by: portmgr (tier-2 blanket) Modified: head/deskutils/growl-for-linux/Makefile head/devel/tigcc/Makefile head/multimedia/kissdx/Makefile head/net-mgmt/chillispot/Makefile Modified: head/deskutils/growl-for-linux/Makefile ============================================================================== --- head/deskutils/growl-for-linux/Makefile Fri Jul 12 00:40:35 2019 (r506429) +++ head/deskutils/growl-for-linux/Makefile Fri Jul 12 01:57:57 2019 (r506430) @@ -41,7 +41,9 @@ USE_GNOME= cairo gdkpixbuf2 gtk20 libxml2 USE_LDCONFIG= ${PREFIX}/lib/${PORTNAME}/display \ ${PREFIX}/lib/${PORTNAME}/subscribe -.if exists(/usr/lib/libstdc++.so) +.include <bsd.port.pre.mk> + +.if ${CHOSEN_COMPILER_TYPE} == gcc && ${COMPILER_VERSION} <= 42 CFLAGS+= -fnested-functions .endif @@ -52,4 +54,4 @@ post-patch: post-install: ${RM} ${STAGEDIR}${PREFIX}/lib/libgolplug.a -.include <bsd.port.mk> +.include <bsd.port.post.mk> Modified: head/devel/tigcc/Makefile ============================================================================== --- head/devel/tigcc/Makefile Fri Jul 12 00:40:35 2019 (r506429) +++ head/devel/tigcc/Makefile Fri Jul 12 01:57:57 2019 (r506430) @@ -144,7 +144,7 @@ do-install-EXAMPLES-on: .include <bsd.port.pre.mk> -.if exists(/usr/lib/libstdc++.so) +.if ${CHOSEN_COMPILER_TYPE} == gcc && ${COMPILER_VERSION} <= 42 CFLAGS+= -fnested-functions .endif Modified: head/multimedia/kissdx/Makefile ============================================================================== --- head/multimedia/kissdx/Makefile Fri Jul 12 00:40:35 2019 (r506429) +++ head/multimedia/kissdx/Makefile Fri Jul 12 01:57:57 2019 (r506430) @@ -43,7 +43,9 @@ post-patch: s|^\.o :|${PORTNAME}: $$(OBJS)| ; \ /^all:/s| $$(OBJS)||' ${WRKSRC}/Makefile -.if exists(/usr/lib/libstdc++.so) +.include <bsd.port.pre.mk> + +.if ${CHOSEN_COMPILER_TYPE} == gcc && ${COMPILER_VERSION} <= 42 CFLAGS+= -fnested-functions .endif @@ -60,4 +62,4 @@ do-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${WRKSRC}/README ${STAGEDIR}${DOCSDIR} -.include <bsd.port.mk> +.include <bsd.port.post.mk> Modified: head/net-mgmt/chillispot/Makefile ============================================================================== --- head/net-mgmt/chillispot/Makefile Fri Jul 12 00:40:35 2019 (r506429) +++ head/net-mgmt/chillispot/Makefile Fri Jul 12 01:57:57 2019 (r506430) @@ -32,7 +32,9 @@ APACHE_USE= apache_run=22+ FREERADIUS_RUN_DEPENDS= radiusd:net/freeradius OPENRADIUS_RUN_DEPENDS= radiusd:net/openradius -.if exists(/usr/lib/libstdc++.so) +.include <bsd.port.pre.mk> + +.if ${CHOSEN_COMPILER_TYPE} == gcc && ${COMPILER_VERSION} <= 42 CFLAGS+= -fnested-functions .endif @@ -46,4 +48,4 @@ post-install: ${INSTALL_DATA} ${FILESDIR}/pf.conf.sample ${STAGEDIR}${DATADIR} ${INSTALL_DATA} ${FILESDIR}/ipfw-config.sample ${STAGEDIR}${DATADIR} -.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?201907120157.x6C1vv2q013200>