<pre style='margin:0'>
Renee Otten (reneeotten) pushed a commit to branch master
in repository macports-ports.

</pre>
<p><a href="https://github.com/macports/macports-ports/commit/6ed394a1c7fa554f0fd22a5eba8d61263627f589">https://github.com/macports/macports-ports/commit/6ed394a1c7fa554f0fd22a5eba8d61263627f589</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 6ed394a1c7f fpc: Fix arm64 port
</span>6ed394a1c7f is described below

<span style='display:block; white-space:pre;color:#808000;'>commit 6ed394a1c7fa554f0fd22a5eba8d61263627f589
</span>Author: Karl-Michael Schindler <609203+kamischi@users.noreply.github.com>
AuthorDate: Tue Dec 28 23:17:29 2021 +0100

<span style='display:block; white-space:pre;color:#404040;'>    fpc: Fix arm64 port
</span><span style='display:block; white-space:pre;color:#404040;'>    
</span><span style='display:block; white-space:pre;color:#404040;'>    Also some clean up.
</span>---
 lang/fpc/Portfile            | 37 ++++++++++++++++++++++++-------------
 lang/fpc/files/fpc.cfg.patch |  2 +-
 2 files changed, 25 insertions(+), 14 deletions(-)

<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/fpc/Portfile b/lang/fpc/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 37f58f608e6..f01830955bb 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/fpc/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/fpc/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -96,8 +96,15 @@ subport "${name}-cross" {
</span>     worksrcdir      ${name}build-${version}/fpcsrc/compiler
     use_configure   no
     build.args      OPT="-ap -v0"
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    build.target    aarch64 arm avr i386 i8086 jvm m68k mips mipsel powerpc powerpc64 sparc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    build.target    aarch64 arm avr i386 i8086 jvm m68k mips mipsel powerpc powerpc64 sparc x86_64
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    switch ${build_arch} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        x86_64 {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            build.target-delete x86_64
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        arm64 {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            build.target-delete aarch64
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    }
</span>     destroot {
       # delete unwanted files
         file delete -force ${worksrcpath}/ppcgen
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -258,30 +265,34 @@ if {${subport} eq "${name}"} {
</span>     worksrcdir          ${name}build-${version}/fpcsrc
     build.env           PP=${workpath}/${bootstrapCompiler} \
                         PREFIX=${destroot}${fpcbasepath}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    build.args          OPT="-ap -v0 ${linkerOptions}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    build.target        all CPU_TARGET=${cpuTarget}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    build.args          OPT="-ap -v0 ${linkerOptions}" CPU_TARGET=${cpuTarget} UTILS=1
</span> 
<span style='display:block; white-space:pre;background:#e0ffe0;'>+    destroot.args       {*}${build.args}
</span>     destroot.env        {*}${build.env}
 
     # build the compiler utilities msgdif and msg2inc
     post-build {
         system -W ${worksrcpath}/compiler/utils \
<span style='display:block; white-space:pre;background:#ffe0e0;'>-               "../${compiler} -WM${macosx_deployment_target} -Fu../../rtl/units/${cpuTarget}-darwin -ap -v0 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                  ${linkerOptions} msgdif.pp && \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                ../${compiler} -WM${macosx_deployment_target} -Fu../../rtl/units/${cpuTarget}-darwin -ap -v0 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                  ${linkerOptions} msg2inc.pp"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+               "../${compiler} -ap -v0 -Fu../../rtl/units/${cpuTarget}-darwin \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                  -WM${macosx_deployment_target} ${linkerOptions} msgdif.pp && \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                ../${compiler} -ap -v0 -Fu../../rtl/units/${cpuTarget}-darwin \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                  -WM${macosx_deployment_target} ${linkerOptions} msg2inc.pp"
</span>     }
 
     post-destroot {
         # create a symlink to the architecture dependent executable
         ln -s ${fpcbasepath}/lib/${name}/${version}/${compiler} ${destroot}${fpcbasepath}/bin
<span style='display:block; white-space:pre;background:#e0ffe0;'>+        # target arm64 needs make utils_install explicitly
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        if {${build_arch} == "arm64"} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            system -W ${worksrcpath} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                   "make utils_install FPC=${worksrcpath}/compiler/${compiler} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                       PREFIX=${destroot}${fpcbasepath} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                       OPT=\"-Furtl/units/${cpuTarget}-darwin -ap -v0 ${linkerOptions}\""
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        }
</span>         # generate a configuration file
         xinstall -d ${destroot}${fpcbasepath}/etc
<span style='display:block; white-space:pre;background:#ffe0e0;'>-        system "
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-            ${destroot}${fpcbasepath}/bin/fpcmkcfg \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                -d basepath=${fpcbasepath}/lib/${name}/${version} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                -o ${destroot}${fpcbasepath}/etc/fpc.cfg
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-        "
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        system -W ${destroot}${fpcbasepath} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+               "bin/fpcmkcfg -d basepath=${fpcbasepath}/lib/${name}/${version} -o etc/fpc.cfg"
</span>         ln -s ${fpcbasepath}/etc/fpc.cfg ${destroot}${prefix}/etc
         system "patch ${destroot}${fpcbasepath}/etc/fpc.cfg ${filespath}/fpc.cfg.patch"
 
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/fpc/files/fpc.cfg.patch b/lang/fpc/files/fpc.cfg.patch
</span><span style='display:block; white-space:pre;color:#808080;'>index 8b8f779af52..14a6c68c77b 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/fpc/files/fpc.cfg.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/fpc/files/fpc.cfg.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,6 +1,6 @@
</span> --- etc/fpc.cfg   2019-06-14 15:54:16.000000000 +0200
 +++ fpc.cfg-new        2019-08-17 10:54:57.000000000 +0200
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -256,6 +256,12 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -267,6 +267,12 @@
</span>  -XX
  #endif
  
</pre><pre style='margin:0'>

</pre>