commit: 5ca721e9d86a6369573b7cd0595295b1e79c44be Author: Jory Pratt <anarchy <AT> gentoo <DOT> org> AuthorDate: Mon Jun 29 00:47:26 2020 +0000 Commit: Jory Pratt <anarchy <AT> gentoo <DOT> org> CommitDate: Mon Jun 29 00:47:26 2020 +0000 URL: https://gitweb.gentoo.org/proj/musl.git/commit/?id=5ca721e9
net-misc/rsync: use official patch from upstream, fix metadata Package-Manager: Portage-2.3.103, Repoman-2.3.23 Signed-off-by: Jory Pratt <anarchy <AT> gentoo.org> net-misc/rsync/files/rsync-3.2.0-simd_check.patch | 74 +++++++++++++++++++---- net-misc/rsync/metadata.xml | 2 + 2 files changed, 65 insertions(+), 11 deletions(-) diff --git a/net-misc/rsync/files/rsync-3.2.0-simd_check.patch b/net-misc/rsync/files/rsync-3.2.0-simd_check.patch index 255f279..11cf18a 100644 --- a/net-misc/rsync/files/rsync-3.2.0-simd_check.patch +++ b/net-misc/rsync/files/rsync-3.2.0-simd_check.patch @@ -1,13 +1,65 @@ -https://github.com/WayneD/rsync/pull/24 +From: Wayne Davison <wa...@opencoder.net> +Date: Sat, 20 Jun 2020 06:23:52 +0000 (-0700) +Subject: A slightly modified g++/clang++ check. +X-Git-Tag: v3.2.1pre1~43 +X-Git-Url: http://git.samba.org/rsync.git/?p=rsync.git;a=commitdiff_plain;h=d4764934c35bdff297a03551c583be611cb8c64c ---- rsync-3.2.0/configure.ac 2020-06-19 23:11:01.000000000 +0200 -+++ rsync-3.2.0/configure.ac 2020-06-19 23:11:01.000000000 +0200 -@@ -207,7 +207,7 @@ - if test x"$CXX" != x""; then - CXX_VERSION=`$CXX --version 2>/dev/null | head -n 1` - case "$CXX_VERSION" in +A slightly modified g++/clang++ check. +--- + +diff --git a/configure.ac b/configure.ac +index d665498d..f6ca5e66 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -204,30 +204,28 @@ if test x"$enable_simd" != x"no"; then + # For x86-64 SIMD, g++ >=5 or clang++ >=7 is required + if test x"$build_cpu" = x"x86_64"; then + CXX_OK= +- if test x"$CXX" != x""; then +- CXX_VERSION=`$CXX --version 2>/dev/null | head -n 1` +- case "$CXX_VERSION" in - g++*) -+ *g++*) - CXX_VERSION=`$CXX -dumpversion | sed 's/\..*//g'` - if test "$CXX_VERSION" -ge "5"; then - CXX_OK=yes +- CXX_VERSION=`$CXX -dumpversion | sed 's/\..*//g'` +- if test "$CXX_VERSION" -ge "5"; then +- CXX_OK=yes +- fi +- ;; +- *clang*) +- # $CXX -dumpversion would have been ideal, but is broken on older clang +- CXX_VERSION=`echo "$CXX_VERSION" | sed 's/.*version //g' | sed 's/\..*//g'` +- if test "$CXX_VERSION" -ge "7"; then +- CXX_OK=yes +- fi +- ;; +- *) +- CXX_VERSION='Unknown' +- ;; +- esac +- else ++ case "$CXX" in ++ g++|*-g++) ++ CXX_VERSION=`$CXX -dumpversion | sed 's/\..*//'` ++ if test "$CXX_VERSION" -ge "5"; then ++ CXX_OK=yes ++ fi ++ ;; ++ *clang*) ++ # -dumpversion is broken on older clang versions, so we need a fallback. ++ CXX_VERSION=`$CXX -dumpversion 2>/dev/null | sed 's/\..*//'` ++ if test x"$CXX_VERSION" = x; then ++ CXX_VERSION=`$CXX --version | head -n 1 | sed 's/.*version //' | sed 's/\..*//'` ++ fi ++ if test "$CXX_VERSION" -ge "7"; then ++ CXX_OK=yes ++ fi ++ ;; ++ *) + CXX='No c++' + CXX_VERSION='Unknown' +- fi ++ ;; ++ esac + if test x"$CXX_OK" = x"yes"; then + # AC_MSG_RESULT() is called below. + SIMD="$SIMD x86_64" + diff --git a/net-misc/rsync/metadata.xml b/net-misc/rsync/metadata.xml index 148a18e..1f39f54 100644 --- a/net-misc/rsync/metadata.xml +++ b/net-misc/rsync/metadata.xml @@ -10,5 +10,7 @@ </upstream> <use> <flag name="stunnel">Provide helper scripts for using rsync via >=net-misc/stunnel-4</flag> + <flag name="system-zlib">Use system zlib instead of bundled one. This is incompatible with older rsync releases!</flag> + <flag name="xxhash">Enable <pkg>dev-libs/xxhash</pkg> support for hashing</flag> </use> </pkgmetadata>
