| Message ID | 20160614180734.8782-1-sbruno@freebsd.org (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On 06/14/2016 12:07 PM, Sean Bruno wrote: > The --quiet argument is not available on all operating systems. Use -s > instead to match the rest of the Makefile uses. This fixes a non-fatal > error seen on FreeBSD. > > Signed-off-by: Sean Bruno <sbruno@freebsd.org> > --- > Makefile | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) Reviewed-by: Eric Blake <eblake@redhat.com> See also my pending patch related to this code: https://lists.gnu.org/archive/html/qemu-devel/2016-06/msg02375.html if Paolo wants to pull in all the changes related to version generation in his next pull request. > > diff --git a/Makefile b/Makefile > index ed4032a..a7a356a 100644 > --- a/Makefile > +++ b/Makefile > @@ -185,7 +185,7 @@ qemu-version.h: FORCE > printf '""\n'; \ > fi; \ > fi) > $@.tmp) > - $(call quiet-command, cmp --quiet $@ $@.tmp || mv $@.tmp $@) > + $(call quiet-command, cmp -s $@ $@.tmp || mv $@.tmp $@) > > config-host.h: config-host.h-timestamp > config-host.h-timestamp: config-host.mak >
On Tue, 06/14 11:07, Sean Bruno wrote: > The --quiet argument is not available on all operating systems. Use -s > instead to match the rest of the Makefile uses. This fixes a non-fatal > error seen on FreeBSD. > > Signed-off-by: Sean Bruno <sbruno@freebsd.org> > --- > Makefile | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/Makefile b/Makefile > index ed4032a..a7a356a 100644 > --- a/Makefile > +++ b/Makefile > @@ -185,7 +185,7 @@ qemu-version.h: FORCE > printf '""\n'; \ > fi; \ > fi) > $@.tmp) > - $(call quiet-command, cmp --quiet $@ $@.tmp || mv $@.tmp $@) > + $(call quiet-command, cmp -s $@ $@.tmp || mv $@.tmp $@) > > config-host.h: config-host.h-timestamp > config-host.h-timestamp: config-host.mak > -- > 2.8.4 > > Reviewed-by: Fam Zheng <famz@redhat.com>
On 14/06/2016 20:07, Sean Bruno wrote: > The --quiet argument is not available on all operating systems. Use -s > instead to match the rest of the Makefile uses. This fixes a non-fatal > error seen on FreeBSD. > > Signed-off-by: Sean Bruno <sbruno@freebsd.org> > --- > Makefile | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/Makefile b/Makefile > index ed4032a..a7a356a 100644 > --- a/Makefile > +++ b/Makefile > @@ -185,7 +185,7 @@ qemu-version.h: FORCE > printf '""\n'; \ > fi; \ > fi) > $@.tmp) > - $(call quiet-command, cmp --quiet $@ $@.tmp || mv $@.tmp $@) > + $(call quiet-command, cmp -s $@ $@.tmp || mv $@.tmp $@) > > config-host.h: config-host.h-timestamp > config-host.h-timestamp: config-host.mak > Queued, thanks. Paolo
diff --git a/Makefile b/Makefile index ed4032a..a7a356a 100644 --- a/Makefile +++ b/Makefile @@ -185,7 +185,7 @@ qemu-version.h: FORCE printf '""\n'; \ fi; \ fi) > $@.tmp) - $(call quiet-command, cmp --quiet $@ $@.tmp || mv $@.tmp $@) + $(call quiet-command, cmp -s $@ $@.tmp || mv $@.tmp $@) config-host.h: config-host.h-timestamp config-host.h-timestamp: config-host.mak
The --quiet argument is not available on all operating systems. Use -s instead to match the rest of the Makefile uses. This fixes a non-fatal error seen on FreeBSD. Signed-off-by: Sean Bruno <sbruno@freebsd.org> --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)