diff options
| author | tnn <tnn@pkgsrc.org> | 2011-05-07 07:11:22 +0000 |
|---|---|---|
| committer | tnn <tnn@pkgsrc.org> | 2011-05-07 07:11:22 +0000 |
| commit | 11bf1416c453ceb4325dd3b4200a3823f0a14fd5 (patch) | |
| tree | 4b7f5b49ec66a39b492526f7f21f903047daeba9 | |
| parent | bd88ad73c9243bd3a2981eaebbce5b593951eed6 (diff) | |
| download | pkgsrc-11bf1416c453ceb4325dd3b4200a3823f0a14fd5.tar.gz | |
xenkernel41 didn't build on current/amd64.
It uses -nostdinc and tries to use #include <stdarg.h> through
a local copy of stdarg.h, which can't work.
Fixed this by putting the relevant builtin stdarg definitions for
NetBSD in the local copy.
| -rw-r--r-- | sysutils/xenkernel41/distinfo | 4 | ||||
| -rw-r--r-- | sysutils/xenkernel41/patches/patch-xen_common_libelf_libelf-loader.c | 13 | ||||
| -rw-r--r-- | sysutils/xenkernel41/patches/patch-xen_include_xen_stdarg.h | 18 |
3 files changed, 34 insertions, 1 deletions
diff --git a/sysutils/xenkernel41/distinfo b/sysutils/xenkernel41/distinfo index a1650c68083..ec638bef30a 100644 --- a/sysutils/xenkernel41/distinfo +++ b/sysutils/xenkernel41/distinfo @@ -1,6 +1,8 @@ -$NetBSD: distinfo,v 1.1.1.1 2011/04/06 09:05:53 cegger Exp $ +$NetBSD: distinfo,v 1.2 2011/05/07 07:11:22 tnn Exp $ SHA1 (xen-4.1.0.tar.gz) = 4295e67524746ce155ff991db5fd2a611be27f67 RMD160 (xen-4.1.0.tar.gz) = e9ef987b24503d6c993bccfd203be5af9f104f48 Size (xen-4.1.0.tar.gz) = 10348539 bytes SHA1 (patch-aa) = a93592a78fd7050aee9d522e22cec182d75bbbfa +SHA1 (patch-xen_common_libelf_libelf-loader.c) = a38b484080115077cfb12bcfff8bad642e9413ee +SHA1 (patch-xen_include_xen_stdarg.h) = 26975533b5b63a2b9d559b9ab2018a4609767e26 diff --git a/sysutils/xenkernel41/patches/patch-xen_common_libelf_libelf-loader.c b/sysutils/xenkernel41/patches/patch-xen_common_libelf_libelf-loader.c new file mode 100644 index 00000000000..6747c44ee3a --- /dev/null +++ b/sysutils/xenkernel41/patches/patch-xen_common_libelf_libelf-loader.c @@ -0,0 +1,13 @@ +$NetBSD: patch-xen_common_libelf_libelf-loader.c,v 1.1 2011/05/07 07:11:22 tnn Exp $ + +--- xen/common/libelf/libelf-loader.c.orig 2011-03-25 10:43:00.000000000 +0000 ++++ xen/common/libelf/libelf-loader.c +@@ -16,7 +16,7 @@ + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +-#include <stdarg.h> ++#include "../../include/xen/stdarg.h" + + #include "libelf-private.h" + diff --git a/sysutils/xenkernel41/patches/patch-xen_include_xen_stdarg.h b/sysutils/xenkernel41/patches/patch-xen_include_xen_stdarg.h new file mode 100644 index 00000000000..efdaff0f6d2 --- /dev/null +++ b/sysutils/xenkernel41/patches/patch-xen_include_xen_stdarg.h @@ -0,0 +1,18 @@ +$NetBSD: patch-xen_include_xen_stdarg.h,v 1.1 2011/05/07 07:11:22 tnn Exp $ + +--- xen/include/xen/stdarg.h.orig 2011-03-25 10:43:01.000000000 +0000 ++++ xen/include/xen/stdarg.h +@@ -1,5 +1,13 @@ ++#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_ */ |