<pre style='margin:0'>
Perry E. Metzger (pmetzger) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/815d231e23039f491eaea1b7c52d20bb7f7ede5a">https://github.com/macports/macports-ports/commit/815d231e23039f491eaea1b7c52d20bb7f7ede5a</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 815d231 zstd: Update to 1.3.7
</span>815d231 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 815d231e23039f491eaea1b7c52d20bb7f7ede5a
</span>Author: Ryan Schmidt <ryandesign@macports.org>
AuthorDate: Fri Nov 16 04:00:18 2018 -0600
<span style='display:block; white-space:pre;color:#404040;'> zstd: Update to 1.3.7
</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/57597
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Add dependencies on lz4, xz, and zlib, which were previously linked
</span><span style='display:block; white-space:pre;color:#404040;'> opportunistically.
</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/56645
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Fix detection of pthread, lz4, xz, and zlib when building universal.
</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/56646
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Add a patch to fix compilation on i386.
</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/57544
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Enable tests.
</span>---
archivers/zstd/Portfile | 21 +++++++++++----
archivers/zstd/files/cpuid-i386.patch | 13 ++++++++++
archivers/zstd/files/universal.patch | 48 +++++++++++++++++++++++++++++++++++
3 files changed, 77 insertions(+), 5 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/archivers/zstd/Portfile b/archivers/zstd/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 4f27068..04ef06c 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/archivers/zstd/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/archivers/zstd/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -3,8 +3,11 @@
</span> PortSystem 1.0
PortGroup github 1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-github.setup facebook zstd 1.3.4 v
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.setup facebook zstd 1.3.7 v
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 33ea096c76751903d03dae809d852b9b470965f0 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 3277f236df0ca6edae01ae84e865470000c5a3484588fd5bc3d869877fd3573d \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 1813285
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> categories archivers devel
platforms darwin
license {BSD GPL-2}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -16,9 +19,14 @@ long_description Zstd, short for Zstandard, is a fast lossless compression \
</span> algorithm, targeting real-time compression scenarios at \
zlib-level and better compression ratios.
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 adf63ec9f17c52de9a3b052011df263f1e4eb59c \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 4b140e3a1688b6253ef78db0d6c24dbe08cb01dfd7719b162a8505528ef2ea05 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 2060274
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.tarball_from releases
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_lib port:lz4 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:xz \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:zlib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles cpuid-i386.patch \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ universal.patch
</span>
post-patch {
reinplace -W ${worksrcpath} "s/-Wvla //g" lib/Makefile programs/Makefile tests/Makefile tests/fuzz/Makefile
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -37,4 +45,7 @@ build.env-append CC="${configure.cc}" \
</span> LDFLAGS="${configure.ldflags} [get_canonical_archflags ld]" \
PREFIX="${prefix}"
<span style='display:block; white-space:pre;background:#e0ffe0;'>+test.run yes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+test.env-append {*}${build.env}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> destroot.env-append {*}${build.env}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/archivers/zstd/files/cpuid-i386.patch b/archivers/zstd/files/cpuid-i386.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..0df1859
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/archivers/zstd/files/cpuid-i386.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,13 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Fix build failure "Junk character 13" with old gcc on i386.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+https://github.com/facebook/zstd/pull/1418
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- lib/common/cpu.h.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ lib/common/cpu.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -78,7 +78,7 @@ MEM_STATIC ZSTD_cpuid_t ZSTD_cpuid(void) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ __asm__(
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "pushl %%ebx\n\t"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "cpuid\n\t"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- "movl %%ebx, %%eax\n\r"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ "movl %%ebx, %%eax\n\t"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "popl %%ebx"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ : "=a"(f7b), "=c"(f7c)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ : "a"(7), "c"(0)
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/archivers/zstd/files/universal.patch b/archivers/zstd/files/universal.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..8408cb0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/archivers/zstd/files/universal.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,48 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Fix feature detection with multiple -arch flags
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+When multiple -arch flags are used, the compiler invokes itself once for
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+each architecture. Apparently, input on stdin is consumed by the
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+compilation of the first arch and is no longer available to the
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+compilation of the second arch, which results in a build failure and the
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+potentially incorrect determination that a feature is not available. So
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+write the feature detection source to a file instead of using stdin.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+https://github.com/facebook/zstd/pull/1419
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- programs/Makefile.orig 2018-11-16 03:10:51.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ programs/Makefile 2018-11-16 03:32:43.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -91,7 +91,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # thread detection
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ NO_THREAD_MSG := ==> no threads, building without multithreading support
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-HAVE_PTHREAD := $(shell printf '\#include <pthread.h>\nint main(void) { return 0; }' | $(CC) $(FLAGS) -o have_pthread$(EXT) -x c - -pthread 2> $(VOID) && rm have_pthread$(EXT) && echo 1 || echo 0)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++HAVE_PTHREAD := $(shell printf '\#include <pthread.h>\nint main(void) { return 0; }' > have_pthread.c && $(CC) $(FLAGS) -o have_pthread$(EXT) have_pthread.c -pthread 2> $(VOID) && rm have_pthread$(EXT) && echo 1 || echo 0; rm have_pthread.c)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ HAVE_THREAD := $(shell [ "$(HAVE_PTHREAD)" -eq "1" -o -n "$(filter Windows%,$(OS))" ] && echo 1 || echo 0)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ifeq ($(HAVE_THREAD), 1)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ THREAD_MSG := ==> building with threading support
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -103,7 +103,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # zlib detection
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ NO_ZLIB_MSG := ==> no zlib, building zstd without .gz support
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-HAVE_ZLIB := $(shell printf '\#include <zlib.h>\nint main(void) { return 0; }' | $(CC) $(FLAGS) -o have_zlib$(EXT) -x c - -lz 2> $(VOID) && rm have_zlib$(EXT) && echo 1 || echo 0)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++HAVE_ZLIB := $(shell printf '\#include <zlib.h>\nint main(void) { return 0; }' > have_zlib.c && $(CC) $(FLAGS) -o have_zlib$(EXT) have_zlib.c -lz 2> $(VOID) && rm have_zlib$(EXT) && echo 1 || echo 0; rm have_zlib.c)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ifeq ($(HAVE_ZLIB), 1)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ZLIB_MSG := ==> building zstd with .gz compression support
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ZLIBCPP = -DZSTD_GZCOMPRESS -DZSTD_GZDECOMPRESS
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -114,7 +114,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # lzma detection
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ NO_LZMA_MSG := ==> no liblzma, building zstd without .xz/.lzma support
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-HAVE_LZMA := $(shell printf '\#include <lzma.h>\nint main(void) { return 0; }' | $(CC) $(FLAGS) -o have_lzma$(EXT) -x c - -llzma 2> $(VOID) && rm have_lzma$(EXT) && echo 1 || echo 0)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++HAVE_LZMA := $(shell printf '\#include <lzma.h>\nint main(void) { return 0; }' > have_lzma.c && $(CC) $(FLAGS) -o have_lzma$(EXT) have_lzma.c -llzma 2> $(VOID) && rm have_lzma$(EXT) && echo 1 || echo 0; rm have_lzma.c)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ifeq ($(HAVE_LZMA), 1)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ LZMA_MSG := ==> building zstd with .xz/.lzma compression support
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ LZMACPP = -DZSTD_LZMACOMPRESS -DZSTD_LZMADECOMPRESS
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -125,7 +125,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # lz4 detection
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ NO_LZ4_MSG := ==> no liblz4, building zstd without .lz4 support
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-HAVE_LZ4 := $(shell printf '\#include <lz4frame.h>\n\#include <lz4.h>\nint main(void) { return 0; }' | $(CC) $(FLAGS) -o have_lz4$(EXT) -x c - -llz4 2> $(VOID) && rm have_lz4$(EXT) && echo 1 || echo 0)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++HAVE_LZ4 := $(shell printf '\#include <lz4frame.h>\n\#include <lz4.h>\nint main(void) { return 0; }' > have_lz4.c && $(CC) $(FLAGS) -o have_lz4$(EXT) have_lz4.c -llz4 2> $(VOID) && rm have_lz4$(EXT) && echo 1 || echo 0; rm have_lz4.c)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ifeq ($(HAVE_LZ4), 1)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ LZ4_MSG := ==> building zstd with .lz4 compression support
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ LZ4CPP = -DZSTD_LZ4COMPRESS -DZSTD_LZ4DECOMPRESS
</span></pre><pre style='margin:0'>
</pre>