On 17 March 2016 at 13:51, Peter Maydell <peter.mayd...@linaro.org> wrote: > On 17 March 2016 at 13:42, Daniel P. Berrange <berra...@redhat.com> wrote: >> The following changes since commit 8c4575472494a5dfedfe05e7b58ca9ce3872ad56: >> >> Merge remote-tracking branch 'remotes/ehabkost/tags/machine-pull-request' >> into staging (2016-03-17 08:52:58 +0000) >> >> are available in the git repository at: >> >> git://github.com/berrange/qemu tags/pull-qcrypto-2016-03-17-1 >> >> for you to fetch changes up to 0a3d53cfda6f200c84c13c3818017e56edc761ba: >> >> crypto: implement the LUKS block encryption format (2016-03-17 12:42:33 >> +0000) >> >> ---------------------------------------------------------------- >> Merge QCrypto 2016/03/17 v1 >> >> ---------------------------------------------------------------- > > This doesn't build on OSX, I'm afraid: > > /Users/pm215/src/qemu-for-merges/crypto/pbkdf.c:37:23: error: use of > undeclared identifier 'RUSAGE_THREAD' > if (getrusage(RUSAGE_THREAD, &start) < 0) { > ^ > /Users/pm215/src/qemu-for-merges/crypto/pbkdf.c:49:23: error: use of > undeclared identifier 'RUSAGE_THREAD' > if (getrusage(RUSAGE_THREAD, &end) < 0) { > ^
Also a w32 build failure: crypto/pbkdf.c:23:26: fatal error: sys/resource.h: No such file or directory #include <sys/resource.h> ^ thanks -- PMM