Message ID | 20200322171635.678219-2-marcandre.lureau@redhat.com |
---|---|
State | New |
Headers | show |
Series | [PULL,v3,1/1] slirp: update submodule to v4.2.0+ | expand |
Marc-André Lureau <marcandre.lureau@redhat.com> writes: > git shortlog > 126c04acbabd7ad32c2b018fe10dfac2a3bc1210..55ab21c9a36852915b81f1b41ebaf3b6509dd8ba > <snip> > build-sys: make libslirp-version.h depend on Makefile FWIW I ran into a build error when I updated to the latest tree. It was failing while building version.o. In the end I tracked it down to a duplicate of slirp/src/libslirp-version.h (one in the build tree and one in the src tree). I didn't spot it for a while because git was telling me the tree was clean because of .gitignore: /src/libslirp-version.h Is this stale now? Is slirp always built out of tree?
Hi On Mon, Mar 23, 2020 at 12:40 PM Alex Bennée <alex.bennee@linaro.org> wrote: > > > Marc-André Lureau <marcandre.lureau@redhat.com> writes: > > > git shortlog > > 126c04acbabd7ad32c2b018fe10dfac2a3bc1210..55ab21c9a36852915b81f1b41ebaf3b6509dd8ba > > > <snip> > > build-sys: make libslirp-version.h depend on Makefile > > FWIW I ran into a build error when I updated to the latest tree. It was > failing while building version.o. In the end I tracked it down to a > duplicate of slirp/src/libslirp-version.h (one in the build tree and one > in the src tree). I didn't spot it for a while because git was telling > me the tree was clean because of .gitignore: > > /src/libslirp-version.h > > Is this stale now? Is slirp always built out of tree? > The rule to build libslirp-version.h hasn't changed much: https://gitlab.freedesktop.org/slirp/libslirp/-/blob/master/Makefile#L26 I think this means that at some point, you built qemu/slirp in tree, and /src/libslirp-version.h was left, conflicting with out-of-tree version.
diff --git a/slirp b/slirp index 126c04acba..55ab21c9a3 160000 --- a/slirp +++ b/slirp @@ -1 +1 @@ -Subproject commit 126c04acbabd7ad32c2b018fe10dfac2a3bc1210 +Subproject commit 55ab21c9a36852915b81f1b41ebaf3b6509dd8ba