Import of pkgsrc-2016Q3

sysutils/xenkernel3/Makefile

@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.29 2014/05/09 07:37:20 wiz Exp $
+# $NetBSD: Makefile,v 1.32 2016/07/09 13:04:07 wiz Exp $
 
 VERSION=	3.1.4
 DISTNAME=	xen-${VERSION}
@@ -23,7 +23,7 @@ USE_TOOLS+=	gmake
 
 PYTHON_FOR_BUILD_ONLY=	YES
 PY_PATCHPLIST=		NO
-PYTHON_VERSIONS_INCOMPATIBLE=	33 34 # not yet ported as of 3.1.4
+PYTHON_VERSIONS_INCOMPATIBLE=	34 35 # not yet ported as of 3.1.4
 
 SUBST_CLASSES+=		py
 SUBST_STAGE.py=		pre-build
@@ -65,6 +65,8 @@ EXTRA_CFLAGS+=	-Wno-error=ignored-attributes -Wno-error=format \
 		-Wno-error=sometimes-uninitialized -no-integrated-as \
 		-ffreestanding -Wno-error=unused-function
 BUILDLINK_TRANSFORM+=	rm:-fno-reorder-blocks
+.elif !empty(PKGSRC_COMPILER:Mgcc)
+EXTRA_CFLAGS+=	-Wno-error=unused-but-set-variable
 .endif
 
 do-build:

sysutils/xenkernel3/distinfo

@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.19 2014/05/14 20:21:19 bouyer Exp $
+$NetBSD: distinfo,v 1.21 2016/03/01 20:09:03 joerg Exp $
 
 SHA1 (xen-3.1.4.tar.gz) = 0d784662776239195df10b3f29d40350f9d0644d
 RMD160 (xen-3.1.4.tar.gz) = c02ad2bd64e6306b127a4f37a8aa370dadc11859
+SHA512 (xen-3.1.4.tar.gz) = 25f797c1c47a807573b4d2d0a12b5b15185d1b1e463e5db46d4bc3843bde7d913ac66440d084dfd12d3968dfbe88738fe84c28047c31c12551530bb157788b1d
 Size (xen-3.1.4.tar.gz) = 6894493 bytes
 SHA1 (patch-SA45835) = 7af53cb3da8720954242c4c90165bceef362c184
 SHA1 (patch-aa) = 1be644e7edd3735c2850d3e581002f53bd50eb59
@@ -18,5 +19,6 @@ SHA1 (patch-dc) = 606ad2af582b88ddfd250b952831af9d3b2b1f5d
 SHA1 (patch-gcc-version) = 1174ace3eee1d3707a2935498ac5a39671913f9f
 SHA1 (patch-xen_arch_x86_hvm_io.c) = 0f6dfc3b3857c2ab43fabf2c9693e2932b442931
 SHA1 (patch-xen_arch_x86_string.c) = 363d521a627d07cd9caffcfe1c529342b3b67321
+SHA1 (patch-xen_arch_x86_x86__64_entry.S) = 07d51949e979267601e65109f1e8ce4da93c085c
 SHA1 (patch-xen_common_libelf_libelf-private.h) = c364d8f247342c62d0d32fe9f4714f83f977719a
 SHA1 (patch-xen_include_xen_compat.h) = d9a4524088e034cf718f17f20f856bd907271b29

sysutils/xenkernel3/patches/patch-xen_arch_x86_x86__64_entry.S

@@ -0,0 +1,13 @@
+$NetBSD: patch-xen_arch_x86_x86__64_entry.S,v 1.1 2016/03/01 20:09:03 joerg Exp $
+
+--- xen/arch/x86/x86_64/entry.S.orig	2016-03-01 12:46:20.394327040 +0000
++++ xen/arch/x86/x86_64/entry.S
+@@ -47,7 +47,7 @@ restore_all_guest:
+         addq  $8,%rsp
+         popq  %rcx                    # RIP
+         popq  %r11                    # CS
+-        cmpw  $FLAT_KERNEL_CS32,%r11
++        cmpw  $FLAT_KERNEL_CS32,%r11w
+         popq  %r11                    # RFLAGS
+         popq  %rsp                    # RSP
+         je    1f