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

</pre>
<p><a href="https://github.com/macports/macports-ports/commit/49a67b5afdd68b8a8c948a3d4f37448b939a9f23">https://github.com/macports/macports-ports/commit/49a67b5afdd68b8a8c948a3d4f37448b939a9f23</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 49a67b5afdd linrad: fix arch64 build
</span>49a67b5afdd is described below

<span style='display:block; white-space:pre;color:#808000;'>commit 49a67b5afdd68b8a8c948a3d4f37448b939a9f23
</span>Author: Davide Gerhard <ra1nb0w@macports.org>
AuthorDate: Sat Dec 4 09:11:56 2021 +0100

<span style='display:block; white-space:pre;color:#404040;'>    linrad: fix arch64 build
</span><span style='display:block; white-space:pre;color:#404040;'>    
</span><span style='display:block; white-space:pre;color:#404040;'>    Closes: https://trac.macports.org/ticket/64125
</span>---
 science/linrad/Portfile              |  9 ++++-----
 science/linrad/files/fix_march.patch | 31 +++++++++++++++++++++++++++++++
 2 files changed, 35 insertions(+), 5 deletions(-)

<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/linrad/Portfile b/science/linrad/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index d8477dba29d..88580300f12 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/linrad/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/linrad/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -21,14 +21,15 @@ version             20211125-${svn.revision}
</span> revision            0
 
 supported_archs     x86_64 i386 arm64
<span style='display:block; white-space:pre;background:#e0ffe0;'>+universal_variant   no
</span> 
 # set the arch to use during build
 if {${build_arch} eq "i386"} {
     set linrad_arch 32
<span style='display:block; white-space:pre;background:#ffe0e0;'>-} elseif {${build_arch} eq "x86_64"} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    set linrad_arch 64
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    build.target xlinrad
</span> } else {
     set linrad_arch 64
<span style='display:block; white-space:pre;background:#e0ffe0;'>+    build.target xlinrad64
</span> }
 
 patchfiles-append \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -38,6 +39,7 @@ patchfiles-append \
</span>     fix_ac_path_prog.patch \
     fix_makefile.in.patch \
     linrad.patch \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+    fix_march.patch \
</span>     fix_sdrip.c.patch
 
 depends_build-append \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -61,9 +63,6 @@ configure.args-append \
</span>     --with-libusb0-${linrad_arch} \
     --with-libusb1-${linrad_arch}
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-build.target \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    xlinrad${linrad_arch}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> pre-configure {
     reinplace "s|@LINRAD_BINARY@|${prefix}/bin/xlinrad${linrad_arch}|" ${worksrcpath}/bin/linrad
     reinplace "s|@HELP_DIR@|${prefix}/share/${name}|g" ${worksrcpath}/help.c
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/linrad/files/fix_march.patch b/science/linrad/files/fix_march.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..d1603200b90
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/linrad/files/fix_march.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,31 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Index: configure.in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+===================================================================
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- configure.in   (revision 996)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ configure.in   (working copy)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -111,24 +111,8 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+   fi
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ fi
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ AC_SUBST(DARWIN)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-M32="-m32"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-M64="-m64"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-# Check that we have -m32 and -m64
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-if test "$BITS" = "32"; then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-  ${CC} -m32 csplit.c -c -o x.ol 2> x.x
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-  chmod 777 x.x
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-  Y=`cat x.x`
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-  if test "$Y" != ""; then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-    M32=""
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-  fi
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-  ${CC} -m64 csplit.c -c -o x.ol 2> x.x
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-  chmod 777 x.x
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-  Y=`cat x.x`
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-  if test "$Y" != ""; then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-    M64=""
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-  fi
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-fi
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++M32=""
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++M64=""
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ AC_SUBST(M32)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ AC_SUBST(M64)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${CC} lxsys.c -DHAVE_PARPORT=1 -c -o x.ol 2> x.x
</span></pre><pre style='margin:0'>

</pre>