summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools/rsync/files/makefile-no-rebuild.patch
diff options
context:
space:
mode:
Diffstat (limited to 'meta/recipes-devtools/rsync/files/makefile-no-rebuild.patch')
-rw-r--r--meta/recipes-devtools/rsync/files/makefile-no-rebuild.patch79
1 files changed, 0 insertions, 79 deletions
diff --git a/meta/recipes-devtools/rsync/files/makefile-no-rebuild.patch b/meta/recipes-devtools/rsync/files/makefile-no-rebuild.patch
deleted file mode 100644
index 42af4c55d0..0000000000
--- a/meta/recipes-devtools/rsync/files/makefile-no-rebuild.patch
+++ /dev/null
@@ -1,79 +0,0 @@
1From 603e5862cca832ae925d0c92a8654a57caff5910 Mon Sep 17 00:00:00 2001
2From: Ross Burton <ross.burton@intel.com>
3Date: Tue, 12 Apr 2016 15:51:54 +0100
4Subject: [PATCH] rsync: remove upstream's rebuild logic
5
6Remove the Makefile rules to reinvoke autoconf, they're not out-of-tree safe and
7generally overcomplicated, and we ensure that autoreconf is invoked if required.
8
9Upstream-Status: Inappropriate
10Signed-off-by: Ross Burton <ross.burton@intel.com>
11---
12 Makefile.in | 54 -----------------------------------------------------
13 1 file changed, 54 deletions(-)
14
15diff --git a/Makefile.in b/Makefile.in
16index 7c75c26..1d13e8c 100644
17--- a/Makefile.in
18+++ b/Makefile.in
19@@ -184,60 +184,6 @@ conf: configure.sh config.h.in
20 .PHONY: gen
21 gen: conf proto.h man git-version.h
22
23-aclocal.m4: $(srcdir)/m4/*.m4
24- aclocal -I $(srcdir)/m4
25-
26-configure.sh config.h.in: configure.ac aclocal.m4
27- @if test -f configure.sh; then cp -p configure.sh configure.sh.old; else touch configure.sh.old; fi
28- @if test -f config.h.in; then cp -p config.h.in config.h.in.old; else touch config.h.in.old; fi
29- autoconf -o configure.sh
30- autoheader && touch config.h.in
31- @if diff configure.sh configure.sh.old >/dev/null 2>&1; then \
32- echo "configure.sh is unchanged."; \
33- rm configure.sh.old; \
34- else \
35- echo "configure.sh has CHANGED."; \
36- fi
37- @if diff config.h.in config.h.in.old >/dev/null 2>&1; then \
38- echo "config.h.in is unchanged."; \
39- rm config.h.in.old; \
40- else \
41- echo "config.h.in has CHANGED."; \
42- fi
43- @if test -f configure.sh.old || test -f config.h.in.old; then \
44- if test "$(MAKECMDGOALS)" = reconfigure; then \
45- echo 'Continuing with "make reconfigure".'; \
46- else \
47- echo 'You may need to run:'; \
48- echo ' make reconfigure'; \
49- exit 1; \
50- fi \
51- fi
52-
53-.PHONY: reconfigure
54-reconfigure: configure.sh
55- ./config.status --recheck
56- ./config.status
57-
58-.PHONY: restatus
59-restatus:
60- ./config.status
61-
62-Makefile: Makefile.in config.status configure.sh config.h.in
63- @if test -f Makefile; then cp -p Makefile Makefile.old; else touch Makefile.old; fi
64- @./config.status
65- @if diff Makefile Makefile.old >/dev/null 2>&1; then \
66- echo "Makefile is unchanged."; \
67- rm Makefile.old; \
68- else \
69- if test "$(MAKECMDGOALS)" = reconfigure; then \
70- echo 'Continuing with "make reconfigure".'; \
71- else \
72- echo "Makefile updated -- rerun your make command."; \
73- exit 1; \
74- fi \
75- fi
76-
77 stunnel-rsyncd.conf: $(srcdir)/stunnel-rsyncd.conf.in Makefile
78 sed 's;\@bindir\@;$(bindir);g' <$(srcdir)/stunnel-rsyncd.conf.in >stunnel-rsyncd.conf
79