summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@intel.com>2016-04-12 15:51:54 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-04-13 10:12:52 +0100
commit88f41780cad47b4340a6589e4e6d86722ab67aaa (patch)
tree99e4e8878059ec14fd26538219c81e6878d32c92 /meta
parent8d59d0679bb532321683ec6a6e223092618bd0d2 (diff)
downloadpoky-88f41780cad47b4340a6589e4e6d86722ab67aaa.tar.gz
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>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-devtools/rsync/files/makefile-no-rebuild.patch69
-rw-r--r--meta/recipes-devtools/rsync/rsync_3.1.2.bb2
2 files changed, 71 insertions, 0 deletions
diff --git a/meta/recipes-devtools/rsync/files/makefile-no-rebuild.patch b/meta/recipes-devtools/rsync/files/makefile-no-rebuild.patch
new file mode 100644
index 0000000000..3d27fe72cc
--- /dev/null
+++ b/meta/recipes-devtools/rsync/files/makefile-no-rebuild.patch
@@ -0,0 +1,69 @@
1Remove the Makefile rules to reinvoke autoconf, they're not out-of-tree safe and
2generally overcomplicated, and we ensure that autoreconf is invoked if required.
3
4Upstream-Status: Inappropriate
5Signed-off-by: Ross Burton <ross.burton@intel.com>
6
7diff --git a/Makefile.in b/Makefile.in
8index 151247d..8f3fdb6 100644
9--- a/Makefile.in
10+++ b/Makefile.in
11@@ -141,58 +141,6 @@ gen: conf proto.h man
12 gensend: gen
13 rsync -aivzc $(GENFILES) $${SAMBA_HOST-samba.org}:/home/ftp/pub/rsync/generated-files/
14
15-conf:
16- cd $(srcdir) && $(MAKE) -f prepare-source.mak conf
17-
18-aclocal.m4: $(srcdir)/m4/*.m4
19- aclocal -I $(srcdir)/m4
20-
21-configure.sh config.h.in: configure.ac aclocal.m4
22- @if test -f configure.sh; then cp -p configure.sh configure.sh.old; else touch configure.sh.old; fi
23- @if test -f config.h.in; then cp -p config.h.in config.h.in.old; else touch config.h.in.old; fi
24- autoconf -o configure.sh
25- autoheader && touch config.h.in
26- @if diff configure.sh configure.sh.old >/dev/null 2>&1; then \
27- echo "configure.sh is unchanged."; \
28- rm configure.sh.old; \
29- else \
30- echo "configure.sh has CHANGED."; \
31- fi
32- @if diff config.h.in config.h.in.old >/dev/null 2>&1; then \
33- echo "config.h.in is unchanged."; \
34- rm config.h.in.old; \
35- else \
36- echo "config.h.in has CHANGED."; \
37- fi
38- @if test -f configure.sh.old -o -f config.h.in.old; then \
39- if test "$(MAKECMDGOALS)" = reconfigure; then \
40- echo 'Continuing with "make reconfigure".'; \
41- else \
42- echo 'You may need to run:'; \
43- echo ' make reconfigure'; \
44- exit 1; \
45- fi \
46- fi
47-
48-reconfigure: configure.sh
49- ./config.status --recheck
50- ./config.status
51-
52-Makefile: Makefile.in config.status configure.sh config.h.in
53- @if test -f Makefile; then cp -p Makefile Makefile.old; else touch Makefile.old; fi
54- @./config.status
55- @if diff Makefile Makefile.old >/dev/null 2>&1; then \
56- echo "Makefile is unchanged."; \
57- rm Makefile.old; \
58- else \
59- if test "$(MAKECMDGOALS)" = reconfigure; then \
60- echo 'Continuing with "make reconfigure".'; \
61- else \
62- echo "Makefile updated -- rerun your make command."; \
63- exit 1; \
64- fi \
65- fi
66-
67 rsync-ssl: $(srcdir)/rsync-ssl.in Makefile
68 sed 's;\@bindir\@;$(bindir);g' <$(srcdir)/rsync-ssl.in >rsync-ssl
69 @chmod +x rsync-ssl
diff --git a/meta/recipes-devtools/rsync/rsync_3.1.2.bb b/meta/recipes-devtools/rsync/rsync_3.1.2.bb
index 4b91ac7774..9637ed4e77 100644
--- a/meta/recipes-devtools/rsync/rsync_3.1.2.bb
+++ b/meta/recipes-devtools/rsync/rsync_3.1.2.bb
@@ -1,5 +1,7 @@
1require rsync.inc 1require rsync.inc
2 2
3SRC_URI += "file://makefile-no-rebuild.patch"
4
3SRC_URI[md5sum] = "0f758d7e000c0f7f7d3792610fad70cb" 5SRC_URI[md5sum] = "0f758d7e000c0f7f7d3792610fad70cb"
4SRC_URI[sha256sum] = "ecfa62a7fa3c4c18b9eccd8c16eaddee4bd308a76ea50b5c02a5840f09c0a1c2" 6SRC_URI[sha256sum] = "ecfa62a7fa3c4c18b9eccd8c16eaddee4bd308a76ea50b5c02a5840f09c0a1c2"
5 7