From: Ross Burton <ross.burton@arm.com>
Date: Wed, 8 Jan 2025 15:46:33 +0000 (+0000)
Subject: rsync: clean up configure/configure.sh fiddling
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=599e0fbf7d3dbbad0606143baa0ecccc510348ce;p=thirdparty%2Fopenembedded%2Fopenembedded-core-contrib.git

rsync: clean up configure/configure.sh fiddling

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 the recipe configure changes 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>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---

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() {