From 7e9e23dbc07baacbcac1c2dbd654a1e126c483d9 Mon Sep 17 00:00:00 2001
From: jym <jym>
Date: Tue, 19 Jul 2011 18:54:11 +0000
Subject: - protect Xen's stdarg.h from multiple inclusion. - build fix for
 stdarg under NetBSD.

Both backported from upstream. Seems to be needed to build pkg under 5.99.x

http://xenbits.xensource.com/hg/xen-unstable.hg/file/a574bf2f5059/xen/include/xe
n/stdarg.h
---
 sysutils/xenkernel33/distinfo         |  3 ++-
 sysutils/xenkernel33/patches/patch-ae | 25 +++++++++++++++++++++++++
 2 files changed, 27 insertions(+), 1 deletion(-)
 create mode 100644 sysutils/xenkernel33/patches/patch-ae

(limited to 'sysutils')

diff --git a/sysutils/xenkernel33/distinfo b/sysutils/xenkernel33/distinfo
index 7f8dc1d5ad0..d983661ed96 100644
--- a/sysutils/xenkernel33/distinfo
+++ b/sysutils/xenkernel33/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.12 2011/04/04 09:07:06 hauke Exp $
+$NetBSD: distinfo,v 1.13 2011/07/19 18:54:11 jym Exp $
 
 SHA1 (xen-3.3.2.tar.gz) = 7f438e73ac81b25cf5e1570709e87001066bafe4
 RMD160 (xen-3.3.2.tar.gz) = 28faa56286f2a418e35dcba6079570ea871d6c7b
@@ -7,3 +7,4 @@ SHA1 (patch-aa) = 0d11c758ad0a0ca657bf2e0f89ca23ff67b76bb7
 SHA1 (patch-ab) = bba70c6a0f884a4bbfd2ce56e41ce0d649300edc
 SHA1 (patch-ac) = ed1dc87e4f1d80112befc63372bc91ee621f57e6
 SHA1 (patch-ad) = e53ac3abf2a6a10c60cf288b994b3cf52a0d6486
+SHA1 (patch-ae) = 37b1c8d6cc66983d971fe41654cc8cefde87104a
diff --git a/sysutils/xenkernel33/patches/patch-ae b/sysutils/xenkernel33/patches/patch-ae
new file mode 100644
index 00000000000..16636684ab2
--- /dev/null
+++ b/sysutils/xenkernel33/patches/patch-ae
@@ -0,0 +1,25 @@
+$NetBSD: patch-ae,v 1.1 2011/07/19 18:54:12 jym Exp $
+- protect Xen's stdarg.h from multiple inclusion.
+- build fix for stdarg under NetBSD.
+
+Both backported from upstream.
+
+http://xenbits.xensource.com/hg/xen-unstable.hg/file/a574bf2f5059/xen/include/xen/stdarg.h
+--- xen/include/xen/stdarg.h.orig	2009-08-06 12:56:43.000000000 +0000
++++ xen/include/xen/stdarg.h
+@@ -1,5 +1,15 @@
++#ifndef __XEN_STDARG_H__
++#define __XEN_STDARG_H__
++
+ #if defined(__OpenBSD__)
+ #  include "/usr/include/stdarg.h"
++#elif defined (__NetBSD__)
++   typedef __builtin_va_list va_list;
++#  define va_start(ap, last)    __builtin_stdarg_start((ap), (last))
++#  define va_end(ap)            __builtin_va_end(ap)
++#  define va_arg                __builtin_va_arg
+ #else
+ #  include <stdarg.h>
+ #endif
++
++#endif /* __XEN_STDARG_H__ */
-- 
cgit v1.2.3