From owner-svn-ports-head@freebsd.org Sun Apr 12 16:18:50 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 1A97C2C1BB2; Sun, 12 Apr 2020 16:18:50 +0000 (UTC) (envelope-from thierry@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) server-signature RSA-PSS (4096 bits) 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 490cPj6zGCz4K3B; Sun, 12 Apr 2020 16:18:49 +0000 (UTC) (envelope-from thierry@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 EAA274565; Sun, 12 Apr 2020 16:18:49 +0000 (UTC) (envelope-from thierry@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 03CGInH1081152; Sun, 12 Apr 2020 16:18:49 GMT (envelope-from thierry@FreeBSD.org) Received: (from thierry@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 03CGIn9x081151; Sun, 12 Apr 2020 16:18:49 GMT (envelope-from thierry@FreeBSD.org) Message-Id: <202004121618.03CGIn9x081151@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: thierry set sender to thierry@FreeBSD.org using -f From: Thierry Thomas Date: Sun, 12 Apr 2020 16:18:49 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r531531 - head/math/suitesparse X-SVN-Group: ports-head X-SVN-Commit-Author: thierry X-SVN-Commit-Paths: head/math/suitesparse X-SVN-Commit-Revision: 531531 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.29 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: Sun, 12 Apr 2020 16:18:50 -0000 Author: thierry Date: Sun Apr 12 16:18:49 2020 New Revision: 531531 URL: https://svnweb.freebsd.org/changeset/ports/531531 Log: Fix on i386, by using Gcc. Unfortunately, SuiteSparse is now hit by the problem listed in PR 230888 (missing support of libatomic). Reported by: pkgfallout via antoine@ Modified: head/math/suitesparse/Makefile Modified: head/math/suitesparse/Makefile ============================================================================== --- head/math/suitesparse/Makefile Sun Apr 12 16:17:49 2020 (r531530) +++ head/math/suitesparse/Makefile Sun Apr 12 16:18:49 2020 (r531531) @@ -18,7 +18,7 @@ USE_GITHUB= yes GH_ACCOUNT= DrTimothyAldenDavis GH_PROJECT= SuiteSparse -USES= cmake:insource compiler:${OPENMP}c++11-lib fortran gmake localbase:ldflags +USES= cmake:insource fortran gmake localbase:ldflags USE_LDCONFIG= yes ALL_TARGET= library # skip demos INSTALL_TARGET= install # skip USES=cmake @@ -56,6 +56,16 @@ OPENMP_VARS= OPENMP=gcc- TBB_DESC= Intel threading building blocks TBB_LIB_DEPENDS= libtbb.so:devel/tbb TBB_MAKE_ENV= TBB="-ltbb" SPQR_CONFIG="-DHAVE_TBB" + +.include + +.if ${ARCH} == i386 +# See PR 230888 : Missing 64 bit atomic functions for i386 +USES+= compiler:gcc-c++11-lib +LDFLAGS+= -latomic +.else +USES+= compiler:${OPENMP}c++11-lib +.endif post-extract: ${RM} -r ${WRKSRC}/metis-*