Attachment 216031 Details for Bug 247631 – unbreak build on i386

[patch] unbreak build on i386

R-cran-data.table.diff (text/plain), 1.73 KB, created by Wen Heping on 2020-06-29 10:29:11 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Wen Heping

Created: 2020-06-29 10:29:11 UTC

Size: 1.73 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(revision 540654)
>+++ Makefile	(working copy)
>@@ -3,7 +3,7 @@
> 
> PORTNAME=	data.table
> DISTVERSION=	1.12.8
>-PORTREVISION=	2
>+PORTREVISION=	3
> CATEGORIES=	devel
> DISTNAME=	${PORTNAME}_${DISTVERSION}
> 
>@@ -13,13 +13,25 @@
> 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+=		compiler:${OPENMP}c++11-lib
>+.endif
>+
> .include <bsd.port.mk>
>Index: files/extra-patch-src_Makevars
>===================================================================
>--- files/extra-patch-src_Makevars	(nonexistent)
>+++ files/extra-patch-src_Makevars	(working copy)
>@@ -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)
>
>Property changes on: files/extra-patch-src_Makevars
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property

Flags:

koobs: maintainer-approval+

Actions: View | Diff

Attachments on bug 247631: 216031