From owner-svn-ports-head@freebsd.org Fri Dec 18 15:03:56 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 5C5B04BB08A; Fri, 18 Dec 2020 15:03:56 +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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 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 4CyBvw1wSmz4lfw; Fri, 18 Dec 2020 15:03:56 +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 34CD14DAA; Fri, 18 Dec 2020 15:03:56 +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 0BIF3uQP004702; Fri, 18 Dec 2020 15:03:56 GMT (envelope-from pkubaj@FreeBSD.org) Received: (from pkubaj@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 0BIF3u1I004701; Fri, 18 Dec 2020 15:03:56 GMT (envelope-from pkubaj@FreeBSD.org) Message-Id: <202012181503.0BIF3u1I004701@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: pkubaj set sender to pkubaj@FreeBSD.org using -f From: Piotr Kubaj Date: Fri, 18 Dec 2020 15:03:56 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r558380 - head/graphics/py-s2 X-SVN-Group: ports-head X-SVN-Commit-Author: pkubaj X-SVN-Commit-Paths: head/graphics/py-s2 X-SVN-Commit-Revision: 558380 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.34 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: Fri, 18 Dec 2020 15:03:56 -0000 Author: pkubaj Date: Fri Dec 18 15:03:55 2020 New Revision: 558380 URL: https://svnweb.freebsd.org/changeset/ports/558380 Log: graphics/py-s2: fix build on powerpc64 head __builtin_bpermd with clang requires POWER7 or later: In file included from CMakeFiles/_pywraps2.dir/s2PYTHON_wrap.cxx:4427: In file included from /usr/local/include/s2/util/coding/coder.h:32: In file included from /usr/local/include/s2/util/coding/varint.h:41: /usr/local/include/s2/util/bits/bits.h:509:19: error: this builtin is only valid on POWER7 or later CPUs uint64 result = __builtin_bpermd(0x3f3e3d3c3b3a3938, temp); But GCC can use __builtin_bpermd without resorting to forcing POWER7. Modified: head/graphics/py-s2/Makefile Modified: head/graphics/py-s2/Makefile ============================================================================== --- head/graphics/py-s2/Makefile Fri Dec 18 14:54:07 2020 (r558379) +++ head/graphics/py-s2/Makefile Fri Dec 18 15:03:55 2020 (r558380) @@ -17,12 +17,20 @@ BUILD_DEPENDS= s2>=${PORTVERSION}:graphics/s2 \ swig:devel/swig LIB_DEPENDS= libs2.so:graphics/s2 -USES= cmake compiler:c++11-lang localbase:ldflags python +USES= cmake localbase:ldflags python WRKSRC_SUBDIR= src/python GH_ACCOUNT= google GH_PROJECT= s2geometry USE_GITHUB= yes + +.include + +.if ${ARCH} == powerpc64 +USES+= compiler:gcc-c++11-lib +.else +USES+= compiler:c++11-lang +.endif .include