summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools/rsync
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2022-11-23 13:59:41 -0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2022-11-27 23:54:50 +0000
commit608f3fec55f9255a952a52e85f9e842b18bb5305 (patch)
treea1ae823ab80c514a57a320b429d68b7809ad08c1 /meta/recipes-devtools/rsync
parentc867f67bdb146b42cc2816314954096143124e49 (diff)
downloadpoky-608f3fec55f9255a952a52e85f9e842b18bb5305.tar.gz
rsync: Delete pedantic errors re-ordering patch
It has been fixed by removing the check upstream see https://github.com/WayneD/rsync/commit/9a3449a3980421f84ac55498ba565bc112b20d6c (From OE-Core rev: c6228b8371ea5c3c452db7b536948ae96d83844b) Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/rsync')
-rw-r--r--meta/recipes-devtools/rsync/files/0001-Turn-on-pedantic-errors-at-the-end-of-configure.patch44
-rw-r--r--meta/recipes-devtools/rsync/rsync_3.2.7.bb1
2 files changed, 0 insertions, 45 deletions
diff --git a/meta/recipes-devtools/rsync/files/0001-Turn-on-pedantic-errors-at-the-end-of-configure.patch b/meta/recipes-devtools/rsync/files/0001-Turn-on-pedantic-errors-at-the-end-of-configure.patch
deleted file mode 100644
index f11f13dd48..0000000000
--- a/meta/recipes-devtools/rsync/files/0001-Turn-on-pedantic-errors-at-the-end-of-configure.patch
+++ /dev/null
@@ -1,44 +0,0 @@
1From e6321b0b456fca987b48d5ec7aba7e2826128e5f Mon Sep 17 00:00:00 2001
2From: Paul Eggert <eggert@cs.ucla.edu>
3Date: Thu, 18 Aug 2022 07:46:28 -0700
4Subject: [PATCH] Turn on -pedantic-errors at the end of 'configure'
5
6Problem reported by Khem Raj in:
7https://lists.gnu.org/r/autoconf-patches/2022-08/msg00009.html
8Upstream-Status: Submitted [https://lists.samba.org/archive/rsync/2022-August/032862.html]
9
10---
11 configure.ac | 20 ++++++++++++++++++++
12 1 file changed, 20 insertions(+)
13
14diff --git a/configure.ac b/configure.ac
15index a2c9955..afabef0 100644
16--- a/configure.ac
17+++ b/configure.ac
18@@ -1437,6 +1437,26 @@ case "$CC" in
19 ;;
20 esac
21
22+# Enable -pedantic-errors last, so that it doesn't mess up other
23+# 'configure' tests. For example, Autoconf uses empty function
24+# prototypes like 'int main () {}' which Clang 15's -pedantic-errors
25+# would reject. Generally it's not a good idea to try to run
26+# 'configure' itself with strict compiler checking.
27+if test x"$GCC" = x"yes"; then
28+ if test x"$with_included_popt" != x"yes"; then
29+ # Turn pedantic warnings into errors to ensure an array-init overflow is an error.
30+ CFLAGS="$CFLAGS -pedantic-errors"
31+ else
32+ # Our internal popt code cannot be compiled with pedantic warnings as errors, so try to
33+ # turn off pedantic warnings (which will not lose the error for array-init overflow).
34+ # Older gcc versions don't understand -Wno-pedantic, so check if --help=warnings lists
35+ # -Wpedantic and use that as a flag.
36+ case `$CC --help=warnings 2>/dev/null | grep Wpedantic` in
37+ *-Wpedantic*) CFLAGS="$CFLAGS -pedantic-errors -Wno-pedantic" ;;
38+ esac
39+ fi
40+fi
41+
42 AC_CONFIG_FILES([Makefile lib/dummy zlib/dummy popt/dummy shconfig])
43 AC_OUTPUT
44
diff --git a/meta/recipes-devtools/rsync/rsync_3.2.7.bb b/meta/recipes-devtools/rsync/rsync_3.2.7.bb
index e52699d24f..19574bcb1c 100644
--- a/meta/recipes-devtools/rsync/rsync_3.2.7.bb
+++ b/meta/recipes-devtools/rsync/rsync_3.2.7.bb
@@ -15,7 +15,6 @@ SRC_URI = "https://download.samba.org/pub/${BPN}/src/${BP}.tar.gz \
15 file://makefile-no-rebuild.patch \ 15 file://makefile-no-rebuild.patch \
16 file://determism.patch \ 16 file://determism.patch \
17 file://0001-Add-missing-prototypes-to-function-declarations.patch \ 17 file://0001-Add-missing-prototypes-to-function-declarations.patch \
18 file://0001-Turn-on-pedantic-errors-at-the-end-of-configure.patch \
19 " 18 "
20SRC_URI[sha256sum] = "4e7d9d3f6ed10878c58c5fb724a67dacf4b6aac7340b13e488fb2dc41346f2bb" 19SRC_URI[sha256sum] = "4e7d9d3f6ed10878c58c5fb724a67dacf4b6aac7340b13e488fb2dc41346f2bb"
21 20