Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 23 Apr 2020 17:18:49 +0000 (UTC)
From:      Piotr Kubaj <pkubaj@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r532697 - head/benchmarks/libcelero
Message-ID:  <202004231718.03NHInq1025213@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: pkubaj
Date: Thu Apr 23 17:18:48 2020
New Revision: 532697
URL: https://svnweb.freebsd.org/changeset/ports/532697

Log:
  benchmarks/libcelero: fix build on GCC architectures and powerpc64 elfv2
  
  clang 8 doesn't have full support for powerpc, powerpc64 or powerpcspe, so use
  GCC there.
  On powerpc64 elfv2, the default is to build for elfv1, so pass a flag to fix it.
  
  MFH:		2020Q2 (fix build blanket)

Modified:
  head/benchmarks/libcelero/Makefile

Modified: head/benchmarks/libcelero/Makefile
==============================================================================
--- head/benchmarks/libcelero/Makefile	Thu Apr 23 17:00:52 2020	(r532696)
+++ head/benchmarks/libcelero/Makefile	Thu Apr 23 17:18:48 2020	(r532697)
@@ -14,17 +14,26 @@ LICENSE_FILE=	${WRKSRC}/license.txt
 
 BUILD_DEPENDS=	${LOCALBASE}/include/sys/sysinfo.h:devel/libsysinfo
 
-USES=		cmake localbase:ldflags # compiler:c++11-lang
+USES=		cmake compiler localbase:ldflags
 USE_GITHUB=	yes
 GH_ACCOUNT=	DigitalInBlue
 GH_PROJECT=	Celero
 USE_LDCONFIG=	yes
 
+.include <bsd.port.pre.mk>
+
+.if ${CHOSEN_COMPILER_TYPE} == gcc
+USE_GCC=	yes
+.else
 # workaround for breakage with clang-10: https://github.com/DigitalInBlue/Celero/issues/142
 LLVM_VER=	80
 BUILD_DEPENDS+=	clang${LLVM_VER}:devel/llvm${LLVM_VER}
 CPP=		clang-cpp${LLVM_VER}
 CC=		clang${LLVM_VER}
 CXX=		clang++${LLVM_VER}
+.if ${ARCH} == powerpc64
+CFLAGS+=	-mabi=elfv2
+.endif
+.endif
 
-.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?202004231718.03NHInq1025213>