Date: Tue, 6 Jul 2021 12:41:20 GMT From: Piotr Kubaj <pkubaj@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 847b37d8e82b - main - graphics/R-cran-s2: fix build on powerpc64 Message-ID: <202107061241.166CfKCW027444@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by pkubaj: URL: https://cgit.FreeBSD.org/ports/commit/?id=847b37d8e82b8770345da348438a2de1e7c51790 commit 847b37d8e82b8770345da348438a2de1e7c51790 Author: Piotr Kubaj <pkubaj@FreeBSD.org> AuthorDate: 2021-07-06 12:41:03 +0000 Commit: Piotr Kubaj <pkubaj@FreeBSD.org> CommitDate: 2021-07-06 12:41:03 +0000 graphics/R-cran-s2: fix build on powerpc64 c++ -std=gnu++11 -I"/usr/local/lib/R/include" -DNDEBUG -I../inst/include -DSTRICT_R_HEADERS -I'/usr/local/lib/R/library/Rcpp/include' -I'/usr/local/lib/R/library/wk/include' -DLIBICONV_PLUG -I/usr/local/include -isystem /usr/local/include -DIS_BIG_ENDIAN -pthread -fPIC -O2 -pipe -DLIBICONV_PLUG -fstack-protector-strong -isystem /usr/local/include -fno-strict-aliasing -DLIBICONV_PLUG -isystem /usr/local/include -c s2-accessors.cpp -o s2-accessors.o In file included from s2-accessors.cpp:2: In file included from ./geography-operator.h:7: In file included from ./geography.h:8: In file included from ../inst/include/s2/s2polygon.h:29: In file included from ../inst/include/s2/mutable_s2shape_index.h:34: In file included from ../inst/include/s2/s2cell_id.h:36: ../inst/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); --- graphics/R-cran-s2/Makefile | 6 ++++++ graphics/R-cran-s2/files/extra-patch-src_Makevars.in | 10 ++++++++++ 2 files changed, 16 insertions(+) diff --git a/graphics/R-cran-s2/Makefile b/graphics/R-cran-s2/Makefile index bb315a614431..1e8df715fd5f 100644 --- a/graphics/R-cran-s2/Makefile +++ b/graphics/R-cran-s2/Makefile @@ -18,4 +18,10 @@ RUN_DEPENDS= ${CRAN_DEPENDS} USES= cran:auto-plist,compiles +.include <bsd.port.options.mk> + +.if ${ARCH} == powerpc64 +EXTRA_PATCHES= ${FILESDIR}/extra-patch-src_Makevars.in +.endif + .include <bsd.port.mk> diff --git a/graphics/R-cran-s2/files/extra-patch-src_Makevars.in b/graphics/R-cran-s2/files/extra-patch-src_Makevars.in new file mode 100644 index 000000000000..bfbd3bb57d12 --- /dev/null +++ b/graphics/R-cran-s2/files/extra-patch-src_Makevars.in @@ -0,0 +1,10 @@ +--- src/Makevars.in.orig 2021-07-06 12:09:16 UTC ++++ src/Makevars.in +@@ -1,6 +1,6 @@ + PKG_CPPFLAGS = -I../inst/include -DSTRICT_R_HEADERS + PKG_LIBS = @libs@ +-PKG_CXXFLAGS = @cflags@ -pthread ++PKG_CXXFLAGS = @cflags@ -pthread -mcpu=power7 + CXX_STD = CXX11 + + OBJECTS = cpp-compat.o \
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202107061241.166CfKCW027444>