git: db48936a5f19 - main - science/cdf: Allow build for ARM.
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Mon, 10 Jan 2022 19:33:55 UTC
The branch main has been updated by stephen:
URL: https://cgit.FreeBSD.org/ports/commit/?id=db48936a5f19da6a6f1e7df73f4219dab9d1de5b
commit db48936a5f19da6a6f1e7df73f4219dab9d1de5b
Author: Stephen Montgomery-Smith <stephen@FreeBSD.org>
AuthorDate: 2022-01-10 19:32:06 +0000
Commit: Stephen Montgomery-Smith <stephen@FreeBSD.org>
CommitDate: 2022-01-10 19:32:06 +0000
science/cdf: Allow build for ARM.
Obtained from: Robert Clausecker <fuz@fuz.su>
---
science/cdf/Makefile | 5 +----
science/cdf/files/patch-src_include_cdfdist.h | 11 ++++++++++-
2 files changed, 11 insertions(+), 5 deletions(-)
diff --git a/science/cdf/Makefile b/science/cdf/Makefile
index 161cf75db9c6..2bbfcf72ba32 100644
--- a/science/cdf/Makefile
+++ b/science/cdf/Makefile
@@ -15,10 +15,6 @@ LICENSE_NAME= NASA/Goddard Space Flight Center
LICENSE_FILE= ${WRKSRC}/CDF_copyright.txt
LICENSE_PERMS= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
-BROKEN_aarch64= fails to compile: error: use of undeclared identifier FP1ZEROsingle; did you mean FP1zeroSingle?
-BROKEN_armv6= fails to compile: error: use of undeclared identifier FP1ZEROsingle; did you mean FP1zeroSingle?
-BROKEN_armv7= fails to compile: error: use of undeclared identifier FP1ZEROsingle; did you mean FP1zeroSingle?
-
BUILD_DEPENDS= bash:shells/bash
USES= fortran ncurses gmake
@@ -41,6 +37,7 @@ PORTDOCS= CDF_copyright.txt CHANGES.txt Release.notes Welcome.txt
OPTIONS_DEFINE= DOCS EXAMPLES
MAKE_ARGS+= OS=freebsd ENV=gnu all
+TEST_TARGET= test
post-patch:
.for def in ${DEFS}
diff --git a/science/cdf/files/patch-src_include_cdfdist.h b/science/cdf/files/patch-src_include_cdfdist.h
index 6e3d27a36448..3e3b47c5d8b1 100644
--- a/science/cdf/files/patch-src_include_cdfdist.h
+++ b/science/cdf/files/patch-src_include_cdfdist.h
@@ -1,5 +1,14 @@
---- src/include/cdfdist.h.orig 2022-01-08 02:20:38 UTC
+--- src/include/cdfdist.h.orig 2019-10-16 16:22:18 UTC
+++ src/include/cdfdist.h
+@@ -135,7 +135,7 @@
+ # define unix
+ #endif
+
+-#if defined(__arm__)
++#if defined(__arm__) || defined (__aarch64__)
+ # define ARM
+ # if defined(__BYTE_ORDER__)
+ # if __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__
@@ -567,7 +567,7 @@ typedef sChar sByte;
# if defined(__DARWIN_64_BIT_INO_T)
# define STAT stat