| Message ID | 20250108154636.1431857-1-ross.burton@arm.com |
|---|---|
| State | Accepted, archived |
| Commit | 599e0fbf7d3dbbad0606143baa0ecccc510348ce |
| Headers | show |
| Series | [1/4] rsync: clean up configure/configure.sh fiddling | expand |
On Wed, 2025-01-08 at 15:46 +0000, Ross Burton via lists.openembedded.org wrote: > The upstream Makefiles tell autoconf to write the generated script to > configure.sh instead of the idiomatic configure. We now remove all of > the Makefile rules that refer to configure.sh (makefile-no-rebuild.patch) > but some pieces remained, so remove them too "so remove them too" - was there a piece of this patch missing? Cheers, Richard
On 10 Jan 2025, at 10:30, Richard Purdie <richard.purdie@linuxfoundation.org> wrote: > > On Wed, 2025-01-08 at 15:46 +0000, Ross Burton via lists.openembedded.org wrote: >> The upstream Makefiles tell autoconf to write the generated script to >> configure.sh instead of the idiomatic configure. We now remove all of >> the Makefile rules that refer to configure.sh (makefile-no-rebuild.patch) >> but some pieces remained, so remove them too > > "so remove them too" - was there a piece of this patch missing? No, I just failed to express myself clearly. Embarrassingly I rewrote this message three times already! What I meant is that I removed the configure/configure.sh workarounds, specifically: - rm -f ${S}/configure ${S}/configure.sh - cp -f ${S}/configure ${S}/configure.sh Ross
On Fri, 2025-01-10 at 12:18 +0000, Ross Burton wrote: > On 10 Jan 2025, at 10:30, Richard Purdie > <richard.purdie@linuxfoundation.org> wrote: > > > > On Wed, 2025-01-08 at 15:46 +0000, Ross Burton via > > lists.openembedded.org wrote: > > > The upstream Makefiles tell autoconf to write the generated > > > script to > > > configure.sh instead of the idiomatic configure. We now remove > > > all of > > > the Makefile rules that refer to configure.sh (makefile-no- > > > rebuild.patch) > > > but some pieces remained, so remove them too > > > > "so remove them too" - was there a piece of this patch missing? > > No, I just failed to express myself clearly. Embarrassingly I > rewrote this message three times already! > > What I meant is that I removed the configure/configure.sh > workarounds, specifically: > > - rm -f ${S}/configure ${S}/configure.sh > - cp -f ${S}/configure ${S}/configure.sh Thanks, I merged with a small tweak to the commit message. Cheers, Richard
diff --git a/meta/recipes-devtools/rsync/rsync_3.3.0.bb b/meta/recipes-devtools/rsync/rsync_3.3.0.bb index a90d2887bd5..c03bb270d41 100644 --- a/meta/recipes-devtools/rsync/rsync_3.3.0.bb +++ b/meta/recipes-devtools/rsync/rsync_3.3.0.bb @@ -18,6 +18,7 @@ SRC_URI = "https://download.samba.org/pub/${BPN}/src/${BP}.tar.gz \ " SRC_URI[sha256sum] = "7399e9a6708c32d678a72a63219e96f23be0be2336e50fd1348498d07041df90" +# Doesn't use automake inherit autotools-brokensep PACKAGECONFIG ??= "acl attr \ @@ -49,14 +50,10 @@ EXTRA_OECONF = "--disable-md2man --with-nobody-group=nogroup" #| If you can't fix the issue, re-run ./configure with --disable-roll-simd. EXTRA_OECONF:append:libc-musl = " --disable-roll-simd" -# rsync 3.0 uses configure.sh instead of configure, and -# makefile checks the existence of configure.sh +# rsync uses configure.sh instead of configure, so delete that file +# to avoid confusion as we will generate configure. do_configure:prepend () { - rm -f ${S}/configure ${S}/configure.sh -} - -do_configure:append () { - cp -f ${S}/configure ${S}/configure.sh + rm -f ${S}/configure.sh } do_install:append() {
The upstream Makefiles tell autoconf to write the generated script to configure.sh instead of the idiomatic configure. We now remove all of the Makefile rules that refer to configure.sh (makefile-no-rebuild.patch) but some pieces remained, so remove them too and delete the existing configure.sh to avoid confusion for anyone looking at the build treee. Also add a comment explaining why autotools-brokensep is used. Signed-off-by: Ross Burton <ross.burton@arm.com> --- meta/recipes-devtools/rsync/rsync_3.3.0.bb | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-)