<pre style='margin:0'>
Ryan Schmidt (ryandesign) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/6da2ae247c5675a8783adf86a28b810af9342650">https://github.com/macports/macports-ports/commit/6da2ae247c5675a8783adf86a28b810af9342650</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 6da2ae247c5 zpaq: fix crash on non-Intel; enable multithreading
</span>6da2ae247c5 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 6da2ae247c5675a8783adf86a28b810af9342650
</span>Author: Ryan Schmidt <ryandesign@macports.org>
AuthorDate: Fri Jul 7 03:16:22 2023 -0500
<span style='display:block; white-space:pre;color:#404040;'> zpaq: fix crash on non-Intel; enable multithreading
</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/67552
</span>---
archivers/zpaq/Portfile | 8 +++++++-
archivers/zpaq/files/nojit.patch | 14 ++++++++++++++
2 files changed, 21 insertions(+), 1 deletion(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/archivers/zpaq/Portfile b/archivers/zpaq/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 543fa48b132..f07ad4000d5 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/archivers/zpaq/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/archivers/zpaq/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -5,7 +5,7 @@ PortGroup github 1.0
</span> PortGroup makefile 1.0
github.setup zpaq zpaq 7.15
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 1
</span> checksums rmd160 a8686308a5ffb9f4168f8afa6562b4c7b703b2c9 \
sha256 64280d86cd38ad5ebc1c6415b17eb09ee292078d772176b90e16287687191efe \
size 140057
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -34,6 +34,8 @@ long_description ${name} is a journaling archiver optimized for \
</span> homepage http://mattmahoney.net/dc/zpaq.html
github.tarball_from archive
<span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles nojit.patch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> makefile.override-append \
CXXFLAGS PREFIX
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -52,3 +54,7 @@ post-destroot {
</span> readme.txt \
${destroot}${docdir}
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+platform darwin {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.cppflags-append -DBSD
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/archivers/zpaq/files/nojit.patch b/archivers/zpaq/files/nojit.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..7fc272993b4
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/archivers/zpaq/files/nojit.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,14 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Disable JIT for non-Intel architectures since it only works on Intel.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- libzpaq.cpp.orig 2016-08-17 16:49:18.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ libzpaq.cpp 2023-07-07 02:46:59.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -28,6 +28,10 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <vector>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <stdio.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if !defined(__x86_64__) && !defined(__i386__)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#define NOJIT
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #ifdef unix
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #ifndef NOJIT
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <sys/mman.h>
</span></pre><pre style='margin:0'>
</pre>