svn commit: r468494 - in branches/2018Q2: databases/mysql80-server devel/opendht sysutils/freefilesync

[Jan Beich]

Author: jbeich
Date: Fri Apr 27 19:49:20 2018
New Revision: 468494
URL: https://svnweb.freebsd.org/changeset/ports/468494

Log:
  MFH: r468493
  
  Adjust __cxa_thread_atexit conditional
  
  Approved by:	ports-secteam blanket

Modified:
  branches/2018Q2/databases/mysql80-server/Makefile
  branches/2018Q2/devel/opendht/Makefile
  branches/2018Q2/sysutils/freefilesync/Makefile
Directory Properties:
  branches/2018Q2/   (props changed)

Modified: branches/2018Q2/databases/mysql80-server/Makefile
==============================================================================
--- branches/2018Q2/databases/mysql80-server/Makefile	Fri Apr 27 19:46:06 2018	(r468493)
+++ branches/2018Q2/databases/mysql80-server/Makefile	Fri Apr 27 19:49:20 2018	(r468494)
@@ -81,7 +81,6 @@ PLIST_SUB=	MY_DBDIR=${MY_DBDIR} \
 # MySQL-Server part
 .if !defined(CLIENT_ONLY)
 USES+=		mysql:80
-IGNORE_FreeBSD_10=	"FreeBSD 10.0 doesn't have _cxa_thread_atexit() implemeneted in libc, it has been implemented since 11
 
 CONFLICTS_INSTALL=	mysql8[1-9]-server-* \
 			mysql[0-79][0-9]-server-* \
@@ -137,6 +136,12 @@ PERFSCHM_SUB_LIST+=		PERFSCHEMRC=""
 PERFSCHM_SUB_LIST_OFF+=		PERFSCHEMRC="--skip-performance-schema"
 FEDERATED_SUB_LIST+=		FEDER="--federated"
 FEDERATED_SUB_LIST_OFF+=	FEDER=""
+.endif
+
+.include <bsd.port.options.mk>
+
+.if !defined(CLIENT_ONLY) && ${OPSYS} == FreeBSD && ${OSVERSION} < 1003506
+BROKEN=		no __cxa_thread_atexit() support in FreeBSD libc < 10.4
 .endif
 
 .include <bsd.port.pre.mk>

Modified: branches/2018Q2/devel/opendht/Makefile
==============================================================================
--- branches/2018Q2/devel/opendht/Makefile	Fri Apr 27 19:46:06 2018	(r468493)
+++ branches/2018Q2/devel/opendht/Makefile	Fri Apr 27 19:49:20 2018	(r468494)
@@ -11,8 +11,6 @@ COMMENT=	Lightweight Distributed Hash Table implementa
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-BROKEN_FreeBSD_10=	Missing __cxa_thread_atexit
-
 LIB_DEPENDS=	libargon2.so:security/libargon2 \
 		libmsgpackc.so:devel/msgpack \
 		libnettle.so:security/nettle \
@@ -39,5 +37,11 @@ PROXY_SERVER_LIB_DEPENDS=	libjsoncpp.so:devel/jsoncpp 
 				librestbed.so:www/restbed
 
 PORTDOCS=	*
+
+.include <bsd.port.options.mk>
+
+.if ${OPSYS} == FreeBSD && ${OSVERSION} < 1003506
+BROKEN=		no __cxa_thread_atexit() support in FreeBSD libc < 10.4
+.endif
 
 .include <bsd.port.mk>

Modified: branches/2018Q2/sysutils/freefilesync/Makefile
==============================================================================
--- branches/2018Q2/sysutils/freefilesync/Makefile	Fri Apr 27 19:46:06 2018	(r468493)
+++ branches/2018Q2/sysutils/freefilesync/Makefile	Fri Apr 27 19:49:20 2018	(r468494)
@@ -14,8 +14,6 @@ COMMENT=	Backup software to synchronize files and fold
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKDIR}/License.txt
 
-IGNORE_FreeBSD_10=	FreeBSD 10.0 doesn't have _cxa_thread_atexit() implemeneted in libc, it has been implemented since 11
-
 BUILD_DEPENDS=	${LOCALBASE}/include/zenxml/xml.h:textproc/zenxml
 LIB_DEPENDS=	libboost_system.so:devel/boost-libs \
 		libfontconfig.so:x11-fonts/fontconfig \
@@ -39,5 +37,11 @@ post-patch:
 		${WRKDIR}/zen/file_access.cpp
 	@${REINPLACE_CMD} -e 's|WEXITSTATUS||' ${WRKDIR}/zen/shell_execute.h
 	@${REINPLACE_CMD} -e 's| noexcept;|;|' ${WRKDIR}/zen/scope_guard.h
+
+.include <bsd.port.options.mk>
+
+.if ${OPSYS} == FreeBSD && ${OSVERSION} < 1003506
+BROKEN=		no __cxa_thread_atexit() support in FreeBSD libc < 10.4
+.endif
 
 .include <bsd.port.mk>