Geoff Wing wrote:
> Christos just fixed this (though his fix is missing an update for an
> unused #define around line 71 of pam_ssh.c)

The build now gets further, but then fails with acpi-related errors,
starting with:

--- dependall-usr.sbin ---
In file included from 
/tmp/bracket/build/2018.04.07.14.12.46-i386/src/usr.sbin/acpitools/acpidump/../../../sys/external/bsd/acpica/dist/include/actbl.h:440:0,
                 from 
/tmp/bracket/build/2018.04.07.14.12.46-i386/src/usr.sbin/acpitools/acpidump/../../../sys/external/bsd/acpica/dist/include/acpi.h:61,
                 from 
/tmp/bracket/build/2018.04.07.14.12.46-i386/src/usr.sbin/acpitools/acpidump/../../../sys/dev/acpi/acpica.h:46,
                 from 
/tmp/bracket/build/2018.04.07.14.12.46-i386/src/usr.sbin/acpitools/acpidump/acpidump.h:37,
                 from 
/tmp/bracket/build/2018.04.07.14.12.46-i386/src/usr.sbin/acpitools/acpidump/acpi.c:51:
/tmp/bracket/build/2018.04.07.14.12.46-i386/src/usr.sbin/acpitools/acpidump/../../../sys/external/bsd/acpica/dist/include/actbl2.h:561:16:
 error: redefinition of 'struct acpi_table_madt'
 typedef struct acpi_table_madt
                ^~~~~~~~~~~~~~~
In file included from 
/tmp/bracket/build/2018.04.07.14.12.46-i386/src/usr.sbin/acpitools/acpidump/../../../sys/external/bsd/acpica/dist/include/actbl.h:439:0,
--- dependall-external ---
--- dependall-apache2 ---
--- uds_daemon.d ---
--- dependall-usr.sbin ---
                 from 
/tmp/bracket/build/2018.04.07.14.12.46-i386/src/usr.sbin/acpitools/acpidump/../../../sys/external/bsd/acpica/dist/include/acpi.h:61,
                 from 
/tmp/bracket/build/2018.04.07.14.12.46-i386/src/usr.sbin/acpitools/acpidump/../../../sys/dev/acpi/acpica.h:46,
                 from 
/tmp/bracket/build/2018.04.07.14.12.46-i386/src/usr.sbin/acpitools/acpidump/acpidump.h:37,
                 from 
/tmp/bracket/build/2018.04.07.14.12.46-i386/src/usr.sbin/acpitools/acpidump/acpi.c:51:
/tmp/bracket/build/2018.04.07.14.12.46-i386/src/usr.sbin/acpitools/acpidump/../../../sys/external/bsd/acpica/dist/include/actbl1.h:957:16:
 note: originally defined here
 typedef struct acpi_table_madt
                ^~~~~~~~~~~~~~~
In file included from 
/tmp/bracket/build/2018.04.07.14.12.46-i386/src/usr.sbin/acpitools/acpidump/../../../sys/external/bsd/acpica/dist/include/actbl.h:440:0,
                 from 
/tmp/bracket/build/2018.04.07.14.12.46-i386/src/usr.sbin/acpitools/acpidump/../../../sys/external/bsd/acpica/dist/include/acpi.h:61,
                 from 
/tmp/bracket/build/2018.04.07.14.12.46-i386/src/usr.sbin/acpitools/acpidump/../../../sys/dev/acpi/acpica.h:46,
                 from 
/tmp/bracket/build/2018.04.07.14.12.46-i386/src/usr.sbin/acpitools/acpidump/acpidump.h:37,
                 from 
/tmp/bracket/build/2018.04.07.14.12.46-i386/src/usr.sbin/acpitools/acpidump/acpi.c:51:
/tmp/bracket/build/2018.04.07.14.12.46-i386/src/usr.sbin/acpitools/acpidump/../../../sys/external/bsd/acpica/dist/include/actbl2.h:567:3:
 error: conflicting types for 'ACPI_TABLE_MADT'
 } ACPI_TABLE_MADT;
   ^~~~~~~~~~~~~~~
