Re: [Qemu-devel] [PULL 00/45] Include reorganization + PCI patch queue

[Peter Maydell]

On 20 December 2012 00:54, Anthony Liguori <address@hidden> wrote:
> Paolo Bonzini <address@hidden> writes:
>
>> Anthony,
>>
>> The following changes since commit a8a826a3c3b8c8a1c4def0e9e22b46e78e6163a0:
>>
>>   exec: refactor cpu_restore_state (2012-12-16 08:35:24 +0000)
>>
>> are available in the git repository at:
>>
>>   git://github.com/bonzini/qemu.git header-dirs
>>
>> for you to fetch changes up to 394394a788cec72682750f855e5182de156026b4:
>>
>>   janitor: move remaining public headers to include/ (2012-12-17
>>   18:56:58 +0100)
>
> Pulled. Thanks.

This breaks building on my macos box, because qmp.o is no longer
built with the necessary include flags to pick up the gnutls includes.
Old build:

cc -I/Users/pm215/src/qemu/slirp -I. -I/Users/pm215/src/qemu
-I/Users/pm215/src/qemu/fpu -m64 -DOS_OBJECT_USE_OBJC=0 -arch x86_64
-D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE
-Wstrict-prototypes -Wredundant-decls -Wall -Wundef -Wwrite-strings
-Wmissing-prototypes -fno-strict-aliasing  -Wno-initializer-overrides
-fstack-protector-all -Wendif-labels -Wmissing-include-dirs
-Wempty-body -Wnested-externs -Wformat-security -Wformat-y2k
-Winit-self -Wignored-qualifiers -Wold-style-definition -Wtype-limits
-I/sw/include/libpng15   -I/opt/X11/include/pixman-1
-I/sw/include/glib-2.0 -I/sw/lib/glib-2.0/include -I/sw/include
-I/Users/pm215/src/qemu/include -MMD -MP -MT qmp.o -MF ./qmp.d -O2
-D_FORTIFY_SOURCE=2 -g  -c -o qmp.o qmp.c

New build:

cc -I. -I/Users/pm215/src/qemu -I/Users/pm215/src/qemu/include -m64
-DOS_OBJECT_USE_OBJC=0 -arch x86_64 -D_GNU_SOURCE
-D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -Wstrict-prototypes
-Wredundant-decls -Wall -Wundef -Wwrite-strings -Wmissing-prototypes
-fno-strict-aliasing  -Wno-initializer-overrides -fstack-protector-all
-Wendif-labels -Wmissing-include-dirs -Wempty-body -Wnested-externs
-Wformat-security -Wformat-y2k -Winit-self -Wignored-qualifiers
-Wold-style-definition -Wtype-limits -I/sw/include/libpng15
-I/opt/X11/include/pixman-1   -I. -I. -I/sw/include/glib-2.0
-I/sw/lib/glib-2.0/include -MMD -MP -MT qmp.o -MF ./qmp.d -O2
-D_FORTIFY_SOURCE=2 -g  -c -o qmp.o qmp.c
In file included from qmp.c:21:
In file included from ./ui/vnc.h:96:
./ui/vnc-tls.h:31:10: fatal error: 'gnutls/gnutls.h' file not found
#include <gnutls/gnutls.h>
         ^
1 error generated.

(-I/sw/include is missing, this is VNC_TLS_CFLAGS).

-- PMM