<pre style='margin:0'>
Takeshi Enomoto (tenomoto) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/d45fbc3d41726f410b47e0f723db3de51fc61111">https://github.com/macports/macports-ports/commit/d45fbc3d41726f410b47e0f723db3de51fc61111</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new d45fbc3d417 ncarg: enable build on arm
</span>d45fbc3d417 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit d45fbc3d41726f410b47e0f723db3de51fc61111
</span>Author: Takeshi Enomoto <takeshi@enomosphere.net>
AuthorDate: Sat Oct 8 16:08:19 2022 +0900
<span style='display:block; white-space:pre;color:#404040;'> ncarg: enable build on arm
</span>---
science/ncarg/Portfile | 15 ++++++++++++---
.../files/patch-common-src-libncarg_c-yMakefile.diff | 11 +++++++++++
science/ncarg/files/patch-config-ymake.diff | 16 +++++++++-------
.../ncarg/files/patch-ni-src-lib-nfpfort-yMakefile.diff | 11 +++++++++++
4 files changed, 43 insertions(+), 10 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/ncarg/Portfile b/science/ncarg/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index fd7736a8917..23ac5fe20c8 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/ncarg/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/ncarg/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -11,7 +11,7 @@ compilers.allow_arguments_mismatch \
</span>
name ncarg
version 6.6.2
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 11
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 12
</span> epoch 1
set version_no_dot [join [split ${version} "."] ""]
categories science
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -87,11 +87,15 @@ patchfiles patch-Configure.diff \
</span> patch-ncarg2d-src-bin-ezmapdemo-yMakefile.diff \
patch-ncarg2d-src-bin-tdpackdemo-yMakefile.diff \
patch-ngmath-src-bin-nnalg-yMakefile.diff \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-ni-src-lib-nfpfort-yMakefile.diff \
</span> patch-ni-src-ncl-global-vars.diff \
patch-ncarg2d-src-libncarg_gks-bwi-argb2ci.f.diff
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if {$build_arch eq "x86_64"} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {$build_arch eq "x86_64" | $build_arch eq "arm64"} {
</span> patchfiles-append patch-config-ymake.diff
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+if { $build_arch eq "arm64"} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append patch-common-src-libncarg_c-yMakefile.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span> if {[variant_isset accelerate]} {
patchfiles-append patch-config-Project-accelerate.diff \
patch-external-yMakefile.diff
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -106,7 +110,7 @@ if {${os.platform} eq "darwin" && ${os.major} < 12} {
</span> }
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-supported_archs i386 ppc ppc64 x86_64
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#supported_archs i386 ppc ppc64 x86_64
</span> configure.cflags-append -Wno-error=implicit-function-declaration
if {${configure.sdkroot} ne ""} {
configure.cflags-append -isysroot ${configure.sdkroot}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -234,6 +238,11 @@ post-build {
</span> }
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# Adhoc fix
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+post-destroot {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ system -W ${destroot}${prefix}/bin "install_name_tool -change @rpath/libgfortran.5.dylib ${prefix}/lib/libgcc/libgfortran.5.dylib ncl && install_name_tool -change @rpath/libgomp.1.dylib ${prefix}/lib/libgcc/libgomp.1.dylib ncl"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> default_variants +accelerate
if {[variant_isset g95]} {
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/ncarg/files/patch-common-src-libncarg_c-yMakefile.diff b/science/ncarg/files/patch-common-src-libncarg_c-yMakefile.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..b5e344d3531
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/ncarg/files/patch-common-src-libncarg_c-yMakefile.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- common/src/libncarg_c/yMakefile.orig 2019-02-28 08:44:39.000000000 +0900
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ common/src/libncarg_c/yMakefile 2022-10-08 12:25:19.000000000 +0900
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -37,7 +37,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ EXFSRCS = gbytes.f sbytes.f
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ EXOBJS = sbytes.o gbytes.o bcopyswap.o logic32.o
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#elif defined(Darwin) && defined(i386) && defined(__LP64__)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#elif defined(Darwin) && (defined(i386) || defined(arm64)) && defined(__LP64__)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ EXCSRCS = bcopyswap.c logic32.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ EXFSRCS = gbytes.f sbytes.f
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ EXOBJS = sbytes.o gbytes.o bcopyswap.o logic32.o
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/ncarg/files/patch-config-ymake.diff b/science/ncarg/files/patch-config-ymake.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 88692747ab7..1fee3d0a1d0 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/ncarg/files/patch-config-ymake.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/ncarg/files/patch-config-ymake.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,13 +1,15 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- config/ymake.orig 2013-02-07 12:28:01.000000000 +0900
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ config/ymake 2013-02-15 08:34:51.000000000 +0900
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -416,8 +416,8 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- config/ymake.orig 2019-02-28 08:44:39.000000000 +0900
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ config/ymake 2022-10-08 10:57:29.000000000 +0900
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -416,6 +416,12 @@
</span> breaksw
case i386:
case x86_64:
<span style='display:block; white-space:pre;background:#ffe0e0;'>-- set model = $mach
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- set arch = $mach
</span> + set model = x86_64
+ set arch = x86_64
<span style='display:block; white-space:pre;background:#e0ffe0;'>++ set sysincs = Darwin_Intel
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ set vendor = Apple
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ breaksw
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ case arm64:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set model = $mach
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set arch = $mach
</span> set sysincs = Darwin_Intel
<span style='display:block; white-space:pre;background:#ffe0e0;'>- set vendor = Apple
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- breaksw
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/ncarg/files/patch-ni-src-lib-nfpfort-yMakefile.diff b/science/ncarg/files/patch-ni-src-lib-nfpfort-yMakefile.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..33fed4987b4
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/ncarg/files/patch-ni-src-lib-nfpfort-yMakefile.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- ni/src/lib/nfpfort/yMakefile.orig 2019-02-28 08:44:39.000000000 +0900
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ ni/src/lib/nfpfort/yMakefile 2022-10-08 13:16:57.000000000 +0900
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -41,7 +41,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ det_code42.o kmeans_kmns_as136.o spi3.o wrf_vinterp.o wrf_fctt.o \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ wrf_write_wps.o pres_hybrid_jra55_dp.o relhum_ice.o relhum_water.o \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ wetbulb_profs.o wrf_cloud_fracf.o mlegev_memory.o kernel_density.o \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- meemd.o dpsort_large.o wrf_pw.o wrf_wind.o wrf_constants.o wrf_constants.mod
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ meemd.o dpsort_large.o wrf_pw.o wrf_wind.o wrf_constants.o
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ COBJS =
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span></pre><pre style='margin:0'>
</pre>