Skip to contentSkip to conversation

xen buildsystem: minor fixes

PATCH In review Christoph Egger 2 participants 4 messages Mar 27, 2009

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 xen buildsystem: minor fixes

Hi,

attached patch fixes
- one regression introduced in c/s 19399: don't prepend prefix twice
- getconf usage: NetBSD always had a 64bit off_t, so it's not needed. Eliminates prints of "unknown variable" to stderr during build

Signature · 6 lines
---to satisfy European Law for business letters:
Advanced Micro Devices GmbH
Karl-Hammerschmidt-Str. 34, 85609 Dornach b. Muenchen
Geschaeftsfuehrer: Jochen Polster, Thomas M. McCoy, Giuliano Meroni
Sitz: Dornach, Gemeinde Aschheim, Landkreis Muenchen
Registergericht Muenchen, HRB Nr. 43632
config/NetBSD.mk +1 -1
diff -r 0b13d9787622 config/NetBSD.mk
@@ -4,5 +4,5 @@ include $(XEN_ROOT)/config/StdGNU.mk
 CURSES_LIBS = -lcurses
 
 LIBLEAFDIR_x86_64 = lib
-LIBEXEC = $(PREFIX)/libexec
+LIBEXEC = libexec
 PRIVATE_BINDIR = $(BINDIR)
config/StdGNU.mk +1 -1
diff -r 0b13d9787622 config/StdGNU.mk
@@ -30,7 +30,7 @@ LIBLEAFDIR_x86_64 = lib64
 LIBDIR = $(PREFIX)/$(LIBLEAFDIR)
 LIBDIR_x86_32 = $(PREFIX)/$(LIBLEAFDIR_x86_32)
 LIBDIR_x86_64 = $(PREFIX)/$(LIBLEAFDIR_x86_64)
-LIBEXEC = $(LIBDIR_x86_32)/xen/bin
+LIBEXEC = $(LIBLEAFDIR_x86_32)/xen/bin
 MANDIR = $(PREFIX)/share/man
 MAN1DIR = $(MANDIR)/man1
 MAN8DIR = $(MANDIR)/man8
tools/Rules.mk +2 -0
diff -r 0b13d9787622 tools/Rules.mk
@@ -33,10 +33,12 @@ CFLAGS += -D__XEN_TOOLS__
 CFLAGS += -MMD -MF .$(@F).d
 DEPS = .*.d
 
+ifneq ($(XEN_OS),NetBSD)
 # 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)
+endif
 
 # 32-bit x86 does not perform well with -ve segment accesses on Xen.
 CFLAGS-$(CONFIG_X86_32) += $(call cc-option,$(CC),-mno-tls-direct-seg-refs)

_______________________________________________
Xen-devel mailing list
[email protected]
http://lists.xensource.com/xen-devel

#1 lore raw
Quoted 4 lines · Christoph Egger

i,

attached patch fixes
- one regression introduced in c/s 19399: don't prepend prefix twice

I think this patch breaks LIBEXEC, rather than fixing it. Point out how prefix gets prepended twice and I'll reconsider.

-- Keir

Quoted 2 lines

- getconf usage: NetBSD always had a 64bit off_t, so it's not needed. Eliminates prints of "unknown variable" to stderr during build

#2 lore raw
Quoted 10 lines · On Friday 27 March 2009 17:10:26 Keir Fraser wrote:
Quoted 4 lines · Christoph Egger

i,

attached patch fixes
- one regression introduced in c/s 19399: don't prepend prefix twice

I think this patch breaks LIBEXEC, rather than fixing it. Point out how prefix gets prepended twice and I'll reconsider.

-- Keir

Oh, right. Then my patch for xen-config.mak in ioemu's git tree is wrong. bindir just needs to be set to ${LIBEXEC} w/o any prefix.
Ian didn't apply it yet.

Quoted 2 lines
Quoted 2 lines

- getconf usage: NetBSD always had a 64bit off_t, so it's not needed. Eliminates prints of "unknown variable" to stderr during build

Please apply this part.

Christoph

Signature · 6 lines
---to satisfy European Law for business letters:
Advanced Micro Devices GmbH
Karl-Hammerschmidt-Str. 34, 85609 Dornach b. Muenchen
Geschaeftsfuehrer: Jochen Polster, Thomas M. McCoy, Giuliano Meroni
Sitz: Dornach, Gemeinde Aschheim, Landkreis Muenchen
Registergericht Muenchen, HRB Nr. 43632
#3 lore raw
Quoted 8 lines · Christoph Egger
Quoted 4 lines

I think this patch breaks LIBEXEC, rather than fixing it. Point out how prefix gets prepended twice and I'll reconsider.

-- Keir

Oh, right. Then my patch for xen-config.mak in ioemu's git tree is wrong. bindir just needs to be set to ${LIBEXEC} w/o any prefix.
Ian didn't apply it yet.

That would match with your usage of LIBEXEC in the stubdom Makefile, yes.

-- Keir