diff options
Diffstat (limited to 'meta/recipes-devtools/rsync/files/makefile-no-rebuild.patch')
| -rw-r--r-- | meta/recipes-devtools/rsync/files/makefile-no-rebuild.patch | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/meta/recipes-devtools/rsync/files/makefile-no-rebuild.patch b/meta/recipes-devtools/rsync/files/makefile-no-rebuild.patch index 4ba7665280..0c9ce8b8e3 100644 --- a/meta/recipes-devtools/rsync/files/makefile-no-rebuild.patch +++ b/meta/recipes-devtools/rsync/files/makefile-no-rebuild.patch @@ -1,4 +1,4 @@ -From 1f29584e57f5fda09970c66f3b94f4720e09c1bb Mon Sep 17 00:00:00 2001 +From f446686c26c499e15ef17d495a93cfbc20e16090 Mon Sep 17 00:00:00 2001 From: Ross Burton <ross.burton@intel.com> Date: Tue, 12 Apr 2016 15:51:54 +0100 Subject: [PATCH] rsync: remove upstream's rebuild logic @@ -8,18 +8,17 @@ generally overcomplicated, and we ensure that autoreconf is invoked if required. Upstream-Status: Inappropriate Signed-off-by: Ross Burton <ross.burton@intel.com> - --- Makefile.in | 54 ----------------------------------------------------- 1 file changed, 54 deletions(-) diff --git a/Makefile.in b/Makefile.in -index 672fcc4..c12d8d4 100644 +index a1253e5..a084935 100644 --- a/Makefile.in +++ b/Makefile.in -@@ -168,60 +168,6 @@ gen: conf proto.h man - gensend: gen - rsync -aic $(GENFILES) $${SAMBA_HOST-samba.org}:/home/ftp/pub/rsync/generated-files/ +@@ -192,60 +192,6 @@ gensend: gen + fi + rsync -aic $(GENFILES) git-version.h $${SAMBA_HOST-samba.org}:/home/ftp/pub/rsync/generated-files/ || true -aclocal.m4: $(srcdir)/m4/*.m4 - aclocal -I $(srcdir)/m4 @@ -41,7 +40,7 @@ index 672fcc4..c12d8d4 100644 - else \ - echo "config.h.in has CHANGED."; \ - fi -- @if test -f configure.sh.old -o -f config.h.in.old; then \ +- @if test -f configure.sh.old || test -f config.h.in.old; then \ - if test "$(MAKECMDGOALS)" = reconfigure; then \ - echo 'Continuing with "make reconfigure".'; \ - else \ |