From mboxrd@z Thu Jan  1 00:00:00 1970
From: Christoph Egger <Christoph.Egger@amd.com>
Subject: [PATCH] xen buildsystem: minor fixes
Date: Fri, 27 Mar 2009 16:37:31 +0100
Message-ID: <200903271637.31648.Christoph.Egger@amd.com>
Mime-Version: 1.0
Content-Type: multipart/mixed; boundary="Boundary-00=_7KPzJExM/0tE+dW"
Return-path: <xen-devel-bounces@lists.xensource.com>
List-Unsubscribe: <http://lists.xensource.com/mailman/listinfo/xen-devel>,
	<mailto:xen-devel-request@lists.xensource.com?subject=unsubscribe>
List-Post: <mailto:xen-devel@lists.xensource.com>
List-Help: <mailto:xen-devel-request@lists.xensource.com?subject=help>
List-Subscribe: <http://lists.xensource.com/mailman/listinfo/xen-devel>,
	<mailto:xen-devel-request@lists.xensource.com?subject=subscribe>
Sender: xen-devel-bounces@lists.xensource.com
Errors-To: xen-devel-bounces@lists.xensource.com
To: xen-devel@lists.xensource.com
Cc: Keir Fraser <Keir.Fraser@eu.citrix.com>
List-Id: xen-devel@lists.xenproject.org

--Boundary-00=_7KPzJExM/0tE+dW
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline


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

--Boundary-00=_7KPzJExM/0tE+dW
Content-Type: text/x-diff; charset="us-ascii"; name="xen_build.diff"
Content-Transfer-Encoding: 7bit
Content-Disposition: attachment; filename="xen_build.diff"

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)

--Boundary-00=_7KPzJExM/0tE+dW
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

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

--Boundary-00=_7KPzJExM/0tE+dW--