svn commit: r400629 - head/databases/tarantool

Antoine Brodin antoine at FreeBSD.org
Sun Nov 1 21:25:52 UTC 2015


Author: antoine
Date: Sun Nov  1 21:25:50 2015
New Revision: 400629
URL: https://svnweb.freebsd.org/changeset/ports/400629

Log:
  Unbreak after the switch from USE_GCC=4.8+ to USE_GCC=yes
  
  Reported by:	pkg-fallout

Modified:
  head/databases/tarantool/Makefile

Modified: head/databases/tarantool/Makefile
==============================================================================
--- head/databases/tarantool/Makefile	Sun Nov  1 21:19:02 2015	(r400628)
+++ head/databases/tarantool/Makefile	Sun Nov  1 21:25:50 2015	(r400629)
@@ -47,14 +47,15 @@ PLIST_SUB+=	TT_USER=${USERS} \
 OPTIONS_DEFINE=	DEBUG
 DEBUG_DESC=	Enable debug
 
-.if defined(USE_GCC) && ${USE_GCC:S/+//} == 4.8
-EXTRA_PATCHES=	${FILESDIR}/extra-patch-src_trivia_config.h.cmake
-.endif
-
 NOT_FOR_ARCHS=	sparc64
 NOT_FOR_ARCHS_REASON=	not yet ported to this architecture
 
-.include <bsd.port.options.mk>
+.include <bsd.port.pre.mk>
+
+# XXX we rely on USES=perl5 to load bsd.default-versions.mk
+.if defined(USE_GCC) && ${USE_GCC} == yes && ${GCC_DEFAULT} == 4.8
+EXTRA_PATCHES=	${FILESDIR}/extra-patch-src_trivia_config.h.cmake
+.endif
 
 .if ${PORT_OPTIONS:MDEBUG}
 CMAKE_BUILD_TYPE=	RelWithDebugInfo
@@ -70,4 +71,4 @@ post-install:
 		${STAGEDIR}${TT_RUNDIR} \
 		${STAGEDIR}${ETCDIR}/instances.enabled
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>


More information about the svn-ports-all mailing list