Gentoo Archives: gentoo-commits

From: Jory Pratt <anarchy@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/musl:master commit in: net-misc/rsync/, net-misc/rsync/files/
Date: Mon, 29 Jun 2020 00:47:34
Message-Id: 1593391646.5ca721e9d86a6369573b7cd0595295b1e79c44be.anarchy@gentoo
1 commit: 5ca721e9d86a6369573b7cd0595295b1e79c44be
2 Author: Jory Pratt <anarchy <AT> gentoo <DOT> org>
3 AuthorDate: Mon Jun 29 00:47:26 2020 +0000
4 Commit: Jory Pratt <anarchy <AT> gentoo <DOT> org>
5 CommitDate: Mon Jun 29 00:47:26 2020 +0000
6 URL: https://gitweb.gentoo.org/proj/musl.git/commit/?id=5ca721e9
7
8 net-misc/rsync: use official patch from upstream, fix metadata
9
10 Package-Manager: Portage-2.3.103, Repoman-2.3.23
11 Signed-off-by: Jory Pratt <anarchy <AT> gentoo.org>
12
13 net-misc/rsync/files/rsync-3.2.0-simd_check.patch | 74 +++++++++++++++++++----
14 net-misc/rsync/metadata.xml | 2 +
15 2 files changed, 65 insertions(+), 11 deletions(-)
16
17 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
18 index 255f279..11cf18a 100644
19 --- a/net-misc/rsync/files/rsync-3.2.0-simd_check.patch
20 +++ b/net-misc/rsync/files/rsync-3.2.0-simd_check.patch
21 @@ -1,13 +1,65 @@
22 -https://github.com/WayneD/rsync/pull/24
23 +From: Wayne Davison <wayne@×××××××××.net>
24 +Date: Sat, 20 Jun 2020 06:23:52 +0000 (-0700)
25 +Subject: A slightly modified g++/clang++ check.
26 +X-Git-Tag: v3.2.1pre1~43
27 +X-Git-Url: http://git.samba.org/rsync.git/?p=rsync.git;a=commitdiff_plain;h=d4764934c35bdff297a03551c583be611cb8c64c
28
29 ---- rsync-3.2.0/configure.ac 2020-06-19 23:11:01.000000000 +0200
30 -+++ rsync-3.2.0/configure.ac 2020-06-19 23:11:01.000000000 +0200
31 -@@ -207,7 +207,7 @@
32 - if test x"$CXX" != x""; then
33 - CXX_VERSION=`$CXX --version 2>/dev/null | head -n 1`
34 - case "$CXX_VERSION" in
35 +A slightly modified g++/clang++ check.
36 +---
37 +
38 +diff --git a/configure.ac b/configure.ac
39 +index d665498d..f6ca5e66 100644
40 +--- a/configure.ac
41 ++++ b/configure.ac
42 +@@ -204,30 +204,28 @@ if test x"$enable_simd" != x"no"; then
43 + # For x86-64 SIMD, g++ >=5 or clang++ >=7 is required
44 + if test x"$build_cpu" = x"x86_64"; then
45 + CXX_OK=
46 +- if test x"$CXX" != x""; then
47 +- CXX_VERSION=`$CXX --version 2>/dev/null | head -n 1`
48 +- case "$CXX_VERSION" in
49 - g++*)
50 -+ *g++*)
51 - CXX_VERSION=`$CXX -dumpversion | sed 's/\..*//g'`
52 - if test "$CXX_VERSION" -ge "5"; then
53 - CXX_OK=yes
54 +- CXX_VERSION=`$CXX -dumpversion | sed 's/\..*//g'`
55 +- if test "$CXX_VERSION" -ge "5"; then
56 +- CXX_OK=yes
57 +- fi
58 +- ;;
59 +- *clang*)
60 +- # $CXX -dumpversion would have been ideal, but is broken on older clang
61 +- CXX_VERSION=`echo "$CXX_VERSION" | sed 's/.*version //g' | sed 's/\..*//g'`
62 +- if test "$CXX_VERSION" -ge "7"; then
63 +- CXX_OK=yes
64 +- fi
65 +- ;;
66 +- *)
67 +- CXX_VERSION='Unknown'
68 +- ;;
69 +- esac
70 +- else
71 ++ case "$CXX" in
72 ++ g++|*-g++)
73 ++ CXX_VERSION=`$CXX -dumpversion | sed 's/\..*//'`
74 ++ if test "$CXX_VERSION" -ge "5"; then
75 ++ CXX_OK=yes
76 ++ fi
77 ++ ;;
78 ++ *clang*)
79 ++ # -dumpversion is broken on older clang versions, so we need a fallback.
80 ++ CXX_VERSION=`$CXX -dumpversion 2>/dev/null | sed 's/\..*//'`
81 ++ if test x"$CXX_VERSION" = x; then
82 ++ CXX_VERSION=`$CXX --version | head -n 1 | sed 's/.*version //' | sed 's/\..*//'`
83 ++ fi
84 ++ if test "$CXX_VERSION" -ge "7"; then
85 ++ CXX_OK=yes
86 ++ fi
87 ++ ;;
88 ++ *)
89 + CXX='No c++'
90 + CXX_VERSION='Unknown'
91 +- fi
92 ++ ;;
93 ++ esac
94 + if test x"$CXX_OK" = x"yes"; then
95 + # AC_MSG_RESULT() is called below.
96 + SIMD="$SIMD x86_64"
97 +
98
99 diff --git a/net-misc/rsync/metadata.xml b/net-misc/rsync/metadata.xml
100 index 148a18e..1f39f54 100644
101 --- a/net-misc/rsync/metadata.xml
102 +++ b/net-misc/rsync/metadata.xml
103 @@ -10,5 +10,7 @@
104 </upstream>
105 <use>
106 <flag name="stunnel">Provide helper scripts for using rsync via &gt;=net-misc/stunnel-4</flag>
107 + <flag name="system-zlib">Use system zlib instead of bundled one. This is incompatible with older rsync releases!</flag>
108 + <flag name="xxhash">Enable <pkg>dev-libs/xxhash</pkg> support for hashing</flag>
109 </use>
110 </pkgmetadata>