diff options
| author | jmcneill <jmcneill> | 2011-10-29 10:20:52 +0000 |
|---|---|---|
| committer | jmcneill <jmcneill> | 2011-10-29 10:20:52 +0000 |
| commit | 8d888921864499d98f29202b7fdbeb9fe60da377 (patch) | |
| tree | 2b2fcc960735b1c6ef21749dad3945bd7f75f5d3 /sysutils | |
| parent | abbd316c404fa18acf4eeaf6d4e6cea1a4c1a367 (diff) | |
| download | pkgsrc-8d888921864499d98f29202b7fdbeb9fe60da377.tar.gz | |
Fix build for 32-bit hosts with a 64-bit time_t
Diffstat (limited to 'sysutils')
| -rw-r--r-- | sysutils/xentools41/distinfo | 3 | ||||
| -rw-r--r-- | sysutils/xentools41/patches/patch-tools_libxl_libxl_create.c | 40 |
2 files changed, 42 insertions, 1 deletions
diff --git a/sysutils/xentools41/distinfo b/sysutils/xentools41/distinfo index 0845d491405..34a0e3d2270 100644 --- a/sysutils/xentools41/distinfo +++ b/sysutils/xentools41/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.12 2011/10/28 11:31:29 bouyer Exp $ +$NetBSD: distinfo,v 1.13 2011/10/29 10:20:52 jmcneill Exp $ SHA1 (ipxe-git-v1.0.0.tar.gz) = da052c8de5f3485fe0253c19cf52ed6d72528485 RMD160 (ipxe-git-v1.0.0.tar.gz) = dcd9b6eaafa1ce05c1ebf2a15f2f73ad7a8c5547 @@ -36,4 +36,5 @@ SHA1 (patch-dd) = e66d9cc0028ba922b050fc142862b4095cd018f3 SHA1 (patch-de) = fae94b61a430a1a7dd98c9a6a04e4513824c6d8d SHA1 (patch-ocaml-include-path) = 959df25b0aae78d525b25f223190203d3c1185a6 SHA1 (patch-qemu-phy-devices) = fef90e50ef0a58db2f2b49b6c23218f371791de5 +SHA1 (patch-tools_libxl_libxl_create.c) = f53d195026f8268ec424508df351714477409dad SHA1 (patch-xenstore_Makefile) = 4fa0ed7b76a96011c3cca9c5017be4b5151489f7 diff --git a/sysutils/xentools41/patches/patch-tools_libxl_libxl_create.c b/sysutils/xentools41/patches/patch-tools_libxl_libxl_create.c new file mode 100644 index 00000000000..c1558487a6c --- /dev/null +++ b/sysutils/xentools41/patches/patch-tools_libxl_libxl_create.c @@ -0,0 +1,40 @@ +$NetBSD: patch-tools_libxl_libxl_create.c,v 1.1 2011/10/29 10:20:52 jmcneill Exp $ + +--- tools/libxl/libxl_create.c.orig 2011-10-20 17:05:42.000000000 +0000 ++++ tools/libxl/libxl_create.c +@@ -171,7 +171,7 @@ int libxl__domain_build(libxl_ctx *ctx, + vments[2] = "image/ostype"; + vments[3] = "hvm"; + vments[4] = "start_time"; +- vments[5] = libxl__sprintf(&gc, "%lu.%02d", start_time.tv_sec,(int)start_time.tv_usec/10000); ++ vments[5] = libxl__sprintf(&gc, "%llu.%02d", (unsigned long long)start_time.tv_sec,(int)start_time.tv_usec/10000); + } else { + ret = libxl__build_pv(ctx, domid, info, state); + if (ret) +@@ -184,7 +184,7 @@ int libxl__domain_build(libxl_ctx *ctx, + vments[i++] = "image/kernel"; + vments[i++] = (char*) info->kernel.path; + vments[i++] = "start_time"; +- vments[i++] = libxl__sprintf(&gc, "%lu.%02d", start_time.tv_sec,(int)start_time.tv_usec/10000); ++ vments[i++] = libxl__sprintf(&gc, "%llu.%02d", (unsigned long long)start_time.tv_sec,(int)start_time.tv_usec/10000); + if (info->u.pv.ramdisk.path) { + vments[i++] = "image/ramdisk"; + vments[i++] = (char*) info->u.pv.ramdisk.path; +@@ -227,7 +227,7 @@ static int domain_restore(libxl_ctx *ctx + vments[2] = "image/ostype"; + vments[3] = "hvm"; + vments[4] = "start_time"; +- vments[5] = libxl__sprintf(&gc, "%lu.%02d", start_time.tv_sec,(int)start_time.tv_usec/10000); ++ vments[5] = libxl__sprintf(&gc, "%llu.%02d", (unsigned long long)start_time.tv_sec,(int)start_time.tv_usec/10000); + } else { + vments = libxl__calloc(&gc, 11, sizeof(char *)); + i = 0; +@@ -236,7 +236,7 @@ static int domain_restore(libxl_ctx *ctx + vments[i++] = "image/kernel"; + vments[i++] = (char*) info->kernel.path; + vments[i++] = "start_time"; +- vments[i++] = libxl__sprintf(&gc, "%lu.%02d", start_time.tv_sec,(int)start_time.tv_usec/10000); ++ vments[i++] = libxl__sprintf(&gc, "%llu.%02d", (unsigned long long)start_time.tv_sec,(int)start_time.tv_usec/10000); + if (info->u.pv.ramdisk.path) { + vments[i++] = "image/ramdisk"; + vments[i++] = (char*) info->u.pv.ramdisk.path; |