From owner-svn-ports-head@freebsd.org Thu Apr 23 17:18:49 2020 Return-Path: Delivered-To: svn-ports-head@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 5F3F92BD9C3; Thu, 23 Apr 2020 17:18:49 +0000 (UTC) (envelope-from pkubaj@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 497PCs1vQxz44Pc; Thu, 23 Apr 2020 17:18:49 +0000 (UTC) (envelope-from pkubaj@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 3C65C7F39; Thu, 23 Apr 2020 17:18:49 +0000 (UTC) (envelope-from pkubaj@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 03NHInoB025214; Thu, 23 Apr 2020 17:18:49 GMT (envelope-from pkubaj@FreeBSD.org) Received: (from pkubaj@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 03NHInq1025213; Thu, 23 Apr 2020 17:18:49 GMT (envelope-from pkubaj@FreeBSD.org) Message-Id: <202004231718.03NHInq1025213@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: pkubaj set sender to pkubaj@FreeBSD.org using -f From: Piotr Kubaj Date: Thu, 23 Apr 2020 17:18:49 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r532697 - head/benchmarks/libcelero X-SVN-Group: ports-head X-SVN-Commit-Author: pkubaj X-SVN-Commit-Paths: head/benchmarks/libcelero X-SVN-Commit-Revision: 532697 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 23 Apr 2020 17:18:49 -0000 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 + +.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 +.include