summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'net-misc/rsync')
-rw-r--r--net-misc/rsync/files/rsync-3.2.4-notpedantic.patch25
-rw-r--r--net-misc/rsync/rsync-3.2.4-r3.ebuild1
2 files changed, 26 insertions, 0 deletions
diff --git a/net-misc/rsync/files/rsync-3.2.4-notpedantic.patch b/net-misc/rsync/files/rsync-3.2.4-notpedantic.patch
new file mode 100644
index 000000000000..9d081ab52c5b
--- /dev/null
+++ b/net-misc/rsync/files/rsync-3.2.4-notpedantic.patch
@@ -0,0 +1,25 @@
+diff -ruN rsync-3.2.4.orig/configure.ac rsync-3.2.4/configure.ac
+--- rsync-3.2.4.orig/configure.ac 2022-12-01 22:26:34.856659562 +0100
++++ rsync-3.2.4/configure.ac 2022-12-01 22:31:43.849290989 +0100
+@@ -1067,21 +1067,6 @@
+ with_included_popt=yes
+ fi
+
+-if test x"$GCC" = x"yes"; then
+- if test x"$with_included_popt" != x"yes"; then
+- # Turn pedantic warnings into errors to ensure an array-init overflow is an error.
+- CFLAGS="$CFLAGS -pedantic-errors"
+- else
+- # Our internal popt code cannot be compiled with pedantic warnings as errors, so try to
+- # turn off pedantic warnings (which will not lose the error for array-init overflow).
+- # Older gcc versions don't understand -Wno-pedantic, so check if --help=warnings lists
+- # -Wpedantic and use that as a flag.
+- case `$CC --help=warnings 2>/dev/null | grep Wpedantic` in
+- *-Wpedantic*) CFLAGS="$CFLAGS -pedantic-errors -Wno-pedantic" ;;
+- esac
+- fi
+-fi
+-
+ AC_MSG_CHECKING([whether to use included libpopt])
+ if test x"$with_included_popt" = x"yes"; then
+ AC_MSG_RESULT($srcdir/popt)
diff --git a/net-misc/rsync/rsync-3.2.4-r3.ebuild b/net-misc/rsync/rsync-3.2.4-r3.ebuild
index 41447f110e95..05ce39b226b0 100644
--- a/net-misc/rsync/rsync-3.2.4-r3.ebuild
+++ b/net-misc/rsync/rsync-3.2.4-r3.ebuild
@@ -70,6 +70,7 @@ PATCHES=(
"${FILESDIR}"/${P}-unsigned-char-checksum.patch
# https://github.com/WayneD/rsync/issues/324
"${FILESDIR}"/${P}-strlcpy.patch
+ "${FILESDIR}"/${P}-notpedantic.patch
)
pkg_setup() {