From owner-svn-ports-head@freebsd.org Sat Sep 26 08:36: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 128C73F7DCF; Sat, 26 Sep 2020 08:36:56 +0000 (UTC) (envelope-from wen@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 4Bz2Fg5r69z4Jqh; Sat, 26 Sep 2020 08:36:55 +0000 (UTC) (envelope-from wen@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 AB973212D9; Sat, 26 Sep 2020 08:36:55 +0000 (UTC) (envelope-from wen@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 08Q8atl3036891; Sat, 26 Sep 2020 08:36:55 GMT (envelope-from wen@FreeBSD.org) Received: (from wen@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 08Q8atq4036889; Sat, 26 Sep 2020 08:36:55 GMT (envelope-from wen@FreeBSD.org) Message-Id: <202009260836.08Q8atq4036889@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: wen set sender to wen@FreeBSD.org using -f From: Wen Heping Date: Sat, 26 Sep 2020 08:36:55 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r550137 - in head/devel/R-cran-data.table: . files X-SVN-Group: ports-head X-SVN-Commit-Author: wen X-SVN-Commit-Paths: in head/devel/R-cran-data.table: . files X-SVN-Commit-Revision: 550137 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.33 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: Sat, 26 Sep 2020 08:36:56 -0000 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 + +.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 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)