mirror of
https://git.proxmox.com/git/qemu
synced 2025-08-16 02:40:56 +00:00
Fix compilation of nbd on Solaris (Andreas Faerber)
Compilation of QEMU is currently broken on Solaris due to nbd's use of _IO and due to network libraries not being linked into qemu-img. The attached patch adds the appropriate libraries (copied from Makefile.target) and includes an additional Sun-specific header for _IO. With these fixes it compiles okay, on OpenSolaris snv_93 (amd64). Signed-off-by: Andreas Faerber <andreas.faerber@web.de> Signed-off-by: Anthony Liguori <aliguori@us.ibm.com> git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@4982 c046a42c-6fe2-441c-8c8c-71466251a162
This commit is contained in:
parent
0fd70f8f20
commit
7e00eb9b98
4
Makefile
4
Makefile
@ -24,6 +24,10 @@ endif
|
|||||||
|
|
||||||
LIBS+=$(AIOLIBS)
|
LIBS+=$(AIOLIBS)
|
||||||
|
|
||||||
|
ifdef CONFIG_SOLARIS
|
||||||
|
LIBS+=-lsocket -lnsl -lresolv
|
||||||
|
endif
|
||||||
|
|
||||||
all: $(TOOLS) $(DOCS) recurse-all
|
all: $(TOOLS) $(DOCS) recurse-all
|
||||||
|
|
||||||
SUBDIR_RULES=$(patsubst %,subdir-%, $(TARGET_DIRS))
|
SUBDIR_RULES=$(patsubst %,subdir-%, $(TARGET_DIRS))
|
||||||
|
3
nbd.c
3
nbd.c
@ -22,6 +22,9 @@
|
|||||||
#include <errno.h>
|
#include <errno.h>
|
||||||
#include <string.h>
|
#include <string.h>
|
||||||
#include <sys/ioctl.h>
|
#include <sys/ioctl.h>
|
||||||
|
#ifdef __sun__
|
||||||
|
#include <sys/ioccom.h>
|
||||||
|
#endif
|
||||||
#include <ctype.h>
|
#include <ctype.h>
|
||||||
#include <inttypes.h>
|
#include <inttypes.h>
|
||||||
#include <sys/socket.h>
|
#include <sys/socket.h>
|
||||||
|
Loading…
Reference in New Issue
Block a user