rsync: remove upstream's rebuild logic
Upstream some well intended but broken logic to reimplement the rebuild functionality of automake. However this isn't out-of-tree safe and quite basic, which means if it ever does execute (say, configure.ac or aclocal.m4 is touched) then the build fails. As we delete ${B} and re-run autoreconf on every build this is redundant, so just delete it all. [ YOCTO #9445 ] (From OE-Core rev: ccc61cee8f097862640722abb9a9f53781efdac3) Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
parent
8d59d0679b
commit
88f41780ca
|
@ -0,0 +1,69 @@
|
|||
Remove the Makefile rules to reinvoke autoconf, they're not out-of-tree safe and
|
||||
generally overcomplicated, and we ensure that autoreconf is invoked if required.
|
||||
|
||||
Upstream-Status: Inappropriate
|
||||
Signed-off-by: Ross Burton <ross.burton@intel.com>
|
||||
|
||||
diff --git a/Makefile.in b/Makefile.in
|
||||
index 151247d..8f3fdb6 100644
|
||||
--- a/Makefile.in
|
||||
+++ b/Makefile.in
|
||||
@@ -141,58 +141,6 @@ gen: conf proto.h man
|
||||
gensend: gen
|
||||
rsync -aivzc $(GENFILES) $${SAMBA_HOST-samba.org}:/home/ftp/pub/rsync/generated-files/
|
||||
|
||||
-conf:
|
||||
- cd $(srcdir) && $(MAKE) -f prepare-source.mak conf
|
||||
-
|
||||
-aclocal.m4: $(srcdir)/m4/*.m4
|
||||
- aclocal -I $(srcdir)/m4
|
||||
-
|
||||
-configure.sh config.h.in: configure.ac aclocal.m4
|
||||
- @if test -f configure.sh; then cp -p configure.sh configure.sh.old; else touch configure.sh.old; fi
|
||||
- @if test -f config.h.in; then cp -p config.h.in config.h.in.old; else touch config.h.in.old; fi
|
||||
- autoconf -o configure.sh
|
||||
- autoheader && touch config.h.in
|
||||
- @if diff configure.sh configure.sh.old >/dev/null 2>&1; then \
|
||||
- echo "configure.sh is unchanged."; \
|
||||
- rm configure.sh.old; \
|
||||
- else \
|
||||
- echo "configure.sh has CHANGED."; \
|
||||
- fi
|
||||
- @if diff config.h.in config.h.in.old >/dev/null 2>&1; then \
|
||||
- echo "config.h.in is unchanged."; \
|
||||
- rm config.h.in.old; \
|
||||
- else \
|
||||
- echo "config.h.in has CHANGED."; \
|
||||
- fi
|
||||
- @if test -f configure.sh.old -o -f config.h.in.old; then \
|
||||
- if test "$(MAKECMDGOALS)" = reconfigure; then \
|
||||
- echo 'Continuing with "make reconfigure".'; \
|
||||
- else \
|
||||
- echo 'You may need to run:'; \
|
||||
- echo ' make reconfigure'; \
|
||||
- exit 1; \
|
||||
- fi \
|
||||
- fi
|
||||
-
|
||||
-reconfigure: configure.sh
|
||||
- ./config.status --recheck
|
||||
- ./config.status
|
||||
-
|
||||
-Makefile: Makefile.in config.status configure.sh config.h.in
|
||||
- @if test -f Makefile; then cp -p Makefile Makefile.old; else touch Makefile.old; fi
|
||||
- @./config.status
|
||||
- @if diff Makefile Makefile.old >/dev/null 2>&1; then \
|
||||
- echo "Makefile is unchanged."; \
|
||||
- rm Makefile.old; \
|
||||
- else \
|
||||
- if test "$(MAKECMDGOALS)" = reconfigure; then \
|
||||
- echo 'Continuing with "make reconfigure".'; \
|
||||
- else \
|
||||
- echo "Makefile updated -- rerun your make command."; \
|
||||
- exit 1; \
|
||||
- fi \
|
||||
- fi
|
||||
-
|
||||
rsync-ssl: $(srcdir)/rsync-ssl.in Makefile
|
||||
sed 's;\@bindir\@;$(bindir);g' <$(srcdir)/rsync-ssl.in >rsync-ssl
|
||||
@chmod +x rsync-ssl
|
|
@ -1,5 +1,7 @@
|
|||
require rsync.inc
|
||||
|
||||
SRC_URI += "file://makefile-no-rebuild.patch"
|
||||
|
||||
SRC_URI[md5sum] = "0f758d7e000c0f7f7d3792610fad70cb"
|
||||
SRC_URI[sha256sum] = "ecfa62a7fa3c4c18b9eccd8c16eaddee4bd308a76ea50b5c02a5840f09c0a1c2"
|
||||
|
||||
|
|
Loading…
Reference in New Issue