<pre style='margin:0'>
Joshua Root (jmroot) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/88aa888ecf3f0c8f65acc493539275c5970f54dd">https://github.com/macports/macports-ports/commit/88aa888ecf3f0c8f65acc493539275c5970f54dd</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 88aa888ecf3f0c8f65acc493539275c5970f54dd
</span>Author: Joshua Root <jmr@macports.org>
AuthorDate: Tue Mar 23 08:45:54 2021 +1100
<span style='display:block; white-space:pre;color:#404040;'> librsync: fix arm64 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/62526
</span>---
net/librsync/Portfile | 18 ++++++++----------
net/librsync/files/configure.ac.patch | 12 ++++++++++++
2 files changed, 20 insertions(+), 10 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/net/librsync/Portfile b/net/librsync/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index a1fcf0f3b01..6c2b17172fc 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/net/librsync/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/net/librsync/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -23,7 +23,7 @@ long_description librsync is a free software library that implements \
</span> in the future.
homepage http://librsync.sourceforge.net/
<span style='display:block; white-space:pre;background:#ffe0e0;'>-master_sites sourceforge
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+master_sites sourceforge:project/librsync/librsync/${version}
</span>
checksums sha256 6633e4605662763a03bb6388529cbdfd3b11a9ec55b8845351c1bd9a92bc41d6 \
rmd160 39ca29334d0efabc0ee9e4d44abbe73a7d2fe831
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -40,18 +40,16 @@ depends_lib port:bzip2 \
</span> # http://librsync.cvs.sourceforge.net/librsync/librsync/patch.c?r1=1.30&r2=1.31&view=patch
patchfiles patch-librsync__doc__rdiff.1 \
patch-librsync__mdfour.h \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-librsync__patch.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-librsync__patch.c \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.ac.patch
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.cflags-append -std=gnu89
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Needed for universal and arm64 support
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+use_autoreconf yes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+autoreconf.args -fvi
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.args --mandir=${prefix}/share/man \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --enable-shared
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.cflags-append -std=gnu89
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-variant universal {}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-post-configure {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace -E "s|compiler_flags=$|compiler_flags=' [get_canonical_archflags cc]'|" ${worksrcpath}/libtool
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace -E "s|linker_flags=$|linker_flags=' [get_canonical_archflags ld]'|" ${worksrcpath}/libtool
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.args --enable-shared
</span>
test.run yes
test.target check
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/net/librsync/files/configure.ac.patch b/net/librsync/files/configure.ac.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..e3141338443
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/net/librsync/files/configure.ac.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,12 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- configure.ac.orig 2004-10-10 19:52:26.000000000 +1000
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ configure.ac 2021-03-23 08:25:05.000000000 +1100
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -96,7 +96,8 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Test if the compiler has the GNU feature of putting argv[0] into a global
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ AC_MSG_CHECKING([for program_invocation_short_name])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ AC_COMPILE_IFELSE([AC_LANG_PROGRAM(
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- [[#include <errno.h>]],
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ [[#include <errno.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ #include <string.h>]],
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ [[strlen(program_invocation_short_name)]])],
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ [ AC_DEFINE(HAVE_PROGRAM_INVOCATION_NAME,,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ [GNU extension of saving argv[0] to program_invocation_short_name])
</span></pre><pre style='margin:0'>
</pre>