# HG changeset patch
# User kfraser@xxxxxxxxxxxxxxxxxxxxx
# Node ID 729a6231de357327001bb9b19a6c1749bfc55781
# Parent b631e7885b5facfff91875e596c98d7b1d5e5fbf
[TOOLS] Provide common LFS CFLAGS/LDFLAGS additions in Rules.mk.
Signed-off-by: Keir Fraser <keir@xxxxxxxxxxxxx>
---
tools/Rules.mk | 5 +++++
tools/blktap/drivers/Makefile | 1 -
tools/blktap/lib/Makefile | 1 -
tools/ioemu/Makefile.target | 3 ++-
tools/libfsimage/Rules.mk | 2 +-
tools/libfsimage/common/Makefile | 2 +-
tools/misc/lomount/lomount.c | 2 --
tools/xentrace/Makefile | 2 +-
8 files changed, 10 insertions(+), 8 deletions(-)
diff -r b631e7885b5f -r 729a6231de35 tools/Rules.mk
--- a/tools/Rules.mk Fri Nov 17 09:18:28 2006 +0000
+++ b/tools/Rules.mk Fri Nov 17 09:54:48 2006 +0000
@@ -13,6 +13,11 @@ X11_LDPATH = -L/usr/X11R6/$(LIBDIR)
X11_LDPATH = -L/usr/X11R6/$(LIBDIR)
CFLAGS += -D__XEN_TOOLS__
+
+# Enable implicit LFS support *and* explicit LFS names.
+CFLAGS += $(shell getconf LFS_CFLAGS)
+CFLAGS += -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE
+LDFLAGS += $(shell getconf LFS_LDFLAGS)
%.opic: %.c
$(CC) $(CPPFLAGS) -DPIC $(CFLAGS) -fPIC -c -o $@ $<
diff -r b631e7885b5f -r 729a6231de35 tools/blktap/drivers/Makefile
--- a/tools/blktap/drivers/Makefile Fri Nov 17 09:18:28 2006 +0000
+++ b/tools/blktap/drivers/Makefile Fri Nov 17 09:54:48 2006 +0000
@@ -13,7 +13,6 @@ CFLAGS += -fno-strict-aliasing
CFLAGS += -fno-strict-aliasing
CFLAGS += -I $(XEN_LIBXC) -I $(LIBAIO_DIR)
CFLAGS += $(INCLUDES) -I. -I../../xenstore
-CFLAGS += -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE
CFLAGS += -D_GNU_SOURCE
# Get gcc to generate the dependencies for us.
diff -r b631e7885b5f -r 729a6231de35 tools/blktap/lib/Makefile
--- a/tools/blktap/lib/Makefile Fri Nov 17 09:18:28 2006 +0000
+++ b/tools/blktap/lib/Makefile Fri Nov 17 09:54:48 2006 +0000
@@ -17,7 +17,6 @@ CFLAGS += -Werror
CFLAGS += -Werror
CFLAGS += -Wno-unused
CFLAGS += -fno-strict-aliasing -fPIC
-CFLAGS += -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE
# get asprintf():
CFLAGS += -D _GNU_SOURCE
diff -r b631e7885b5f -r 729a6231de35 tools/ioemu/Makefile.target
--- a/tools/ioemu/Makefile.target Fri Nov 17 09:18:28 2006 +0000
+++ b/tools/ioemu/Makefile.target Fri Nov 17 09:54:48 2006 +0000
@@ -177,7 +177,8 @@ endif
#########################################################
-DEFINES+=-D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE
+DEFINES+=-D_GNU_SOURCE
+#-D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE
LIBS+=-lm
LIBS+=-L../../libxc -lxenctrl -lxenguest
LIBS+=-L../../xenstore -lxenstore
diff -r b631e7885b5f -r 729a6231de35 tools/libfsimage/Rules.mk
--- a/tools/libfsimage/Rules.mk Fri Nov 17 09:18:28 2006 +0000
+++ b/tools/libfsimage/Rules.mk Fri Nov 17 09:54:48 2006 +0000
@@ -2,7 +2,7 @@ include $(XEN_ROOT)/tools/Rules.mk
DEPS = .*.d
-CFLAGS += -I$(XEN_ROOT)/tools/libfsimage/common/ -Werror -D_LARGEFILE_SOURCE
-D_FILE_OFFSET_BITS=64 -Wp,-MD,.$(@F).d
+CFLAGS += -I$(XEN_ROOT)/tools/libfsimage/common/ -Werror -Wp,-MD,.$(@F).d
LDFLAGS += -L../common/
PIC_OBJS := $(patsubst %.c,%.opic,$(LIB_SRCS-y))
diff -r b631e7885b5f -r 729a6231de35 tools/libfsimage/common/Makefile
--- a/tools/libfsimage/common/Makefile Fri Nov 17 09:18:28 2006 +0000
+++ b/tools/libfsimage/common/Makefile Fri Nov 17 09:54:48 2006 +0000
@@ -4,7 +4,7 @@ MAJOR = 1.0
MAJOR = 1.0
MINOR = 0
-CFLAGS += -Werror -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 -Wp,-MD,.$(@F).d
+CFLAGS += -Werror -Wp,-MD,.$(@F).d
DEPS = .*.d
LDFLAGS-$(CONFIG_SunOS) = -Wl,-M -Wl,mapfile-SunOS
diff -r b631e7885b5f -r 729a6231de35 tools/misc/lomount/lomount.c
--- a/tools/misc/lomount/lomount.c Fri Nov 17 09:18:28 2006 +0000
+++ b/tools/misc/lomount/lomount.c Fri Nov 17 09:54:48 2006 +0000
@@ -44,8 +44,6 @@ enum
ERR_MOUNT // Other failure of mount command
};
-#define _LARGEFILE_SOURCE
-#define _FILE_OFFSET_BITS 64
#include <unistd.h>
#include <stdio.h>
#include <stdlib.h>
diff -r b631e7885b5f -r 729a6231de35 tools/xentrace/Makefile
--- a/tools/xentrace/Makefile Fri Nov 17 09:18:28 2006 +0000
+++ b/tools/xentrace/Makefile Fri Nov 17 09:54:48 2006 +0000
@@ -1,7 +1,7 @@ XEN_ROOT=../..
XEN_ROOT=../..
include $(XEN_ROOT)/tools/Rules.mk
-CFLAGS += -Werror -D_LARGEFILE64_SOURCE
+CFLAGS += -Werror
CFLAGS += -I $(XEN_XC)
CFLAGS += -I $(XEN_LIBXC)
_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog
|
Home