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)
This commit is contained in:
Mark Linimon 2019-07-12 01:57:57 +00:00
parent c6af2b4296
commit 92e22122e8
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=506430
4 changed files with 13 additions and 7 deletions

View File

@ -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>

View File

@ -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

View File

@ -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>

View File

@ -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>