diff options
| author | Jung-uk Kim <jkim@FreeBSD.org> | 2019-08-22 19:41:54 +0000 |
|---|---|---|
| committer | Jung-uk Kim <jkim@FreeBSD.org> | 2019-08-22 19:41:54 +0000 |
| commit | 24b45f5a4c9f0905e6463f3bea0e9d8bef0b4036 (patch) | |
| tree | d9e77fd1c39c4af28d508dc8eac7f897da1a7788 /sysutils/acpica-tools | |
| parent | - update to 6.2.0 (diff) | |
- Use upstream patches.
- Use compiler optimization flags.
Notes
Notes:
svn path=/head/; revision=509622
Diffstat (limited to 'sysutils/acpica-tools')
4 files changed, 16 insertions, 4 deletions
diff --git a/sysutils/acpica-tools/Makefile b/sysutils/acpica-tools/Makefile index 6abb141c4208..2ba035be1ea8 100644 --- a/sysutils/acpica-tools/Makefile +++ b/sysutils/acpica-tools/Makefile @@ -2,6 +2,7 @@ PORTNAME= acpica PORTVERSION= 20190816 +PORTREVISION= 1 CATEGORIES= sysutils devel MASTER_SITES= https://acpica.org/sites/acpica/files/ \ LOCAL/jkim @@ -25,7 +26,7 @@ ACPICA_TOOLS+= acpixtract iasl PLIST_FILES= ${ACPICA_TOOLS:S,^,bin/,} -MAKE_ARGS= HOST=_FreeBSD NOOPT=TRUE PROGS="${ACPICA_TOOLS}" +MAKE_ARGS= HOST=_FreeBSD PROGS="${ACPICA_TOOLS}" MAKE_ARGS+= CC="${CC}" LEX="${FLEX}" YACC="${LOCALBASE}/bin/bison" do-install: diff --git a/sysutils/acpica-tools/files/patch-source_common_dmtables.c b/sysutils/acpica-tools/files/patch-source_common_dmtables.c index 87e547434863..58ec0a75042e 100644 --- a/sysutils/acpica-tools/files/patch-source_common_dmtables.c +++ b/sysutils/acpica-tools/files/patch-source_common_dmtables.c @@ -5,7 +5,7 @@ */ AcpiOsPrintf ( - "DefinitionBlock (\"\", \"%4.4s\", %hu, \"%.6s\", \"%.8s\", 0x%8.8X)\n", -+ "DefinitionBlock (\"\", \"%4.4s\", %hhu, \"%.6s\", \"%.8s\", 0x%8.8X)\n", ++ "DefinitionBlock (\"\", \"%4.4s\", %u, \"%.6s\", \"%.8s\", 0x%8.8X)\n", Table->Signature, Table->Revision, Table->OemId, Table->OemTableId, Table->OemRevision); } diff --git a/sysutils/acpica-tools/files/patch-source_components_namespace_nsdump.c b/sysutils/acpica-tools/files/patch-source_components_namespace_nsdump.c index 89b895dae033..adc056b30213 100644 --- a/sysutils/acpica-tools/files/patch-source_components_namespace_nsdump.c +++ b/sysutils/acpica-tools/files/patch-source_components_namespace_nsdump.c @@ -5,7 +5,7 @@ for (i = 0; (i < ObjDesc->Buffer.Length && i < 12); i++) { - AcpiOsPrintf (" %.2hX", ObjDesc->Buffer.Pointer[i]); -+ AcpiOsPrintf (" %.2hhX", ObjDesc->Buffer.Pointer[i]); ++ AcpiOsPrintf (" %2.2X", ObjDesc->Buffer.Pointer[i]); } } AcpiOsPrintf ("\n"); @@ -14,7 +14,7 @@ case ACPI_TYPE_LOCAL_INDEX_FIELD: - AcpiOsPrintf (" Off %.3X Len %.2X Acc %.2hd\n", -+ AcpiOsPrintf (" Off %.3X Len %.2X Acc %.2hhd\n", ++ AcpiOsPrintf (" Off %.3X Len %.2X Acc %.2X\n", (ObjDesc->CommonField.BaseByteOffset * 8) + ObjDesc->CommonField.StartFieldBitOffset, ObjDesc->CommonField.BitLength, diff --git a/sysutils/acpica-tools/files/patch-source_components_utilities_uttrack.c b/sysutils/acpica-tools/files/patch-source_components_utilities_uttrack.c new file mode 100644 index 000000000000..e576e27d7be1 --- /dev/null +++ b/sysutils/acpica-tools/files/patch-source_components_utilities_uttrack.c @@ -0,0 +1,11 @@ +--- source/components/utilities/uttrack.c.orig 2019-08-16 15:01:14 UTC ++++ source/components/utilities/uttrack.c +@@ -864,7 +864,7 @@ AcpiUtDumpAllocations ( + + case ACPI_DESC_TYPE_PARSER: + +- AcpiOsPrintf ("AmlOpcode 0x%04hX\n", ++ AcpiOsPrintf ("AmlOpcode 0x%04X\n", + Descriptor->Op.Asl.AmlOpcode); + break; + |