Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 7 Jun 2017 08:43:26 +0000 (UTC)
From:      Vasil Dimov <vd@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r442819 - head/databases/galera
Message-ID:  <201706070843.v578hQKT087303@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: vd
Date: Wed Jun  7 08:43:26 2017
New Revision: 442819
URL: https://svnweb.freebsd.org/changeset/ports/442819

Log:
  databases/galera: Unbreak on powerpc64 by requesting a newer GCC
  
  Also set PORTVERSION, PORTREVISION and GH_TAGNAME conditionally (?=),
  so they can be overriden from the environment (to ease building custom
  packages from arbitrary commits on github).

Modified:
  head/databases/galera/Makefile

Modified: head/databases/galera/Makefile
==============================================================================
--- head/databases/galera/Makefile	Wed Jun  7 07:20:31 2017	(r442818)
+++ head/databases/galera/Makefile	Wed Jun  7 08:43:26 2017	(r442819)
@@ -2,8 +2,8 @@
 # $FreeBSD$
 
 PORTNAME=	galera
-PORTVERSION=	25.3.20
-PORTREVISION=	2
+PORTVERSION?=	25.3.20
+PORTREVISION?=	2
 CATEGORIES=	databases
 
 MAINTAINER=	devel@galeracluster.com
@@ -15,7 +15,6 @@ BUILD_DEPENDS=	checkmk:devel/check \
 		${LOCALBASE}/include/boost/shared_ptr.hpp:devel/boost-libs
 LIB_DEPENDS=	libboost_date_time.so:devel/boost-libs
 
-BROKEN_powerpc64=	fails to compile: gu_atomic.h: This GCC version does not support 8-byte atomics on this platform. Use GCC >= 4.7.x
 NOT_FOR_ARCHS=		i386
 # On i386 older versions of clang produce:
 #   cannot compile this atomic library call yet ... __atomic_add_fetch
@@ -33,7 +32,7 @@ USE_LDCONFIG=	yes
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	codership
-GH_TAGNAME=	release_${DISTVERSION}
+GH_TAGNAME?=	release_${DISTVERSION}
 
 LDFLAGS+=	-lboost_program_options -lboost_system
 MAKE_ARGS+=	--config=force \
@@ -53,6 +52,11 @@ BOOSTPOOL_DESC=	Use boost pool allocator
 BPOSTATIC_DESC=	Use static boost_program_options
 
 .include <bsd.port.pre.mk>
+
+# COMPILER_TYPE could be empty on older FreeBSD versions.
+.if "${COMPILER_TYPE}" == gcc || ${OSVERSION} < 1000000
+USE_GCC=	4.8+
+.endif
 
 .if ${PORT_OPTIONS:MBOOSTPOOL}
 MAKE_ARGS+=	boost_pool=1



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201706070843.v578hQKT087303>