[PATCH] xen buildsystem: minor fixes

[PATCH] xen buildsystem: minor fixes

[Christoph Egger]

[-- Attachment #1: Type: text/plain, Size: 586 bytes --]


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

Signed-off-by: Christoph Egger <Christoph.Egger@amd.com>

-- 
---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

[-- Attachment #2: xen_build.diff --]
[-- Type: text/x-diff, Size: 1408 bytes --]

diff -r 0b13d9787622 config/NetBSD.mk
--- a/config/NetBSD.mk	Tue Mar 24 06:55:29 2009 +0000
+++ b/config/NetBSD.mk	Fri Mar 27 16:21:23 2009 +0100
@@ -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)
diff -r 0b13d9787622 config/StdGNU.mk
--- a/config/StdGNU.mk	Tue Mar 24 06:55:29 2009 +0000
+++ b/config/StdGNU.mk	Fri Mar 27 16:21:23 2009 +0100
@@ -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
diff -r 0b13d9787622 tools/Rules.mk
--- a/tools/Rules.mk	Tue Mar 24 06:55:29 2009 +0000
+++ b/tools/Rules.mk	Fri Mar 27 16:21:23 2009 +0100
@@ -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)

[-- Attachment #3: Type: text/plain, Size: 138 bytes --]

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

Re: [PATCH] xen buildsystem: minor fixes

[Keir Fraser]

On 27/03/2009 15:37, "Christoph Egger" <Christoph.Egger@amd.com> wrote:

> 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

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

Re: [PATCH] xen buildsystem: minor fixes

[Christoph Egger]

On Friday 27 March 2009 17:10:26 Keir Fraser wrote:
> On 27/03/2009 15:37, "Christoph Egger" <Christoph.Egger@amd.com> wrote:
> > 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.

> > - 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

-- 
---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

Re: [PATCH] xen buildsystem: minor fixes

[Keir Fraser]

On 27/03/2009 16:45, "Christoph Egger" <Christoph.Egger@amd.com> wrote:

>> 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