In file included from 
/tmp/bracket/build/2018.04.07.14.12.46-i386/src/usr.sbin/acpitools/acpidump/../../../sys/external/bsd/acpica/dist/include/actbl.h:439:0,
                 from 
/tmp/bracket/build/2018.04.07.14.12.46-i386/src/usr.sbin/acpitools/acpidump/../../../sys/external/bsd/acpica/dist/include/acpi.h:61,
                 from 
/tmp/bracket/build/2018.04.07.14.12.46-i386/src/usr.sbin/acpitools/acpidump/../../../sys/dev/acpi/acpica.h:46,
                 from 
/tmp/bracket/build/2018.04.07.14.12.46-i386/src/usr.sbin/acpitools/acpidump/acpidump.h:37,
                 from 
/tmp/bracket/build/2018.04.07.14.12.46-i386/src/usr.sbin/acpitools/acpidump/acpi.c:51:
/tmp/bracket/build/2018.04.07.14.12.46-i386/src/usr.sbin/acpitools/acpidump/../../../sys/external/bsd/acpica/dist/include/actbl1.h:963:3:
 note: previous declaration of 'ACPI_TABLE_MADT' was here
 } ACPI_TABLE_MADT;
   ^~~~~~~~~~~~~~~
In file included from 
/tmp/bracket/build/2018.04.07.14.12.46-i386/src/usr.sbin/acpitools/acpidump/../../../sys/external/bsd/acpica/dist/include/actbl.h:440:0,
                 from 
/tmp/bracket/build/2018.04.07.14.12.46-i386/src/usr.sbin/acpitools/acpidump/../../../sys/external/bsd/acpica/dist/include/acpi.h:61,
                 from 
/tmp/bracket/build/2018.04.07.14.12.46-i386/src/usr.sbin/acpitools/acpidump/../../../sys/dev/acpi/acpica.h:46,
                 from 
/tmp/bracket/build/2018.04.07.14.12.46-i386/src/usr.sbin/acpitools/acpidump/acpidump.h:37,
                 from 
/tmp/bracket/build/2018.04.07.14.12.46-i386/src/usr.sbin/acpitools/acpidump/acpi.c:51:
/tmp/bracket/build/2018.04.07.14.12.46-i386/src/usr.sbin/acpitools/acpidump/../../../sys/external/bsd/acpica/dist/include/actbl2.h:581:6:
 error: nested redefinition of 'enum AcpiMadtType'
 enum AcpiMadtType
      ^~~~~~~~~~~~
/tmp/bracket/build/2018.04.07.14.12.46-i386/src/usr.sbin/acpitools/acpidump/../../../sys/external/bsd/acpica/dist/include/actbl2.h:581:6:
 error: redeclaration of 'enum AcpiMadtType'
In file included from 
/tmp/bracket/build/2018.04.07.14.12.46-i386/src/usr.sbin/acpitools/acpidump/../../../sys/external/bsd/acpica/dist/include/actbl.h:439:0,
                 from 
/tmp/bracket/build/2018.04.07.14.12.46-i386/src/usr.sbin/acpitools/acpidump/../../../sys/external/bsd/acpica/dist/include/acpi.h:61,
                 from 
/tmp/bracket/build/2018.04.07.14.12.46-i386/src/usr.sbin/acpitools/acpidump/../../../sys/dev/acpi/acpica.h:46,
                 from 
/tmp/bracket/build/2018.04.07.14.12.46-i386/src/usr.sbin/acpitools/acpidump/acpidump.h:37,
                 from 
/tmp/bracket/build/2018.04.07.14.12.46-i386/src/usr.sbin/acpitools/acpidump/acpi.c:51:
/tmp/bracket/build/2018.04.07.14.12.46-i386/src/usr.sbin/acpitools/acpidump/../../../sys/external/bsd/acpica/dist/include/actbl1.h:977:6:
 note: originally defined here

-- 
Andreas Gustafsson, g...@gson.org

Reply via email to