# HG changeset patch
# User Keir Fraser <keir.fraser@xxxxxxxxxx>
# Date 1268672909 0
# Node ID c1f272c3a4411ac40c60c31f925c2cb56e76dc83
# Parent 257589edefb36f79b7ea63896ec5aa0a565c83d4
blktap/fs-back: Build fixes for Fedora 13
1. Some files use stat, mkfifo, mkdir etc. without including
sys/stat.h
2. Some programs link against libpthread without a -lpthread compile
option. The compile used to work if this library happened to be used
by one of the other libraries that was being linked against, but
Fedora 13 has stopped allowing this.
From: M A Young <m.a.young@xxxxxxxxxxxx>
Signed-off-by: Keir Fraser <keir.fraser@xxxxxxxxxx>
---
tools/blktap/drivers/Makefile | 2 +-
tools/blktap/drivers/blktapctrl.c | 1 +
tools/blktap/drivers/block-qcow2.c | 1 +
tools/blktap2/drivers/block-remus.c | 1 +
tools/blktap2/vhd/lib/libvhd.c | 1 +
tools/blktap2/vhd/lib/vhd-util-scan.c | 1 +
tools/fs-back/Makefile | 2 +-
7 files changed, 7 insertions(+), 2 deletions(-)
diff -r 257589edefb3 -r c1f272c3a441 tools/blktap/drivers/Makefile
--- a/tools/blktap/drivers/Makefile Mon Mar 15 13:25:30 2010 +0000
+++ b/tools/blktap/drivers/Makefile Mon Mar 15 17:08:29 2010 +0000
@@ -29,7 +29,7 @@ MEMSHRLIBS += $(MEMSHR_DIR)/libmemshr.a
MEMSHRLIBS += $(MEMSHR_DIR)/libmemshr.a
endif
-LDFLAGS_blktapctrl := $(LDFLAGS_libxenctrl) $(LDFLAGS_libxenstore)
$(MEMSHRLIBS) -L../lib -lblktap -lrt -lm
+LDFLAGS_blktapctrl := $(LDFLAGS_libxenctrl) $(LDFLAGS_libxenstore)
$(MEMSHRLIBS) -L../lib -lblktap -lrt -lm -lpthread
LDFLAGS_img := $(LIBAIO_DIR)/libaio.a $(CRYPT_LIB) -lpthread -lz
BLK-OBJS-y := block-aio.o
diff -r 257589edefb3 -r c1f272c3a441 tools/blktap/drivers/blktapctrl.c
--- a/tools/blktap/drivers/blktapctrl.c Mon Mar 15 13:25:30 2010 +0000
+++ b/tools/blktap/drivers/blktapctrl.c Mon Mar 15 17:08:29 2010 +0000
@@ -51,6 +51,7 @@
#include <sys/time.h>
#include <syslog.h>
#include <memshr.h>
+#include <sys/stat.h>
#include "blktaplib.h"
#include "blktapctrl.h"
diff -r 257589edefb3 -r c1f272c3a441 tools/blktap/drivers/block-qcow2.c
--- a/tools/blktap/drivers/block-qcow2.c Mon Mar 15 13:25:30 2010 +0000
+++ b/tools/blktap/drivers/block-qcow2.c Mon Mar 15 17:08:29 2010 +0000
@@ -30,6 +30,7 @@
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
+#include <sys/stat.h>
#include "tapdisk.h"
#include "tapaio.h"
diff -r 257589edefb3 -r c1f272c3a441 tools/blktap2/drivers/block-remus.c
--- a/tools/blktap2/drivers/block-remus.c Mon Mar 15 13:25:30 2010 +0000
+++ b/tools/blktap2/drivers/block-remus.c Mon Mar 15 17:08:29 2010 +0000
@@ -57,6 +57,7 @@
#include <sys/param.h>
#include <sys/sysctl.h>
#include <unistd.h>
+#include <sys/stat.h>
/* timeout for reads and writes in ms */
#define HEARTBEAT_MS 1000
diff -r 257589edefb3 -r c1f272c3a441 tools/blktap2/vhd/lib/libvhd.c
--- a/tools/blktap2/vhd/lib/libvhd.c Mon Mar 15 13:25:30 2010 +0000
+++ b/tools/blktap2/vhd/lib/libvhd.c Mon Mar 15 17:08:29 2010 +0000
@@ -36,6 +36,7 @@
#include <libgen.h>
#include <iconv.h>
#include <sys/mman.h>
+#include <sys/stat.h>
#include "libvhd.h"
#include "relative-path.h"
diff -r 257589edefb3 -r c1f272c3a441 tools/blktap2/vhd/lib/vhd-util-scan.c
--- a/tools/blktap2/vhd/lib/vhd-util-scan.c Mon Mar 15 13:25:30 2010 +0000
+++ b/tools/blktap2/vhd/lib/vhd-util-scan.c Mon Mar 15 17:08:29 2010 +0000
@@ -34,6 +34,7 @@
#include <unistd.h>
#include <fnmatch.h>
#include <libgen.h> /* for basename() */
+#include <sys/stat.h>
#include "list.h"
#include "libvhd.h"
diff -r 257589edefb3 -r c1f272c3a441 tools/fs-back/Makefile
--- a/tools/fs-back/Makefile Mon Mar 15 13:25:30 2010 +0000
+++ b/tools/fs-back/Makefile Mon Mar 15 17:08:29 2010 +0000
@@ -16,7 +16,7 @@ LIBS := -L. -L.. -L../lib
LIBS := -L. -L.. -L../lib
LIBS += $(LDFLAGS_libxenctrl)
LIBS += $(LDFLAGS_libxenstore)
-LIBS += -lrt
+LIBS += -lrt -lpthread
OBJS := fs-xenbus.o fs-ops.o
_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog
|
Home