Date: Fri, 18 Dec 2020 15:03:56 +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: r558380 - head/graphics/py-s2 Message-ID: <202012181503.0BIF3u1I004701@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
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 <bsd.port.options.mk> + +.if ${ARCH} == powerpc64 +USES+= compiler:gcc-c++11-lib +.else +USES+= compiler:c++11-lang +.endif .include <bsd.port.mk>
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202012181503.0BIF3u1I004701>