Message ID | 20221123194214.2317638-1-raj.khem@gmail.com |
---|---|
State | New |
Headers | show |
Series | rsync: Delete upstreamed patch | expand |
I think the more accurate description is not that the patch has been applied, but rather that upstream applied a different patch that makes this one unnecessary. Alex On Wed, 23 Nov 2022 at 20:42, Khem Raj <raj.khem@gmail.com> wrote: > > It has been applied upstream see > https://github.com/WayneD/rsync/commit/9a3449a3980421f84ac55498ba565bc112b20d6c > > Signed-off-by: Khem Raj <raj.khem@gmail.com> > --- > ...antic-errors-at-the-end-of-configure.patch | 44 ------------------- > meta/recipes-devtools/rsync/rsync_3.2.7.bb | 1 - > 2 files changed, 45 deletions(-) > delete mode 100644 meta/recipes-devtools/rsync/files/0001-Turn-on-pedantic-errors-at-the-end-of-configure.patch > > 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 @@ > -From e6321b0b456fca987b48d5ec7aba7e2826128e5f Mon Sep 17 00:00:00 2001 > -From: Paul Eggert <eggert@cs.ucla.edu> > -Date: Thu, 18 Aug 2022 07:46:28 -0700 > -Subject: [PATCH] Turn on -pedantic-errors at the end of 'configure' > - > -Problem reported by Khem Raj in: > -https://lists.gnu.org/r/autoconf-patches/2022-08/msg00009.html > -Upstream-Status: Submitted [https://lists.samba.org/archive/rsync/2022-August/032862.html] > - > ---- > - configure.ac | 20 ++++++++++++++++++++ > - 1 file changed, 20 insertions(+) > - > -diff --git a/configure.ac b/configure.ac > -index a2c9955..afabef0 100644 > ---- a/configure.ac > -+++ b/configure.ac > -@@ -1437,6 +1437,26 @@ case "$CC" in > - ;; > - esac > - > -+# Enable -pedantic-errors last, so that it doesn't mess up other > -+# 'configure' tests. For example, Autoconf uses empty function > -+# prototypes like 'int main () {}' which Clang 15's -pedantic-errors > -+# would reject. Generally it's not a good idea to try to run > -+# 'configure' itself with strict compiler checking. > -+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_CONFIG_FILES([Makefile lib/dummy zlib/dummy popt/dummy shconfig]) > - AC_OUTPUT > - > 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 \ > file://makefile-no-rebuild.patch \ > file://determism.patch \ > file://0001-Add-missing-prototypes-to-function-declarations.patch \ > - file://0001-Turn-on-pedantic-errors-at-the-end-of-configure.patch \ > " > SRC_URI[sha256sum] = "4e7d9d3f6ed10878c58c5fb724a67dacf4b6aac7340b13e488fb2dc41346f2bb" > > -- > 2.38.1 > > > -=-=-=-=-=-=-=-=-=-=-=- > Links: You receive all messages sent to this group. > View/Reply Online (#173725): https://lists.openembedded.org/g/openembedded-core/message/173725 > Mute This Topic: https://lists.openembedded.org/mt/95225031/1686489 > Group Owner: openembedded-core+owner@lists.openembedded.org > Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [alex.kanavin@gmail.com] > -=-=-=-=-=-=-=-=-=-=-=- >
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 @@ -From e6321b0b456fca987b48d5ec7aba7e2826128e5f Mon Sep 17 00:00:00 2001 -From: Paul Eggert <eggert@cs.ucla.edu> -Date: Thu, 18 Aug 2022 07:46:28 -0700 -Subject: [PATCH] Turn on -pedantic-errors at the end of 'configure' - -Problem reported by Khem Raj in: -https://lists.gnu.org/r/autoconf-patches/2022-08/msg00009.html -Upstream-Status: Submitted [https://lists.samba.org/archive/rsync/2022-August/032862.html] - ---- - configure.ac | 20 ++++++++++++++++++++ - 1 file changed, 20 insertions(+) - -diff --git a/configure.ac b/configure.ac -index a2c9955..afabef0 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -1437,6 +1437,26 @@ case "$CC" in - ;; - esac - -+# Enable -pedantic-errors last, so that it doesn't mess up other -+# 'configure' tests. For example, Autoconf uses empty function -+# prototypes like 'int main () {}' which Clang 15's -pedantic-errors -+# would reject. Generally it's not a good idea to try to run -+# 'configure' itself with strict compiler checking. -+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_CONFIG_FILES([Makefile lib/dummy zlib/dummy popt/dummy shconfig]) - AC_OUTPUT - 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 \ file://makefile-no-rebuild.patch \ file://determism.patch \ file://0001-Add-missing-prototypes-to-function-declarations.patch \ - file://0001-Turn-on-pedantic-errors-at-the-end-of-configure.patch \ " SRC_URI[sha256sum] = "4e7d9d3f6ed10878c58c5fb724a67dacf4b6aac7340b13e488fb2dc41346f2bb"
It has been applied upstream see https://github.com/WayneD/rsync/commit/9a3449a3980421f84ac55498ba565bc112b20d6c Signed-off-by: Khem Raj <raj.khem@gmail.com> --- ...antic-errors-at-the-end-of-configure.patch | 44 ------------------- meta/recipes-devtools/rsync/rsync_3.2.7.bb | 1 - 2 files changed, 45 deletions(-) delete mode 100644 meta/recipes-devtools/rsync/files/0001-Turn-on-pedantic-errors-at-the-end-of-configure.patch