[Xen-changelog] [xen-unstable] Fix non-portabilities in libflask.

[Xen patchbot-unstable <patchbot-unstable@xxxxxxxxxxxxxxxxxxx>]

# HG changeset patch
# User Keir Fraser <keir@xxxxxxxxxxxxx>
# Date 1191313740 -3600
# Node ID 1a04c799e20ea14be95e098358acf298d08acb79
# Parent  74e385194be40e56d3705ff943ff3afe3b8d5f66
Fix non-portabilities in libflask.
Signed-off-by: John Levon <john.levon@xxxxxxx>
---
 tools/flask/libflask/Makefile           |    2 +-
 tools/flask/libflask/include/flask_op.h |    2 +-
 tools/flask/loadpolicy/Makefile         |   11 +++++------
 3 files changed, 7 insertions(+), 8 deletions(-)

diff -r 74e385194be4 -r 1a04c799e20e tools/flask/libflask/Makefile
--- a/tools/flask/libflask/Makefile     Tue Oct 02 09:27:22 2007 +0100
+++ b/tools/flask/libflask/Makefile     Tue Oct 02 09:29:00 2007 +0100
@@ -60,6 +60,6 @@ libflask.so.$(MAJOR): libflask.so.$(MAJO
        ln -sf $< $@
 
 libflask.so.$(MAJOR).$(MINOR): $(PIC_OBJS)
-       $(CC) $(CFLAGS) $(LDFLAGS) -Wl,-soname -Wl,libflask.so.$(MAJOR) -shared 
-o $@ $^
+       $(CC) $(CFLAGS) $(LDFLAGS) -Wl,$(SONAME_LDFLAG) 
-Wl,libflask.so.$(MAJOR) $(SHLIB_CFLAGS) -o $@ $^
 
 -include $(DEPS)
diff -r 74e385194be4 -r 1a04c799e20e tools/flask/libflask/include/flask_op.h
--- a/tools/flask/libflask/include/flask_op.h   Tue Oct 02 09:27:22 2007 +0100
+++ b/tools/flask/libflask/include/flask_op.h   Tue Oct 02 09:29:00 2007 +0100
@@ -39,7 +39,7 @@ typedef struct flask_op {
 } flask_op_t;
 
 int flask_load(int xc_handle, char *buf, int size);
-int flask_context_to_sid(int xc_handle, char *buf, int size, u_int32_t *sid);
+int flask_context_to_sid(int xc_handle, char *buf, int size, uint32_t *sid);
 int flask_sid_to_context(int xc_handle, int sid, char *buf, int size);
 int do_flask_op(int xc_handle, flask_op_t *op);
 
diff -r 74e385194be4 -r 1a04c799e20e tools/flask/loadpolicy/Makefile
--- a/tools/flask/loadpolicy/Makefile   Tue Oct 02 09:27:22 2007 +0100
+++ b/tools/flask/loadpolicy/Makefile   Tue Oct 02 09:29:00 2007 +0100
@@ -1,11 +1,6 @@ XEN_ROOT=../../..
 XEN_ROOT=../../..
 include $(XEN_ROOT)/tools/Rules.mk
 XEN_LIBXC          = $(XEN_ROOT)/tools/libxc
-
-INSTALL         = install
-INSTALL_DATA    = $(INSTALL) -m0644
-INSTALL_PROG    = $(INSTALL) -m0755
-INSTALL_DIR     = $(INSTALL) -d -m0755
 
 LIBXC_ROOT = $(XEN_ROOT)/tools/libxc
 LIBFLASK_ROOT = $(XEN_ROOT)/tools/flask/libflask
@@ -28,13 +23,17 @@ TESTENV  = XENSTORED_ROOTDIR=$(TESTDIR) 
 TESTENV  = XENSTORED_ROOTDIR=$(TESTDIR) XENSTORED_RUNDIR=$(TESTDIR)
 
 CLIENTS := flask-loadpolicy
+CLIENTS_SRCS := $(patsubst flask-%,%.c,$(CLIENTS))
 CLIENTS_OBJS := $(patsubst flask-%,%.o,$(CLIENTS))
 
 .PHONY: all
 all: $(CLIENTS)
 
 $(CLIENTS): flask-%: %.o
-       $(LINK.o) $< $(LOADLIBES) $(LDLIBS) -L. -lflask -lxenctrl -o $@
+       $(CC) $(CFLAGS) $(LDFLAGS) $< $(LOADLIBES) $(LDLIBS) -L. -lflask 
-lxenctrl -o $@
+
+$(CLIENTS_OBJS): $(CLIENTS_SRCS)
+       $(COMPILE.c) -o $@ $<
 
 .PHONY: clean
 clean: 

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog