From nobody Fri Oct 22 12:09:09 2021 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 7B2B1181E0BA; Fri, 22 Oct 2021 12:09:11 +0000 (UTC) (envelope-from git@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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4HbNS63DB3z4RlS; Fri, 22 Oct 2021 12:09:10 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 165BA6264; Fri, 22 Oct 2021 12:09:10 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 19MC99ar098943; Fri, 22 Oct 2021 12:09:09 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 19MC998m098942; Fri, 22 Oct 2021 12:09:09 GMT (envelope-from git) Date: Fri, 22 Oct 2021 12:09:09 GMT Message-Id: <202110221209.19MC998m098942@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Piotr Kubaj Subject: git: cb177d8463fe - main - science/afni: fix build on non-x86 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: pkubaj X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: cb177d8463fe78539116f2594a3d9a1c7da6b2d0 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by pkubaj: URL: https://cgit.FreeBSD.org/ports/commit/?id=cb177d8463fe78539116f2594a3d9a1c7da6b2d0 commit cb177d8463fe78539116f2594a3d9a1c7da6b2d0 Author: Piotr Kubaj AuthorDate: 2021-10-22 11:42:20 +0000 Commit: Piotr Kubaj CommitDate: 2021-10-22 11:42:20 +0000 science/afni: fix build on non-x86 fpsetprec() is only on amd64 and i386 and requires x87 FPU. It's possible to build without x87, just how it's done on Linux. --- science/afni/Makefile | 2 -- science/afni/files/patch-SUMA_gts_src_rounding.h | 20 ++++++++++++++++++++ 2 files changed, 20 insertions(+), 2 deletions(-) diff --git a/science/afni/Makefile b/science/afni/Makefile index 0c6910c73fd2..5351e4d3a0b4 100644 --- a/science/afni/Makefile +++ b/science/afni/Makefile @@ -8,8 +8,6 @@ COMMENT= Advanced Functional Neuro Imaging LICENSE= GPLv2 -BROKEN_powerpc64= fails to compile: ./predicates_init.c:46: error: implicit declaration of function 'fpsetprec' - CRAN_DEPENDS= R-cran-lme4>0:math/R-cran-lme4 \ R-cran-snow>0:science/R-cran-snow \ R-cran-psych>0:math/R-cran-psych diff --git a/science/afni/files/patch-SUMA_gts_src_rounding.h b/science/afni/files/patch-SUMA_gts_src_rounding.h new file mode 100644 index 000000000000..e2730a9fd6c7 --- /dev/null +++ b/science/afni/files/patch-SUMA_gts_src_rounding.h @@ -0,0 +1,20 @@ +--- SUMA/gts/src/rounding.h.orig 2021-10-21 01:05:53 UTC ++++ SUMA/gts/src/rounding.h +@@ -34,9 +34,14 @@ + # endif /* not FPU_EXTENDED */ + #else /* not HAVE_FPU_CONTROL_H */ + # ifdef __FreeBSD__ +-# include +-# define FPU_ROUND_DOUBLE (fpsetprec(FP_PD)) +-# define FPU_RESTORE (fpsetprec(FP_PE)) ++# if defined(__amd64__) || defined(__i386__) ++# include ++# define FPU_ROUND_DOUBLE (fpsetprec(FP_PD)) ++# define FPU_RESTORE (fpsetprec(FP_PE)) ++# else /* not amd64 or i386 */ ++# define FPU_ROUND_DOUBLE ++# define FPU_RESTORE ++# endif + # else /* not __FreeBSD__ */ + # ifdef WIN32 + # ifdef _MSC_VER