svn commit: r550137 - in head/devel/R-cran-data.table: . files
Wen Heping
wen at FreeBSD.org
Sat Sep 26 08:36:56 UTC 2020
Author: wen
Date: Sat Sep 26 08:36:54 2020
New Revision: 550137
URL: https://svnweb.freebsd.org/changeset/ports/550137
Log:
- Unbreak build on i386
PR: 247631
Submitted by: wen@(myself)
Approved by: tota@(maintainer)
Added:
head/devel/R-cran-data.table/files/
head/devel/R-cran-data.table/files/extra-patch-src_Makevars (contents, props changed)
Modified:
head/devel/R-cran-data.table/Makefile
Modified: head/devel/R-cran-data.table/Makefile
==============================================================================
--- head/devel/R-cran-data.table/Makefile Sat Sep 26 08:27:59 2020 (r550136)
+++ head/devel/R-cran-data.table/Makefile Sat Sep 26 08:36:54 2020 (r550137)
@@ -3,7 +3,7 @@
PORTNAME= data.table
DISTVERSION= 1.12.8
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= devel
DISTNAME= ${PORTNAME}_${DISTVERSION}
@@ -13,13 +13,25 @@ COMMENT= Extension of Data.frame
LICENSE= MPL20
LICENSE_FILE= ${WRKSRC}/LICENSE
-BROKEN_i386= unable to load datatable.so
+USES= cran:auto-plist
-USES= cran:auto-plist,compiles
-
OPTIONS_DEFINE= OPENMP
OPTIONS_DEFAULT= OPENMP
OPENMP_CONFIGURE_ENABLE= openmp
+
+NO_ARCH_IGNORE= datatable.so
+
+.include <bsd.port.options.mk>
+
+.if ${ARCH} == i386
+# See PR 230888 : Missing 64 bit atomic functions for i386
+EXTRA_PATCHES= ${FILESDIR}/extra-patch-src_Makevars
+USES+= compiler:gcc-c++11-lib
+.elif defined(PPC_ABI) && ${PPC_ABI} == ELFv1
+USE_GCC= yes
+.else
+USES+= cran:compiles
+.endif
.include <bsd.port.mk>
Added: head/devel/R-cran-data.table/files/extra-patch-src_Makevars
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/devel/R-cran-data.table/files/extra-patch-src_Makevars Sat Sep 26 08:36:54 2020 (r550137)
@@ -0,0 +1,10 @@
+--- src/Makevars.orig 2020-06-28 23:46:07 UTC
++++ src/Makevars
+@@ -1,6 +1,6 @@
+
+ PKG_CFLAGS = $(SHLIB_OPENMP_CFLAGS)
+-PKG_LIBS = $(SHLIB_OPENMP_CFLAGS) -lz
++PKG_LIBS = $(SHLIB_OPENMP_CFLAGS) -lz -latomic
+
+ all: $(SHLIB)
+ mv $(SHLIB) datatable$(SHLIB_EXT)
More information about the svn-ports-all
mailing list