[pkgsrc/trunk]: pkgsrc/sysutils/xentools46 xentools46: fixes to build on netb...

[maya <maya%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/e6081a33cb77
branches:  trunk
changeset: 382406:e6081a33cb77
user:      maya <maya%pkgsrc.org@localhost>
date:      Tue Jul 03 13:57:20 2018 +0000

description:
xentools46: fixes to build on netbsd-current,

- fix with gcc6 (unused function, misleading indentation), from upstream
- Makefile fix for newer iasl, from upstream
- seabios table fix from me/debian/etc submitted here:
https://mail.coreboot.org/pipermail/seabios/2018-June/012348.html

bump pkgrevision for paranoia.

diffstat:

 sysutils/xentools46/Makefile                                      |   8 +-
 sysutils/xentools46/distinfo                                      |   7 +-
 sysutils/xentools46/patches/patch-firmware_hvmloader_Makefile     |  32 ++++-
 sysutils/xentools46/patches/patch-qemu-xen_hw_i386_ssdt-misc.dsl  |  16 +++
 sysutils/xentools46/patches/patch-qemu-xen_hw_i386_ssdt-pcihp.dsl |  16 +++
 sysutils/xentools46/patches/patch-xentrace_xenalyze.c             |  52 ++++++++++
 6 files changed, 115 insertions(+), 16 deletions(-)

diffs (194 lines):

diff -r 85cd7d8cc750 -r e6081a33cb77 sysutils/xentools46/Makefile
--- a/sysutils/xentools46/Makefile      Tue Jul 03 12:30:54 2018 +0000
+++ b/sysutils/xentools46/Makefile      Tue Jul 03 13:57:20 2018 +0000
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.31 2018/07/03 05:03:35 adam Exp $
+# $NetBSD: Makefile,v 1.32 2018/07/03 13:57:20 maya Exp $
 #
 # VERSION is set in version.mk as it is shared with other packages
 .include               "version.mk"
 
 DISTNAME=              xen-${VERSION}
 PKGNAME=               xentools46-${VERSION}
-PKGREVISION=           4
+PKGREVISION=           5
 CATEGORIES=            sysutils
 MASTER_SITES=          https://downloads.xenproject.org/release/xen/${VERSION}/
 
@@ -20,9 +20,9 @@
 
 # XXX add version check: Xen requires dev86 >= 0.16.14
 BUILD_DEPENDS+=        dev86-[0-9]*:../../devel/dev86 # needed to build firmware
-#.if !exists(/usr/bin/iasl) # XXX broken with iasl 20171110
+.if !exists(/usr/bin/iasl)
 BUILD_DEPENDS+=        acpica-utils-[0-9]*:../../sysutils/acpica-utils
-#.endif
+.endif
 DEPENDS+=      ${PYPKGPREFIX}-curses>=0:../../devel/py-curses
 
 PKG_SYSCONFSUBDIR=     xen
diff -r 85cd7d8cc750 -r e6081a33cb77 sysutils/xentools46/distinfo
--- a/sysutils/xentools46/distinfo      Tue Jul 03 12:30:54 2018 +0000
+++ b/sysutils/xentools46/distinfo      Tue Jul 03 13:57:20 2018 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.11 2018/01/27 18:24:16 abs Exp $
+$NetBSD: distinfo,v 1.12 2018/07/03 13:57:20 maya Exp $
 
 SHA1 (ipxe-git-9a93db3f0947484e30e753bbd61a10b17336e20e.tar.gz) = fecadf952821e830ce1a1d19655288eef8488f88
 RMD160 (ipxe-git-9a93db3f0947484e30e753bbd61a10b17336e20e.tar.gz) = 539bfa12db7054228250d6dd380bbf96c1a040f8
@@ -29,7 +29,7 @@
 SHA1 (patch-examples_Makefile) = 5fe7bb876d254cf0c4f774ed0f08dcaea5b355ff
 SHA1 (patch-firmware_etherboot_Makefile) = f55e14948b7191e533a82b8fc3575f1052f23c45
 SHA1 (patch-firmware_etherboot_patches_series) = 2fa1342c78094c6dd5d60a07c236c4a1c0599fc4
-SHA1 (patch-firmware_hvmloader_Makefile) = a4ec32bd9945ebf3fd33beb5e04cae21ab91fa20
+SHA1 (patch-firmware_hvmloader_Makefile) = cac1307ac9d342e5885f737d534c68552d16b2cb
 SHA1 (patch-hotplug_NetBSD_Makefile) = ddb8890552fd423b4baadac6837671aac8452a37
 SHA1 (patch-hotplug_NetBSD_block) = 821a171fe29f2a396058f72ce9acc0f0ad565dd0
 SHA1 (patch-hotplug_NetBSD_vif-bridge) = ac4cc7446715330b504b8cce8cbd47c8035cf33c
@@ -66,8 +66,11 @@
 SHA1 (patch-qemu-xen-traditional_i386-dm_hookstarget.mak) = 50c6bc068406effe94b638ffced7d8edf5729717
 SHA1 (patch-qemu-xen-traditional_xen-hooks.mak) = ccc055fdb56ee796e1464f709aa576ab8cd9c6f1
 SHA1 (patch-qemu-xen_audio_audio.c) = 8452d63fe90e38a64111d0cf425bacd565fe6d82
+SHA1 (patch-qemu-xen_hw_i386_ssdt-misc.dsl) = 7dca51ec0a1bf0171adc808cbb2d1febf1196550
+SHA1 (patch-qemu-xen_hw_i386_ssdt-pcihp.dsl) = 31303dd46a91bec64d759a938e8105abf630e28c
 SHA1 (patch-qemu-xen_qemu-doc.texi) = 721e80d15ac30ac71df3d6c4c485b0bf70897cf9
 SHA1 (patch-qemu-xen_xen-hvm.c) = fc245a283a389bc0aa7db08029391aa68f77c149
 SHA1 (patch-xenpaging_xenpaging.c) = 0805d6ea5241ac6c89a357d22e8fc3a36f9d4285
 SHA1 (patch-xenstore_xc.c) = 51b39e9929062e72d0ff85f0ee6d13a6ac04ac65
+SHA1 (patch-xentrace_xenalyze.c) = f1cec8c58645522ce20f89dcf44a392cd162cdcc
 SHA1 (patch-xentrace_xentrace.c) = 0a33c81a4db1c0124b3ccf6cec0671e115b2bb96
diff -r 85cd7d8cc750 -r e6081a33cb77 sysutils/xentools46/patches/patch-firmware_hvmloader_Makefile
--- a/sysutils/xentools46/patches/patch-firmware_hvmloader_Makefile     Tue Jul 03 12:30:54 2018 +0000
+++ b/sysutils/xentools46/patches/patch-firmware_hvmloader_Makefile     Tue Jul 03 13:57:20 2018 +0000
@@ -1,13 +1,25 @@
-$NetBSD: patch-firmware_hvmloader_Makefile,v 1.1.1.1 2016/07/04 07:30:51 jnemeth Exp $
+$NetBSD: patch-firmware_hvmloader_Makefile,v 1.2 2018/07/03 13:57:20 maya Exp $
+
+Fix for newer iasl. From royger upstream.
+https://xenbits.xen.org/gitweb/?p=xen.git;a=commit;h=858dbaaeda33b05c1ac80aea0ba9a03924e09005
 
---- firmware/hvmloader/Makefile.orig   2016-02-09 14:44:19.000000000 +0000
-+++ firmware/hvmloader/Makefile
-@@ -28,7 +28,7 @@ LOADADDR = 0x100000
- # SMBIOS spec requires format mm/dd/yyyy
- SMBIOS_REL_DATE ?= $(shell date +%m/%d/%Y)
+--- firmware/hvmloader/acpi/Makefile.orig      2017-07-06 07:04:28.000000000 +0000
++++ firmware/hvmloader/acpi/Makefile
+@@ -27,7 +27,7 @@ all: acpi.a
+ 
+ ssdt_s3.h ssdt_s4.h ssdt_pm.h ssdt_tpm.h: %.h: %.asl iasl
+       iasl -vs -p $* -tc $<
+-      sed -e 's/AmlCode/$*/g' $*.hex >$@
++      sed -e 's/AmlCode/$*/g' -e 's/_aml_code//g' $*.hex >$@
+       rm -f $*.hex $*.aml
  
--CFLAGS += $(CFLAGS_xeninclude)
-+CFLAGS += $(CFLAGS_xeninclude) $(EXTRA_CFLAGS)
+ mk_dsdt: mk_dsdt.c
+@@ -44,7 +44,7 @@ dsdt_%cpu.asl: dsdt.asl mk_dsdt
  
- # We mustn't use tools-only public interfaces.
- CFLAGS += -U__XEN_TOOLS__ -D__XEN_INTERFACE_VERSION__=__XEN_LATEST_INTERFACE_VERSION__
+ $(filter dsdt_%.c,$(C_SRC)): %.c: iasl %.asl
+       iasl -vs -p $* -tc $*.asl
+-      sed -e 's/AmlCode/$*/g' $*.hex >$@
++      sed -e 's/AmlCode/$*/g' -e 's/_aml_code//g' $*.hex >$@
+       echo "int $*_len=sizeof($*);" >>$@
+       rm -f $*.aml $*.hex
+ 
diff -r 85cd7d8cc750 -r e6081a33cb77 sysutils/xentools46/patches/patch-qemu-xen_hw_i386_ssdt-misc.dsl
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/sysutils/xentools46/patches/patch-qemu-xen_hw_i386_ssdt-misc.dsl  Tue Jul 03 13:57:20 2018 +0000
@@ -0,0 +1,16 @@
+$NetBSD: patch-qemu-xen_hw_i386_ssdt-misc.dsl,v 1.1 2018/07/03 13:57:20 maya Exp $
+
+Fix for newer iasl.
+Length was previously truncated to 8 characters.
+
+--- qemu-xen/hw/i386/ssdt-misc.dsl.orig        2017-06-21 15:43:09.000000000 +0000
++++ qemu-xen/hw/i386/ssdt-misc.dsl
+@@ -16,7 +16,7 @@
+ 
+ ACPI_EXTRACT_ALL_CODE ssdp_misc_aml
+ 
+-DefinitionBlock ("ssdt-misc.aml", "SSDT", 0x01, "BXPC", "BXSSDTSUSP", 0x1)
++DefinitionBlock ("ssdt-misc.aml", "SSDT", 0x01, "BXPC", "BXSSDTSU", 0x1)
+ {
+ 
+ /****************************************************************
diff -r 85cd7d8cc750 -r e6081a33cb77 sysutils/xentools46/patches/patch-qemu-xen_hw_i386_ssdt-pcihp.dsl
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/sysutils/xentools46/patches/patch-qemu-xen_hw_i386_ssdt-pcihp.dsl Tue Jul 03 13:57:20 2018 +0000
@@ -0,0 +1,16 @@
+$NetBSD: patch-qemu-xen_hw_i386_ssdt-pcihp.dsl,v 1.1 2018/07/03 13:57:20 maya Exp $
+
+Fix for newer iasl.
+Length was previously truncated to 8 characters.
+
+--- qemu-xen/hw/i386/ssdt-pcihp.dsl.orig       2017-06-21 15:43:09.000000000 +0000
++++ qemu-xen/hw/i386/ssdt-pcihp.dsl
+@@ -15,7 +15,7 @@
+ 
+ ACPI_EXTRACT_ALL_CODE ssdp_pcihp_aml
+ 
+-DefinitionBlock ("ssdt-pcihp.aml", "SSDT", 0x01, "BXPC", "BXSSDTPCIHP", 0x1)
++DefinitionBlock ("ssdt-pcihp.aml", "SSDT", 0x01, "BXPC", "BXSSDTPC", 0x1)
+ {
+ 
+ /****************************************************************
diff -r 85cd7d8cc750 -r e6081a33cb77 sysutils/xentools46/patches/patch-xentrace_xenalyze.c
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/sysutils/xentools46/patches/patch-xentrace_xenalyze.c     Tue Jul 03 13:57:20 2018 +0000
@@ -0,0 +1,52 @@
+$NetBSD: patch-xentrace_xenalyze.c,v 1.1 2018/07/03 13:57:20 maya Exp $
+
+Remove unused function, guard misleading indentation (also upstream)
+
+--- xentrace/xenalyze.c.orig   2017-07-06 07:04:28.000000000 +0000
++++ xentrace/xenalyze.c
+@@ -2132,10 +2132,12 @@ float weighted_percentile(float * A, /* 
+         } while (I <= J); /* Keep going until our pointers meet or pass */
+ 
+         /* Re-adjust L and R, based on which element we're looking for */
+-        if(J_weight<K_weight)
++        if(J_weight<K_weight) {
+             L=I; L_weight = I_weight;
+-        if(K_weight<I_weight)
++      }
++        if(K_weight<I_weight) {
+             R=J; R_weight = J_weight;
++      }
+     }
+ 
+     return A[L];
+@@ -2211,10 +2213,12 @@ long long self_weighted_percentile(long 
+         } while (I <= J); /* Keep going until our pointers meet or pass */
+ 
+         /* Re-adjust L and R, based on which element we're looking for */
+-        if(J_weight<K_weight)
++        if(J_weight<K_weight) {
+             L=I; L_weight = I_weight;
+-        if(K_weight<I_weight)
++      }
++        if(K_weight<I_weight) {
+             R=J; R_weight = J_weight;
++      }
+     }
+ 
+     return A[L];
+@@ -4121,6 +4125,7 @@ void cr3_dump_list(struct cr3_value_stru
+     struct cr3_value_struct **qsort_array;
+     int i, N=0;
+ 
++#ifdef unusedfunction
+     int cr3_compare_total(const void *_a, const void *_b) {
+         struct cr3_value_struct *a=*(typeof(&a))_a;
+         struct cr3_value_struct *b=*(typeof(&a))_b;
+@@ -4137,6 +4142,7 @@ void cr3_dump_list(struct cr3_value_stru
+         } else
+             return -1;
+     }
++#endif
+ 
+     int cr3_compare_start(const void *_a, const void *_b) {
+         struct cr3_value_struct *a=*(typeof(&a))_a;